# HG changeset patch # User Zachary Kanfer # Date 1692804426 14400 # Wed Aug 23 11:27:06 2023 -0400 # Node ID ede9bbf3ee1f9fd7833c00f9169e282c5d1b5f9e # Parent 606322778f6e8e6abd7000b121ee4cfe6587cd8b update function names to not have pseudo-namespaces. This makes them harder to read, but follows the Emacs style guide. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ We recommend binding these functions to relevant keys: ```emacs-lisp -(bind-key "M-C" #'camelcase-dwim) -(bind-key "M-S" #'snakecase-dwim) -(bind-key "M-D" #'dashcase-dwim) +(bind-key "M-C" #'caser-camelcase-dwim) +(bind-key "M-S" #'caser-snakecase-dwim) +(bind-key "M-D" #'caser-dashcase-dwim) ``` ## Repeat case changes ## @@ -22,9 +22,9 @@ (repeat-mode 1) ``` -Then, each function is able to be repeated by pressing a single letter. Once you run caser/snakecase-dwim, it can be ran gain with `s`. Similarly, caser/camelcase-dwim can be repeated with `c`; caser/dashcase-dwim can be repeated with `d`. +Then, each function is able to be repeated by pressing a single letter. Once you run caser-snakecase-dwim, it can be ran gain with `s`. Similarly, caser-camelcase-dwim can be repeated with `c`; caser-dashcase-dwim can be repeated with `d`. -These keys can be customized; see variables `caser/snakecase-repeat-map`, `caser/camelcase-repeat-map`, and `caser/dashcase-repeat-map`. +These keys can be customized; see variables `caser-snakecase-repeat-map`, `caser-camelcase-repeat-map`, and `caser-dashcase-repeat-map`. ## Non-ASCII Support ## diff --git a/caser.el b/caser.el --- a/caser.el +++ b/caser.el @@ -24,9 +24,9 @@ ;; This package changes text from camelCase to dash-case to snake_case. ;; We recommend binding the following keys: -;; (bind-key "M-C" #'caser/camelcase-dwim) -;; (bind-key "M-S" #'caser/snakecase-dwim) -;; (bind-key "M-D" #'caser/dashcase-dwim) +;; (bind-key "M-C" #'caser-camelcase-dwim) +;; (bind-key "M-S" #'caser-snakecase-dwim) +;; (bind-key "M-D" #'caser-dashcase-dwim) ;;; Code: @@ -37,16 +37,16 @@ This converts it from dash-case or snake_case to camelCase. -If the region is active, this function calls `caser/camelcase-region'. -Otherwise, it calls `caser/camelcase-word', with prefix argument passed to it +If the region is active, this function calls `caser-camelcase-region'. +Otherwise, it calls `caser-camelcase-word', with prefix argument passed to it to camelcase ARG words." (interactive "*p") (if (use-region-p) - (caser/camelcase-region (region-beginning) (region-end)) - (caser/camelcase-word arg))) -(defalias 'caser/camelcase-dwim #'caser-camelcase-dwim) -(defvar caser/camelcase-repeat-map (define-keymap "c" #'caser/camelcase-dwim)) -(put #'caser/camelcase-dwim 'repeat-map 'caser/camelcase-repeat-map) + (caser-camelcase-region (region-beginning) (region-end)) + (caser-camelcase-word arg))) + +(defvar caser-camelcase-repeat-map (define-keymap "c" #'caser-camelcase-dwim)) +(put #'caser-camelcase-dwim 'repeat-map 'caser-camelcase-repeat-map) (defun caser-camelcase-region (region-beginning region-end) "Camelcase the region between REGION-BEGINNING and REGION-END. @@ -68,16 +68,14 @@ t) (replace-match "") (unless (eolp) - (caser/upcase-char))) + (caser-upcase-char))) (goto-char (marker-position end-marker)))) -(defalias 'caser/camelcase-region #'caser-camelcase-region) (defun caser-upcase-char () "Upcase the char at point." (upcase-region (point) (1+ (point)))) -(defalias 'caser/upcase-char #'caser-upcase-char) (defun caser--move-to-beginning-of-word () "Move to the beginning of the word point is in." @@ -87,7 +85,6 @@ (point-min) t) (goto-char (match-beginning 0)))) -(defalias 'caser//move-to-beginning-of-word #'caser--move-to-beginning-of-word) (defun caser--move-to-end-of-word () "Move to the beginning of the word point is in." @@ -95,7 +92,6 @@ "-" "_")))) (goto-char (match-end 0)))) -(defalias 'caser//move-to-end-of-word #'caser--move-to-end-of-word) (defun caser--forward-word (number-of-words) "Move forward NUMBER-OF-WORDS words, defaulting to 1. @@ -119,7 +115,6 @@ (goto-char (match-beginning 0)) (when (looking-at (rx (one-or-more space))) (goto-char (match-end 0)))))) -(defalias 'caser//forward-word #'caser--forward-word) (defun caser--word-helper (words case-function) "Call CASE-FUNCTION on WORDS words." @@ -127,21 +122,20 @@ (looking-at (rx (or word "-" "_")))) - (caser//move-to-beginning-of-word)) + (caser--move-to-beginning-of-word)) ((looking-back (rx (or word "-" "_")) (1- (point))) - (caser//move-to-end-of-word))) + (caser--move-to-end-of-word))) (let* ((initial-bound (point)) - (other-bound (progn (caser//forward-word words) (point))) + (other-bound (progn (caser--forward-word words) (point))) (starting-point (min initial-bound other-bound)) (ending-point (max initial-bound other-bound)) (marker (make-marker))) (move-marker marker other-bound) (funcall case-function starting-point ending-point) (goto-char (marker-position marker)))) -(defalias 'caser//word-helper #'caser--word-helper) (defun caser--region-helper-for-separator-case (region-beginning region-end separator-to-add separators-to-remove upcase-downcase-region-function) "Act on the region between REGION-BEGINNING and REGION-END. @@ -186,83 +180,77 @@ (replace-match separator-to-add nil nil nil 3)))) (funcall upcase-downcase-region-function region-beginning (marker-position end-marker)) (goto-char (marker-position end-marker)))) -(defalias 'caser//region-helper-for-separator-case #'caser--region-helper-for-separator-case) (defun caser-camelcase-word (words) "Camelcase WORDS words forward from point." - (caser//word-helper words #'caser/camelcase-region)) -(defalias 'caser/camelcase-word #'caser-camelcase-word) + (caser--word-helper words #'caser-camelcase-region)) (defun caser-snakecase-dwim (arg) "Snakecase words in the region, if active; if not, snakecase word at point. This converts it from camelCase or dash-case to snake_case. -If the region is active, this function calls `caser/snakecase-region'. -Otherwise, it calls `caser/snakecase-word', with prefix argument passed to it +If the region is active, this function calls `caser-snakecase-region'. +Otherwise, it calls `caser-snakecase-word', with prefix argument passed to it to snakecase ARG words." (interactive "*p") (if (use-region-p) - (caser/snakecase-region (region-beginning) (region-end)) - (caser/snakecase-word arg))) -(defalias 'caser/snakecase-dwim #'caser-snakecase-dwim) -(defvar caser/snakecase-repeat-map (define-keymap "s" #'caser/snakecase-dwim)) -(put #'caser/snakecase-dwim 'repeat-map 'caser/snakecase-repeat-map) + (caser-snakecase-region (region-beginning) (region-end)) + (caser-snakecase-word arg))) + +(defvar caser-snakecase-repeat-map (define-keymap "s" #'caser-snakecase-dwim)) +(put #'caser-snakecase-dwim 'repeat-map 'caser-snakecase-repeat-map) (defun caser-snakecase-region (region-beginning region-end) "Snakecase the region between REGION-BEGINNING and REGION-END. This converts it from camelCase or dash-case to snake_case." (interactive "*r") - (caser//region-helper-for-separator-case region-beginning + (caser--region-helper-for-separator-case region-beginning region-end "_" '("-") #'downcase-region)) -(defalias 'caser/snakecase-region #'caser-snakecase-region) (defun caser-snakecase-word (&optional words) "Snakecase WORDS words forward from point." - (caser//word-helper words #'caser/snakecase-region)) -(defalias 'caser/snakecase-word #'caser-snakecase-word) + (caser--word-helper words #'caser-snakecase-region)) (defun caser-dashcase-word (&optional words) "Dashcase WORDS words forward from point." - (caser//word-helper words #'caser/dashcase-region)) -(defalias 'caser/dashcase-word #'caser-dashcase-word) + (caser--word-helper words #'caser-dashcase-region)) (defun caser-dashcase-region (region-beginning region-end) "Dashcase the region between REGION-BEGINNING and REGION-END. This converts it from camelCase or snake_case to dash-case." (interactive "*r") - (caser//region-helper-for-separator-case region-beginning + (caser--region-helper-for-separator-case region-beginning region-end "-" '("_") #'downcase-region)) -(defalias 'caser/dashcase-region #'caser-dashcase-region) (defun caser-dashcase-dwim (arg) "Dashcase words in the region, if active; if not, dashcase word at point. This converts it from camelCase or snake_case to dash-case. -If the region is active, this function calls `caser/dashcase-region'. -Otherwise, it calls `caser/dashcase-word', with prefix argument passed to it +If the region is active, this function calls `caser-dashcase-region'. +Otherwise, it calls `caser-dashcase-word', with prefix argument passed to it to dashcase ARG words." (interactive "*p") (if (use-region-p) - (caser/dashcase-region (region-beginning) (region-end)) - (caser/dashcase-word arg))) -(defalias 'caser/dashcase-dwim #'caser-dashcase-dwim) -(defvar caser/dashcase-repeat-map (define-keymap "d" #'caser/dashcase-dwim)) -(put #'caser/dashcase-dwim 'repeat-map 'caser/dashcase-repeat-map) + (caser-dashcase-region (region-beginning) (region-end)) + (caser-dashcase-word arg))) + +(defvar caser-dashcase-repeat-map (define-keymap "d" #'caser-dashcase-dwim)) +(put #'caser-dashcase-dwim 'repeat-map 'caser-dashcase-repeat-map) ;;suggested. -;; (bind-key "M-C" #'caser/camelcase-dwim) -;; (bind-key "M-S" #'caser/snakecase-dwim) -;; (bind-key "M-D" #'caser/dashcase-dwim) +;; (bind-key "M-C" #'caser-camelcase-dwim) +;; (bind-key "M-S" #'caser-snakecase-dwim) +;; (bind-key "M-D" #'caser-dashcase-dwim) (provide 'caser) ;;; caser.el ends here diff --git a/tests.el b/tests.el --- a/tests.el +++ b/tests.el @@ -97,165 +97,165 @@ (should (equal "hi|" (caser//on-temp-buffer-point "hi" - (caser/camelcase-region 1 3))))) + (caser-camelcase-region 1 3))))) (ert-deftest camelcase-region/from-snakecase/one-word () (should (equal "hiMom|" (caser//on-temp-buffer-point "hi_mom" - (caser/camelcase-region 1 7))))) + (caser-camelcase-region 1 7))))) (ert-deftest camelcase-region/from-dashcase/one-word () (should (equal "hiMom|" (caser//on-temp-buffer-point "hi-mom" - (caser/camelcase-region 1 7))))) + (caser-camelcase-region 1 7))))) (ert-deftest camelcase-region/from-dashcase/caps-in-dashcase () (should (equal "thisIsNotWrong|" (caser//on-temp-buffer-point "this-Is-Not-WRONG" - (caser/camelcase-region (point-min) (point-max)))))) + (caser-camelcase-region (point-min) (point-max)))))) (ert-deftest camelcase-region/from-snakecase/caps-in-snakecase () (should (equal "thisIsNotWrong|" (caser//on-temp-buffer-point "this_Is_Not_WRONG" - (caser/camelcase-region (point-min) (point-max)))))) + (caser-camelcase-region (point-min) (point-max)))))) ;;word tests (ert-deftest camelcase-word/from-snakecase () (should (equal "abCd| ef_gh" (caser//on-temp-buffer-point "|ab_cd ef_gh" - (caser/camelcase-word 1))))) + (caser-camelcase-word 1))))) (ert-deftest camelcase-word/from-dashcase () (should (equal "abCd| ef-gh" (caser//on-temp-buffer-point "|ab-cd ef-gh" - (caser/camelcase-word 1))))) + (caser-camelcase-word 1))))) (ert-deftest camelcase-word/called-twice () (should (equal "hiMom andOther| stuff_here" (caser//on-temp-buffer-point "hi_mom and_other stuff_here" - (caser/camelcase-word 2))))) + (caser-camelcase-word 2))))) (ert-deftest camelcase-word/snakecase-and-lispcase () (should (equal "hiMom andOther| stuff_here" (caser//on-temp-buffer-point "hi_mom and-other stuff_here" - (caser/camelcase-word 2))))) + (caser-camelcase-word 2))))) (ert-deftest camelcase-word/backwards-one-word () (should (equal "hi_mom |andOther stuff_here" (caser//on-temp-buffer-point "hi_mom and_other| stuff_here" - (caser/camelcase-word -1))))) + (caser-camelcase-word -1))))) (ert-deftest camelcase-word/starting-at-end-of-word/backward () (should (equal "hi_mom |andOther stuff_here" (caser//on-temp-buffer-point "hi_mom and_other| stuff_here" - (caser/camelcase-word -1))))) + (caser-camelcase-word -1))))) (ert-deftest camelcase-word/starting-at-end-of-word/forward () (should (equal "hi_mom andOther| stuff_here" (caser//on-temp-buffer-point "hi_mom| and-other stuff_here" - (caser/camelcase-word 1))))) + (caser-camelcase-word 1))))) (ert-deftest camelcase-word/starting-at-start-of-word/forward () (should (equal "hi_mom andOther| stuff_here" (caser//on-temp-buffer-point "hi_mom |and-other stuff_here" - (caser/camelcase-word 1))))) + (caser-camelcase-word 1))))) (ert-deftest camelcase-word/starting-at-start-of-word/backward () (should (equal "hi_mom |andOther stuff_here" (caser//on-temp-buffer-point "hi_mom and_other |stuff_here" - (caser/camelcase-word -1))))) + (caser-camelcase-word -1))))) (ert-deftest camelcase-word/icelandic/from-snakecase () (should (equal "orðÁÍslensku|" (caser//on-temp-buffer-point "|orð_á_íslensku" - (caser/camelcase-word 1))))) + (caser-camelcase-word 1))))) (ert-deftest camelcase-word/icelandic/from-dashcase () (should (equal "orðÁÍslensku|" (caser//on-temp-buffer-point "|orð-á-íslensku" - (caser/camelcase-word 1))))) + (caser-camelcase-word 1))))) (ert-deftest camelcase-word/german/from-snakecase () (should (equal "deutschIstÄhnlich|" (caser//on-temp-buffer-point "|deutsch_ist_ähnlich" - (caser/camelcase-word 1))))) + (caser-camelcase-word 1))))) (ert-deftest camelcase-word/german/from-dashcase () (should (equal "deutschIstÄhnlich|" (caser//on-temp-buffer-point "|deutsch-ist-ähnlich" - (caser/camelcase-word 1))))) + (caser-camelcase-word 1))))) ;;dwim tests (ert-deftest camelcase-dwim/single-word-doesnt-change () (should (equal "hi" (caser//on-temp-buffer "hi" - (caser/camelcase-dwim 1))))) + (caser-camelcase-dwim 1))))) (ert-deftest camelcase-dwim/backward-single-word-doesnt-change () (should (equal "|hi" (caser//on-temp-buffer-point "hi|" - (caser/camelcase-dwim -1))))) + (caser-camelcase-dwim -1))))) (ert-deftest camelcase-dwim/from-snakecase () (should (equal "hiMom|" (caser//on-temp-buffer-point "hi_mom" - (caser/camelcase-dwim 1))))) + (caser-camelcase-dwim 1))))) (ert-deftest camelcase-dwim/from-dashcase () (should (equal "hiMom|" (caser//on-temp-buffer-point "hi-mom" - (caser/camelcase-dwim 1))))) + (caser-camelcase-dwim 1))))) (ert-deftest camelcase-dwim/snakecase-two-arg () (should (equal "hiMom andOther| stuff_here" (caser//on-temp-buffer-point "hi_mom and_other stuff_here" - (caser/camelcase-dwim 2))))) + (caser-camelcase-dwim 2))))) (ert-deftest camelcase-dwim/snakecase-three-arg-complicated-words () (should (equal "hiThere thisIsWayFun youGuys| and_more" (caser//on-temp-buffer-point "|hi_there this_is_way_fun you_guys and_more" - (caser/camelcase-dwim 3))))) + (caser-camelcase-dwim 3))))) (ert-deftest camelcase-dwim/moves-to-beginning-of-word () (should (equal "hi_mom andOther| stuff_here" (caser//on-temp-buffer-point "hi_mom and_ot|her stuff_here" - (caser/camelcase-dwim 1))))) + (caser-camelcase-dwim 1))))) (ert-deftest camelcase-dwim/backward-moves-to-end-of-word () (should (equal "hi_mom |andOther stuff_here" (caser//on-temp-buffer-point "hi_mom an|d_other stuff_here" - (caser/camelcase-dwim -1))))) + (caser-camelcase-dwim -1))))) (ert-deftest camelcase-dwim/starting-at-end-of-word-still-moves-forward () (should (equal "hi_mom andOther| stuff_here" (caser//on-temp-buffer-point "hi_mom| and_other stuff_here" - (caser/camelcase-dwim 1))))) + (caser-camelcase-dwim 1))))) ;;snakecase_tests ;;region tests @@ -263,183 +263,183 @@ (should (equal "hi|" (caser//on-temp-buffer-point "hi" - (caser/snakecase-region 1 3))))) + (caser-snakecase-region 1 3))))) (ert-deftest snakecase-region/from-camelcase/one-word () (should (equal "hi_mom|" (caser//on-temp-buffer-point "hiMom" - (caser/snakecase-region 1 7))))) + (caser-snakecase-region 1 7))))) (ert-deftest snakecase-region/from-dashcase/one-word () (should (equal "hi_mom|" (caser//on-temp-buffer-point "hi-mom" - (caser/snakecase-region 1 7))))) + (caser-snakecase-region 1 7))))) (ert-deftest snakecase-region/from-camelcase/multiple-caps/middle-of-word () (should (equal "my_ip_address|" (caser//on-temp-buffer-point "myIPAddress" - (caser/snakecase-region (point-min) (point-max)))))) + (caser-snakecase-region (point-min) (point-max)))))) (ert-deftest snakecase-region/from-camelcase/multiple-caps/end-of-word () (should (equal "my_ip|" (caser//on-temp-buffer-point "myIP" - (caser/snakecase-region (point-min) (point-max)))))) + (caser-snakecase-region (point-min) (point-max)))))) (ert-deftest snakecase-region/from-dashcase/caps-in-dashcase () (should (equal "this_is_not_wrong|" (caser//on-temp-buffer-point "this-Is-Not-WRONG" - (caser/snakecase-region (point-min) (point-max)))))) + (caser-snakecase-region (point-min) (point-max)))))) ;;word tests (ert-deftest snakecase-word/from-camelcase () (should (equal "ab_cd| efGh" (caser//on-temp-buffer-point "|abCd efGh" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) (ert-deftest snakecase-word/from-dashcase () (should (equal "ab_cd| ef-gh" (caser//on-temp-buffer-point "|ab-cd ef-gh" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) (ert-deftest snakecase-word/called-twice () (should (equal "hi_mom and_other| stuffHere" (caser//on-temp-buffer-point "hiMom andOther stuffHere" - (caser/snakecase-word 2))))) + (caser-snakecase-word 2))))) (ert-deftest snakecase-word/camelcase-and-dashcase () (should (equal "hi_mom and_other| stuff_here" (caser//on-temp-buffer-point "hiMom and-other stuff_here" - (caser/snakecase-word 2))))) + (caser-snakecase-word 2))))) (ert-deftest snakecase-word/backwards-one-word () (should (equal "hi-mom |and_other stuffHere" (caser//on-temp-buffer-point "hi-mom and-other| stuffHere" - (caser/snakecase-word -1))))) + (caser-snakecase-word -1))))) (ert-deftest snakecase-word/starting-at-end-of-word-still-moves-forward () (should (equal "hi-mom and_other| stuffHere" (caser//on-temp-buffer-point "hi-mom| andOther stuffHere" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) (ert-deftest snakecase-word/starting-at-start-of-word-still-moves-backward () (should (equal "hi-mom |and_other stuffHere" (caser//on-temp-buffer-point "hi-mom and-other |stuffHere" - (caser/snakecase-word -1))))) + (caser-snakecase-word -1))))) (ert-deftest snakecase-word/starting-at-end-of-word/backward () (should (equal "hiMom |and_other stuff-here" (caser//on-temp-buffer-point "hiMom andOther| stuff-here" - (caser/snakecase-word -1))))) + (caser-snakecase-word -1))))) (ert-deftest snakecase-word/starting-at-end-of-word/forward () (should (equal "hi-mom and_other| stuff-here" (caser//on-temp-buffer-point "hi-mom| and-other stuff-here" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) (ert-deftest snakecase-word/starting-at-start-of-word/forward () (should (equal "hiMom and_other| stuffHere" (caser//on-temp-buffer-point "hiMom |andOther stuffHere" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) (ert-deftest snakecase-word/starting-at-start-of-word/backward () (should (equal "hi-mom |and_other stuff-here" (caser//on-temp-buffer-point "hi-mom and-other |stuff-here" - (caser/snakecase-word -1))))) + (caser-snakecase-word -1))))) (ert-deftest snakecase-word/icelandic/from-dashcase () (should (equal "orð_á_íslensku|" (caser//on-temp-buffer-point "|orð-á-íslensku" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) (ert-deftest snakecase-word/icelandic/from-camelcase () (should (equal "orð_á_íslensku|" (caser//on-temp-buffer-point "|orðÁÍslensku" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) (ert-deftest snakecase-word/german/from-dashcase () (should (equal "deutsch_ist_ähnlich|" (caser//on-temp-buffer-point "|deutsch-ist-ähnlich" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) (ert-deftest snakecase-word/german/from-camelcase () (should (equal "deutsch_ist_ähnlich|" (caser//on-temp-buffer-point "|deutschIstÄhnlich" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) (ert-deftest snakecase-word/korean/from-dashcase () (should (equal "한국어_단어|" (caser//on-temp-buffer-point "|한국어-단어" - (caser/snakecase-word 1))))) + (caser-snakecase-word 1))))) ;;dwim tests (ert-deftest snakecase-dwim/single-word-doesnt-change () (should (equal "hi" (caser//on-temp-buffer "hi" - (caser/snakecase-dwim 1))))) + (caser-snakecase-dwim 1))))) (ert-deftest snakecase-dwim/backward-single-word-doesnt-change () (should (equal "|hi" (caser//on-temp-buffer-point "hi|" - (caser/snakecase-dwim -1))))) + (caser-snakecase-dwim -1))))) (ert-deftest snakecase-dwim/from-camelcase () (should (equal "hi_mom|" (caser//on-temp-buffer-point "hiMom" - (caser/snakecase-dwim 1))))) + (caser-snakecase-dwim 1))))) (ert-deftest snakecase-dwim/from-dashcase () (should (equal "hi_mom|" (caser//on-temp-buffer-point "hi-mom" - (caser/snakecase-dwim 1))))) + (caser-snakecase-dwim 1))))) (ert-deftest snakecase-dwim/camelcase-two-arg () (should (equal "hi_mom and_other| stuffHere" (caser//on-temp-buffer-point "hiMom andOther stuffHere" - (caser/snakecase-dwim 2))))) + (caser-snakecase-dwim 2))))) (ert-deftest snakecase-dwim/moves-to-beginning-of-word () (should (equal "hi-mom and_other| stuff-here" (caser//on-temp-buffer-point "hi-mom and-ot|her stuff-here" - (caser/snakecase-dwim 1))))) + (caser-snakecase-dwim 1))))) (ert-deftest snakecase-dwim/backward-moves-to-end-of-word () (should (equal "hi-mom |and_other stuffHere" (caser//on-temp-buffer-point "hi-mom an|dOther stuffHere" - (caser/snakecase-dwim -1))))) + (caser-snakecase-dwim -1))))) (ert-deftest snakecase-dwim/starting-at-end-of-word-still-moves-forward () (should (equal "hiMom and_other| stuff-here" (caser//on-temp-buffer-point "hiMom| and-other stuff-here" - (caser/snakecase-dwim 1))))) + (caser-snakecase-dwim 1))))) ;;dashcase-tests ;; region tests @@ -447,178 +447,178 @@ (should (equal "hi|" (caser//on-temp-buffer-point "hi" - (caser/dashcase-region 1 3))))) + (caser-dashcase-region 1 3))))) (ert-deftest dashcase-region/from-camelcase/one-word () (should (equal "hi-mom|" (caser//on-temp-buffer-point "hiMom" - (caser/dashcase-region 1 7))))) + (caser-dashcase-region 1 7))))) (ert-deftest dashcase-region/from-snakecase/one-word () (should (equal "hi-mom|" (caser//on-temp-buffer-point "hi-mom" - (caser/dashcase-region 1 7))))) + (caser-dashcase-region 1 7))))) (ert-deftest dashcase-region/from-camelcase/multiple-caps/middle-of-word () (should (equal "my-ip-address|" (caser//on-temp-buffer-point "myIPAddress" - (caser/dashcase-region (point-min) (point-max)))))) + (caser-dashcase-region (point-min) (point-max)))))) (ert-deftest dashcase-region/from-camelcase/multiple-caps/end-of-word () (should (equal "my-ip|" (caser//on-temp-buffer-point "myIP" - (caser/dashcase-region (point-min) (point-max)))))) + (caser-dashcase-region (point-min) (point-max)))))) (ert-deftest dashcase-region/from-snakecase/caps-in-snakecase () (should (equal "this-is-not-wrong|" (caser//on-temp-buffer-point "this_Is_NOT_Wrong" - (caser/dashcase-region (point-min) (point-max)))))) + (caser-dashcase-region (point-min) (point-max)))))) ;; word tests (ert-deftest dashcase-word/from-camelcase () (should (equal "ab-cd| efGh" (caser//on-temp-buffer-point "|abCd efGh" - (caser/dashcase-word 1))))) + (caser-dashcase-word 1))))) (ert-deftest dashcase-word/from-snakecase () (should (equal "hi-mom| and_other stuff_here" (caser//on-temp-buffer-point "hi_mom and_other stuff_here" - (caser/dashcase-word 1))))) + (caser-dashcase-word 1))))) (ert-deftest dashcase-word/called-twice () (should (equal "hi-mom and-other| stuffHere" (caser//on-temp-buffer-point "hiMom andOther stuffHere" - (caser/dashcase-word 2))))) + (caser-dashcase-word 2))))) (ert-deftest dashcase-word/camelcase-and-snakecase () (should (equal "hi-mom and-other| stuff_here" (caser//on-temp-buffer-point "hiMom and_other stuff_here" - (caser/dashcase-word 2))))) + (caser-dashcase-word 2))))) (ert-deftest dashcase-word/backwards-one-word () (should (equal "hi_mom |and-other stuff_here" (caser//on-temp-buffer-point "hi_mom and_other| stuff_here" - (caser/dashcase-word -1))))) + (caser-dashcase-word -1))))) (ert-deftest dashcase-word/starting-at-end-of-word/backward () (should (equal "hi_mom |and-other stuff_here" (caser//on-temp-buffer-point "hi_mom and_other| stuff_here" - (caser/dashcase-word -1))))) + (caser-dashcase-word -1))))) (ert-deftest dashcase-word/starting-at-end-of-word/forward () (should (equal "hi_mom and-other| stuff_here" (caser//on-temp-buffer-point "hi_mom| and_other stuff_here" - (caser/dashcase-word 1))))) + (caser-dashcase-word 1))))) (ert-deftest dashcase-word/starting-at-start-of-word/forward () (should (equal "hi_mom and-other| stuff_here" (caser//on-temp-buffer-point "hi_mom |and_other stuff_here" - (caser/dashcase-word 1))))) + (caser-dashcase-word 1))))) (ert-deftest dashcase-word/starting-at-start-of-word/backward () (should (equal "hi_mom |and-other stuff_here" (caser//on-temp-buffer-point "hi_mom and_other |stuff_here" - (caser/dashcase-word -1))))) + (caser-dashcase-word -1))))) (ert-deftest dashcase-word/icelandic/from-snakecase () (should (equal "orð-á-íslensku|" (caser//on-temp-buffer-point "|orð_á_íslensku" - (caser/dashcase-word 1))))) + (caser-dashcase-word 1))))) (ert-deftest dashcase-word/icelandic/from-camelcase () (should (equal "orð-á-íslensku|" (caser//on-temp-buffer-point "|orðÁÍslensku" - (caser/dashcase-word 1))))) + (caser-dashcase-word 1))))) (ert-deftest dashcase-word/german/from-snakecase () (should (equal "deutsch-ist-ähnlich|" (caser//on-temp-buffer-point "|deutsch_ist_ähnlich" - (caser/dashcase-word 1))))) + (caser-dashcase-word 1))))) (ert-deftest dashcase-word/german/from-camelcase () (should (equal "deutsch-ist-ähnlich|" (caser//on-temp-buffer-point "|deutschIstÄhnlich" - (caser/dashcase-word 1))))) + (caser-dashcase-word 1))))) (ert-deftest dashcase-word/korean/from-snakecase () (should (equal "한국어-단어|" (caser//on-temp-buffer-point "|한국어_단어" - (caser/dashcase-word 1))))) + (caser-dashcase-word 1))))) ;; dwim tests (ert-deftest dashcase-dwim/single-word-doesnt-change () (should (equal "hi" (caser//on-temp-buffer "hi" - (caser/dashcase-dwim 1))))) + (caser-dashcase-dwim 1))))) (ert-deftest dashcase-dwim/backward-single-word-doesnt-change () (should (equal "|hi" (caser//on-temp-buffer-point "hi|" - (caser/dashcase-dwim -1))))) + (caser-dashcase-dwim -1))))) (ert-deftest dashcase-dwim/from-camelcase () (should (equal "hi-mom|" (caser//on-temp-buffer-point "hiMom" - (caser/dashcase-dwim 1))))) + (caser-dashcase-dwim 1))))) (ert-deftest dashcase-dwim/from-snakecase () (should (equal "hi-mom|" (caser//on-temp-buffer-point "hi_mom" - (caser/dashcase-dwim 1))))) + (caser-dashcase-dwim 1))))) (ert-deftest dashcase-dwim/camelcase-two-arg () (should (equal "hi-mom and-other| stuffHere" (caser//on-temp-buffer-point "hiMom andOther stuffHere" - (caser/dashcase-dwim 2))))) + (caser-dashcase-dwim 2))))) (ert-deftest dashcase-dwim/moves-to-beginning-of-word () (should (equal "hiMom and-other| stuffHere" (caser//on-temp-buffer-point "hiMom andOt|her stuffHere" - (caser/dashcase-dwim 1))))) + (caser-dashcase-dwim 1))))) (ert-deftest dashcase-dwim/backward-moves-to-end-of-word () (should (equal "hi_mom |and-other stuff_here" (caser//on-temp-buffer-point "hi_mom an|dOther stuff_here" - (caser/dashcase-dwim -1))))) + (caser-dashcase-dwim -1))))) (ert-deftest dashcase-dwim/starting-at-end-of-word-still-moves-forward () (should (equal "hi_mom and-other| stuff_here" (caser//on-temp-buffer-point "hi_mom| and_other stuff_here" - (caser/dashcase-dwim 1))))) + (caser-dashcase-dwim 1))))) ;;forward-word (ert-deftest forward-word/all-lowercase () (should (equal "hi| there friends" (caser//on-temp-buffer-point "|hi there friends" - (caser//forward-word 1))))) + (caser--forward-word 1))))) (ert-deftest forward-word/starting-end-of-line () (should (equal "hi there @@ -626,7 +626,7 @@ (caser//on-temp-buffer-point "hi there| you all" - (caser//forward-word 1))))) + (caser--forward-word 1))))) (ert-deftest forward-word/multiple-newlines () (should (equal "hi there @@ -640,7 +640,7 @@ you all" - (caser//forward-word 1))))) + (caser--forward-word 1))))) (ert-deftest forward-word/backward/multiple-newlines () (should (equal "hi |there @@ -654,7 +654,7 @@ |you all" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/ending-end-of-line () (should (equal "hi there| @@ -662,7 +662,7 @@ (caser//on-temp-buffer-point "hi| there you all" - (caser//forward-word 1))))) + (caser--forward-word 1))))) (ert-deftest forward-word/backwards/starting-end-of-line () (should (equal "hi |there @@ -670,7 +670,7 @@ (caser//on-temp-buffer-point "hi there| you all" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/backwards/ending-start-of-line () (should (equal "hi there @@ -678,19 +678,19 @@ (caser//on-temp-buffer-point "hi there you| all" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/end-of-buffer () (should (equal "hi there|" (caser//on-temp-buffer-point "hi| there" - (caser//forward-word 1))))) + (caser--forward-word 1))))) (ert-deftest forward-word/backwards/start-of-buffer () (should (equal "|hi there" (caser//on-temp-buffer-point "hi| there" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/through-line-end () (should (equal "hi there @@ -698,167 +698,167 @@ (caser//on-temp-buffer-point "hi| there you all" - (caser//forward-word 2))))) + (caser--forward-word 2))))) (ert-deftest forward-word/camelcase () (should (equal "hiThere| friends" (caser//on-temp-buffer-point "|hiThere friends" - (caser//forward-word 1))))) + (caser--forward-word 1))))) (ert-deftest forward-word/dashcase () (should (equal "hi-there| friends-who" (caser//on-temp-buffer-point "|hi-there friends-who" - (caser//forward-word 1))))) + (caser--forward-word 1))))) (ert-deftest forward-word/snakecase () (should (equal "hi_there| friends_who" (caser//on-temp-buffer-point "|hi_there friends_who" - (caser//forward-word 1))))) + (caser--forward-word 1))))) (ert-deftest forward-word/camelcase/backwards () (should (equal "hiThere |friendsWho" (caser//on-temp-buffer-point "hiThere friendsWho|" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/dashcase/backwards () (should (equal "hi-there |friends-who" (caser//on-temp-buffer-point "hi-there friends-who|" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/snakecase/backwards () (should (equal "hi_there |friends_who" (caser//on-temp-buffer-point "hi_there friends_who|" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/one-back-starting-before-space/camelcase () (should (equal "hi |thereYou friends" (caser//on-temp-buffer-point "hi thereYou| friends" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/one-back-starting-before-space/snakecase () (should (equal "hi |there_you friends" (caser//on-temp-buffer-point "hi there_you| friends" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/one-back-starting-before-space/dashcase () (should (equal "hi |there-you friends" (caser//on-temp-buffer-point "hi there-you| friends" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/one-back-starting-after-space/camelcase () (should (equal "hi |thereYou friends" (caser//on-temp-buffer-point "hi thereYou |friends" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/one-back-starting-after-space/snakecase () (should (equal "hi |there_you friends" (caser//on-temp-buffer-point "hi there_you |friends" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/one-back-starting-after-space/dashcase () (should (equal "hi |there-you friends" (caser//on-temp-buffer-point "hi there-you |friends" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/one-back-starting-before-space/no-case () (should (equal "hi there |you friends" (caser//on-temp-buffer-point "hi there you| friends" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/one-back-starting-after-space/no-case () (should (equal "hi there |you friends" (caser//on-temp-buffer-point "hi there you |friends" - (caser//forward-word -1))))) + (caser--forward-word -1))))) (ert-deftest forward-word/two-back-starting-before-space/no-case () (should (equal "hi |there you friends" (caser//on-temp-buffer-point "hi there you| friends" - (caser//forward-word -2))))) + (caser--forward-word -2))))) (ert-deftest forward-word/two-back-starting-after-space/no-case () (should (equal "hi |there you friends" (caser//on-temp-buffer-point "hi there you |friends" - (caser//forward-word -2))))) + (caser--forward-word -2))))) (ert-deftest forward-word/two-back-starting-after-space/camelcase () (should (equal "I say |hiThere allYou friends" (caser//on-temp-buffer-point "I say hiThere allYou |friends" - (caser//forward-word -2))))) + (caser--forward-word -2))))) (ert-deftest forward-word/two-back-starting-after-space/dashcase () (should (equal "I say |hi-there all-you friends" (caser//on-temp-buffer-point "I say hi-there all-you |friends" - (caser//forward-word -2))))) + (caser--forward-word -2))))) (ert-deftest forward-word/two-back-starting-after-space/snakecase () (should (equal "I say |hi_there all_you friends" (caser//on-temp-buffer-point "I say hi_there all_you |friends" - (caser//forward-word -2))))) + (caser--forward-word -2))))) (ert-deftest forward-word/two-back-starting-before-space () (should (equal "hi |thEre all-you friends" (caser//on-temp-buffer-point "hi thEre all-you| friends" - (caser//forward-word -2))))) + (caser--forward-word -2))))) (ert-deftest forward-word/two-back-starting-after-space () (should (equal "hi |thEre all-you friends" (caser//on-temp-buffer-point "hi thEre all-you |friends" - (caser//forward-word -2))))) + (caser--forward-word -2))))) (ert-deftest forward-word/two-lowercase () (should (equal "hi there| friends" (caser//on-temp-buffer-point "|hi there friends" - (caser//forward-word 2))))) + (caser--forward-word 2))))) (ert-deftest forward-word/two-camelcase () (should (equal "hiThere friendsWho| areHere" (caser//on-temp-buffer-point "|hiThere friendsWho areHere" - (caser//forward-word 2))))) + (caser--forward-word 2))))) (ert-deftest forward-word/two-dashcase () (should (equal "hi-there friends-who| are-here" (caser//on-temp-buffer-point "|hi-there friends-who are-here" - (caser//forward-word 2))))) + (caser--forward-word 2))))) (ert-deftest forward-word/two-snakecase () (should (equal "hi_there friends_who| are_here" (caser//on-temp-buffer-point "|hi_there friends_who are_here" - (caser//forward-word 2))))) + (caser--forward-word 2))))) (ert-deftest forward-word/one-of-each () (should (equal "hi-there friendsWho are_here| but not really" (caser//on-temp-buffer-point "|hi-there friendsWho are_here but not really" - (caser//forward-word 3))))) + (caser--forward-word 3))))) (ert-deftest forward-word/through-special-characters () (should (equal "hi +-_=there| friends" (caser//on-temp-buffer-point "|hi +-_=there friends" - (caser//forward-word 2))))) + (caser--forward-word 2)))))