Change %! -> %n and %> -> %e

hlissner · hlissner · commit cc922b62fdb4 · 2019-07-14T22:35:30.000+02:00
Because format-spec doesn't support ! and &gt; as spec characters.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ An example of its use:
 # name: while ... { ... }
 # key: while
 # --
-while ${1:true} { `(doom-snippets-format "%!%s%!")`$0 }
+while ${1:true} { `(doom-snippets-format "%n%s%n")`$0 }
 ```
 
 If the selection consists of a single line, this will expand to:
@@ -109,8 +109,8 @@ to_string()
 If this variable is non-nil, this package will define the following shortcut
 function aliases for your convenience:
 
-+ `!%!` = `(doom-snippet-format "%!%s%!")`
-+ `!%` = `(doom-snippet-format "%!%s")`
++ `!%!` = `(doom-snippet-format "%n%s%n")`
++ `!%` = `(doom-snippet-format "%n%s")`
 + `%$` = `(doom-snippet-format "%>")`
 + `(%expand ...)` = `(doom-snippet-expand ...)`
 + `(%format ...)` = `(doom-snippet-format ...)`
diff --git a/doom-snippets-lib.el b/doom-snippets-lib.el
@@ -40,8 +40,8 @@ If TRIM is non-nil, trim leading and trailing whitespace from
 Like `format', but with a custom spec:
 
   %s  The contents of your current selection (`yas-selected-text`)
-  %!  A newline, if your current selection spans more than a single line
-  %>  A newline, unless the point is at EOL
+  %n  A newline, if your current selection spans more than a single line
+  %e  A newline, unless the point is at EOL
 
 If `yas-selected-text` is empty, `DEFAULT` is used.
 
@@ -51,23 +51,23 @@ trimmed."
          (text (if trim (string-trim text) text)))
     (format-spec format
                  `((?s . ,text)
-                   (?! . ,(if (> (doom-snippets-count-lines text) 1) "\n" ""))
-                   (?> . ,(if (eolp) "" "\n"))
+                   (?n . ,(if (> (doom-snippets-count-lines text) 1) "\n" ""))
+                   (?e . ,(if (eolp) "" "\n"))
                    ))))
 
 (defun doom-snippets-newline-selected-newline ()
   "Return `yas-selected-text' surrounded with newlines if it consists of more
 than one line."
-  (doom-snippets-format "%!%s%!" nil t))
+  (doom-snippets-format "%n%s%n" nil t))
 
 (defun doom-snippets-newline-selected ()
   "Return `yas-selected-text' prefixed with a newline if it consists of more
 than one line."
-  (doom-snippets-format "%!%s" nil t))
+  (doom-snippets-format "%n%s" nil t))
 
 (defun doom-snippets-newline-or-eol ()
   "Return newline, unless at `eolp'."
-  (doom-snippets-format "%>"))
+  (doom-snippets-format "%e"))
 
 (defun doom-snippets-count-lines (str)
   "Return how many lines are in STR."
diff --git a/doom-snippets.el b/doom-snippets.el
@@ -36,9 +36,9 @@
 (defvar doom-snippets-enable-short-helpers nil
   "If non-nil, defines convenience aliases for doom-snippets' api.
 
-+ `!%!' = (doom-snippet-format \"%!%s%!\")
-+ `!%' = (doom-snippet-format \"%!%s\")
-+ `%$' = (doom-snippet-format \"%>\")
++ `!%!' = (doom-snippet-format \"%n%s%n\")
++ `!%' = (doom-snippet-format \"%n%s\")
++ `%$' = (doom-snippet-format \"%e\")
 + `%expand' = `doom-snippet-expand'
 + `%format' = `doom-snippet-format'
 + `%without-trigger' = `doom-snippets-without-trigger'")
diff --git a/snippets/+emacs-lisp-ert-mode/ert-deftest b/snippets/+emacs-lisp-ert-mode/ert-deftest
@@ -2,4 +2,4 @@
 # name: ert-deftest
 # key: deftest
 # --
-(ert-deftest $1 ()`(doom-snippets-format "%!%s")`$0)
+(ert-deftest $1 ()`(doom-snippets-format "%n%s")`$0)
diff --git a/snippets/buttercup-minor-mode/after-all b/snippets/buttercup-minor-mode/after-all
@@ -2,4 +2,4 @@
 # name: after-all ...
 # key: afa
 # --
-(after-all ${1:`(doom-snippets-format "%!%s")`})
+(after-all ${1:`(doom-snippets-format "%n%s")`})
diff --git a/snippets/buttercup-minor-mode/after-each b/snippets/buttercup-minor-mode/after-each
@@ -2,4 +2,4 @@
 # name: after-each ...
 # key: afe
 # --
-(after-each ${1:`(doom-snippets-format "%!%s")`})
+(after-each ${1:`(doom-snippets-format "%n%s")`})
diff --git a/snippets/buttercup-minor-mode/before-all b/snippets/buttercup-minor-mode/before-all
@@ -2,4 +2,4 @@
 # name: before-all ...
 # key: bfa
 # --
-(before-all ${1:`(doom-snippets-format "%!%s")`})
+(before-all ${1:`(doom-snippets-format "%n%s")`})
diff --git a/snippets/buttercup-minor-mode/before-each b/snippets/buttercup-minor-mode/before-each
@@ -2,4 +2,4 @@
 # name: before-each ...
 # key: bfe
 # --
-(before-each ${1:`(doom-snippets-format "%!%s")`})
+(before-each ${1:`(doom-snippets-format "%n%s")`})
diff --git a/snippets/buttercup-minor-mode/describe b/snippets/buttercup-minor-mode/describe
@@ -2,4 +2,4 @@
 # name: describe ... ...
 # uuid: describe
 # --
-(describe "${1:group}"${2:`(doom-snippets-format "%!%s")`}$0)
+(describe "${1:group}"${2:`(doom-snippets-format "%n%s")`}$0)
diff --git a/snippets/buttercup-minor-mode/it b/snippets/buttercup-minor-mode/it
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: it ...
 # --
-(it "${1:...}" ${2:`(doom-snippets-format "%!%s")`}$0)
+(it "${1:...}" ${2:`(doom-snippets-format "%n%s")`}$0)
diff --git a/snippets/emacs-lisp-mode/after b/snippets/emacs-lisp-mode/after
@@ -1,4 +1,4 @@
 # -*- mode: snippet; require-final-newline: nil -*-
 # name: after
 # --
-(after! ${1:feature-name} `(doom-snippets-format "%!%s")`$0)`(doom-snippets-newline-or-eol)`
+(after! ${1:feature-name} `(doom-snippets-format "%n%s")`$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/cl-defmacro b/snippets/emacs-lisp-mode/cl-defmacro
@@ -2,4 +2,4 @@
 # name: cl-defmacro
 # uuid: cl-defmacro
 # --
-(cl-defmacro ${1:name} ($2) `(doom-snippets-format "%!%s")`$0)`(doom-snippets-newline-or-eol)`
+(cl-defmacro ${1:name} ($2) `(doom-snippets-format "%n%s")`$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/cl-defun b/snippets/emacs-lisp-mode/cl-defun
@@ -2,4 +2,4 @@
 # name: cl-defun
 # uuid: cl-defun
 # --
-(cl-defun ${1:name} ($2) `(doom-snippets-format "%!%s")`$0)`(doom-snippets-newline-or-eol)`
+(cl-defun ${1:name} ($2) `(doom-snippets-format "%n%s")`$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/cond b/snippets/emacs-lisp-mode/cond
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: cond
 # --
-(cond (${1:t} ${2:`(doom-snippets-format "%!%s")`})$0)
+(cond (${1:t} ${2:`(doom-snippets-format "%n%s")`})$0)
diff --git a/snippets/emacs-lisp-mode/defmacro b/snippets/emacs-lisp-mode/defmacro
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: defmacro
 # --
-(defmacro ${1:name} ($2) `(doom-snippets-format "%!%s")`$0)`(doom-snippets-newline-or-eol)`
+(defmacro ${1:name} ($2) `(doom-snippets-format "%n%s")`$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/defun b/snippets/emacs-lisp-mode/defun
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: defun
 # --
-(defun ${1:name} ($2)`(and % (concat " " (doom-snippets-format "%!%s")))`$0)`(doom-snippets-newline-or-eol)`
+(defun ${1:name} ($2)`(and % (concat " " (doom-snippets-format "%n%s")))`$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/dolist b/snippets/emacs-lisp-mode/dolist
@@ -1,3 +1,3 @@
 #name: dolist
 # --
-(dolist (${1:i} ${2:list}) `(doom-snippets-format "%!%s")`$0)`(doom-snippets-newline-or-eol)`
+(dolist (${1:i} ${2:list}) `(doom-snippets-format "%n%s")`$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/if b/snippets/emacs-lisp-mode/if
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: if
 # --
-(if ${1:t}`(if % (concat " " (doom-snippets-format "%!%s")))`$0)
+(if ${1:t}`(if % (concat " " (doom-snippets-format "%n%s")))`$0)
diff --git a/snippets/emacs-lisp-mode/if-let-2 b/snippets/emacs-lisp-mode/if-let-2
@@ -4,4 +4,4 @@
 # key: if-let
 # condition: (> (doom-snippets-count-lines %) 1)
 # --
-(if-let (($1)) $0 `(doom-snippets-format "%!%s")`)`(doom-snippets-newline-or-eol)`
+(if-let (($1)) $0 `(doom-snippets-format "%n%s")`)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/lambda b/snippets/emacs-lisp-mode/lambda
@@ -1,4 +1,4 @@
 #name: lambda
 #key: lambda
 # --
-(lambda ($1) (interactive) `(doom-snippets-format "%!%s")`$0)
+(lambda ($1) (interactive) `(doom-snippets-format "%n%s")`$0)
diff --git a/snippets/emacs-lisp-mode/let b/snippets/emacs-lisp-mode/let
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: let
 # --
-(let ($1) `(doom-snippets-format "%!%s")`)`(doom-snippets-newline-or-eol)`
+(let ($1) `(doom-snippets-format "%n%s")`)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/mapcl b/snippets/emacs-lisp-mode/mapcl
@@ -1,4 +1,4 @@
 #name: mapc lambda
 # --
-(mapc (lambda (${2:x}) `(doom-snippets-format "%!%s")`$0)
+(mapc (lambda (${2:x}) `(doom-snippets-format "%n%s")`$0)
       ${1:sequence})
diff --git a/snippets/emacs-lisp-mode/null b/snippets/emacs-lisp-mode/null
@@ -1,3 +1,3 @@
 #name: null
 # --
-(null `(doom-snippets-format "%!%s")`$0)
+(null `(doom-snippets-format "%n%s")`$0)
diff --git a/snippets/emacs-lisp-mode/number-to-string b/snippets/emacs-lisp-mode/number-to-string
@@ -1,3 +1,3 @@
 #name: number-to-string
 # --
-(number-to-string `(doom-snippets-format "%!%s")`$0)
+(number-to-string `(doom-snippets-format "%n%s")`$0)
diff --git a/snippets/emacs-lisp-mode/pcase b/snippets/emacs-lisp-mode/pcase
@@ -2,4 +2,4 @@
 # name: pcase
 # --
 (pcase ${1:var}
-  $>(${2:_} ${3:`(doom-snippets-format "%!%s")`})$0)`(doom-snippets-newline-or-eol)`
+  $>(${2:_} ${3:`(doom-snippets-format "%n%s")`})$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/progn b/snippets/emacs-lisp-mode/progn
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: progn
 # --
-(progn `(doom-snippets-format "%!%s")`$0)`(doom-snippets-newline-or-eol)`
+(progn `(doom-snippets-format "%n%s")`$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/save-excursion b/snippets/emacs-lisp-mode/save-excursion
@@ -3,4 +3,4 @@
 #key: save-excursion
 #key: se
 # --
-(save-excursion `(doom-snippets-format "%!%s")`$0)
+(save-excursion `(doom-snippets-format "%n%s")`$0)
diff --git a/snippets/emacs-lisp-mode/unless b/snippets/emacs-lisp-mode/unless
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: unless
 # --
-(unless ${1:condition} ${0:`(doom-snippets-format "%!%s")`})`(doom-snippets-newline-or-eol)`
+(unless ${1:condition} ${0:`(doom-snippets-format "%n%s")`})`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/when b/snippets/emacs-lisp-mode/when
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: when
 # --
-(when ${1:t} `(doom-snippets-format "%!%s")`$0)`(doom-snippets-newline-or-eol)`
+(when ${1:t} `(doom-snippets-format "%n%s")`$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/when-let b/snippets/emacs-lisp-mode/when-let
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: when-let
 # --
-(when-let* (${1:var-list}) `(doom-snippets-format "%!%s")`$0)`(doom-snippets-newline-or-eol)`
+(when-let* (${1:var-list}) `(doom-snippets-format "%n%s")`$0)`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/while b/snippets/emacs-lisp-mode/while
@@ -2,4 +2,4 @@
 # name: while
 # key: while
 # --
-(while ${1:condition} ${0:`(doom-snippets-format "%!%s")`})`(doom-snippets-newline-or-eol)`
+(while ${1:condition} ${0:`(doom-snippets-format "%n%s")`})`(doom-snippets-newline-or-eol)`
diff --git a/snippets/emacs-lisp-mode/with-current-buffer b/snippets/emacs-lisp-mode/with-current-buffer
@@ -2,4 +2,4 @@
 # name: with-current-buffer
 # key: wcb
 # --
-(with-current-buffer ${1:buffer} ${0:`(doom-snippets-format "%!%s")`})`(doom-snippets-newline-or-eol)`
+(with-current-buffer ${1:buffer} ${0:`(doom-snippets-format "%n%s")`})`(doom-snippets-newline-or-eol)`
diff --git a/snippets/html-mode/mailto b/snippets/html-mode/mailto
@@ -1,3 +1,3 @@
 #name: <a href="mailto:...@...">...</a>
 # --
-<a href="mailto:${1:john@doe.com}">`(doom-snippets-format "%!%s%!")`$0</a>
+<a href="mailto:${1:john@doe.com}">`(doom-snippets-format "%n%s%n")`$0</a>
diff --git a/snippets/js-mode/arrow b/snippets/js-mode/arrow
@@ -2,4 +2,4 @@
 # name: arrow function
 # key: =>
 # --
-$1 => `(if (> (doom-snippets-count-lines %) 1) (concat "{ " (doom-snippets-format "%!%s%!") " }") %)`$0
+$1 => `(if (> (doom-snippets-count-lines %) 1) (concat "{ " (doom-snippets-format "%n%s%n") " }") %)`$0
diff --git a/snippets/js-mode/filter-arrow b/snippets/js-mode/filter-arrow
@@ -2,4 +2,4 @@
 # name: arr.filter(item => {...})
 # key: fil=>
 # --
-`(unless (eq (char-before) ?.) ".")`filter(${1:item} => `(if (> (doom-snippets-count-lines %) 1) (concat "{ " (doom-snippets-format "%!%s%!") " }") %)`$0)`(if (eolp) ";")`
+`(unless (eq (char-before) ?.) ".")`filter(${1:item} => `(if (> (doom-snippets-count-lines %) 1) (concat "{ " (doom-snippets-format "%n%s%n") " }") %)`$0)`(if (eolp) ";")`
diff --git a/snippets/js-mode/filter-function b/snippets/js-mode/filter-function
@@ -3,5 +3,5 @@
 # key: filfu
 # --
 `(unless (eq (char-before) ?.) ".")`filter(function(${1:item}) {
-    `(doom-snippets-format "%!%s%!")`$0
+    `(doom-snippets-format "%n%s%n")`$0
 })`(if (eolp) ";")`
diff --git a/snippets/js-mode/forEach-arrow b/snippets/js-mode/forEach-arrow
@@ -2,4 +2,4 @@
 # name: arr.forEach((item) => {...})
 # key: fore=>
 # --
-`(unless (eq (char-before) ?.) ".")`forEach(${1:item} => `(if (> (doom-snippets-count-lines %) 1) (concat "{ " (doom-snippets-format "%!%s%!") " }") %)`$0)`(if (eolp) ";")`
+`(unless (eq (char-before) ?.) ".")`forEach(${1:item} => `(if (> (doom-snippets-count-lines %) 1) (concat "{ " (doom-snippets-format "%n%s%n") " }") %)`$0)`(if (eolp) ";")`
diff --git a/snippets/js-mode/forEach-function b/snippets/js-mode/forEach-function
@@ -3,5 +3,5 @@
 # key: forefu
 # --
 `(unless (eq (char-before) ?.) ".")`forEach(function(${1:item}) {
-    `(doom-snippets-format "%!%s%!")`$0
+    `(doom-snippets-format "%n%s%n")`$0
 })`(if (eolp) ";")`
diff --git a/snippets/js-mode/function b/snippets/js-mode/function
@@ -5,5 +5,5 @@
 # condition: (or (doom-snippets-bolp) (region-active-p))
 # --
 function ${1:name}($2) {
-    `(doom-snippets-format "%!%s%!")`$0
+    `(doom-snippets-format "%n%s%n")`$0
 }
diff --git a/snippets/js-mode/function_inline b/snippets/js-mode/function_inline
@@ -4,4 +4,4 @@
 # uuid: function_inline
 # condition: (or (not (doom-snippets-bolp)) (region-active-p))
 # --
-function ($1) { `(doom-snippets-format "%!%s%!")`$0 }`(if (eolp) ";")`
+function ($1) { `(doom-snippets-format "%n%s%n")`$0 }`(if (eolp) ";")`
diff --git a/snippets/js-mode/map-arrow b/snippets/js-mode/map-arrow
@@ -2,4 +2,4 @@
 # name: arr.map((item, i, arr) => {...})
 # key: map=>
 # --
-`(unless (eq (char-before) ?.) ".")`map((${1:item}, ${2:i}, ${3:arr}) => `(if (> (doom-snippets-count-lines %) 1) (concat "{ " (doom-snippets-format "%!%s%!") " }") %)`$0)`(if (eolp) ";")`
+`(unless (eq (char-before) ?.) ".")`map((${1:item}, ${2:i}, ${3:arr}) => `(if (> (doom-snippets-count-lines %) 1) (concat "{ " (doom-snippets-format "%n%s%n") " }") %)`$0)`(if (eolp) ";")`
diff --git a/snippets/js-mode/map-function b/snippets/js-mode/map-function
@@ -3,5 +3,5 @@
 # key: mapfu
 # --
 `(unless (eq (char-before) ?.) ".")`map(function(${1:item}, ${2:i}, ${3:arr}) {
-    `(doom-snippets-format "%!%s%!")`$0
+    `(doom-snippets-format "%n%s%n")`$0
 })`(if (eolp) ";")`
diff --git a/snippets/js-mode/while b/snippets/js-mode/while
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: while
 # --
-while (${1:true}) { ${0:`(doom-snippets-format "%!%s%!")`} }
+while (${1:true}) { ${0:`(doom-snippets-format "%n%s%n")`} }
diff --git a/snippets/lisp-mode/dolist b/snippets/lisp-mode/dolist
@@ -1,4 +1,4 @@
 # -*- mode: snippet -*-
 # name: dolist
 # --
-(dolist (${1:var} ${2:list}) ${3:`(doom-snippets-format "%!%s")`})
+(dolist (${1:var} ${2:list}) ${3:`(doom-snippets-format "%n%s")`})
diff --git a/snippets/lisp-mode/dotimes b/snippets/lisp-mode/dotimes
diff --git a/snippets/lisp-mode/if b/snippets/lisp-mode/if
diff --git a/snippets/lisp-mode/unless b/snippets/lisp-mode/unless
diff --git a/snippets/lisp-mode/when b/snippets/lisp-mode/when
diff --git a/snippets/rjsx-mode/tag b/snippets/rjsx-mode/tag
diff --git a/snippets/rjsx-mode/ul b/snippets/rjsx-mode/ul
diff --git a/snippets/rust-mode/block b/snippets/rust-mode/block
diff --git a/snippets/rust-mode/lambda b/snippets/rust-mode/lambda
diff --git a/snippets/rust-mode/loop b/snippets/rust-mode/loop
diff --git a/snippets/rust-mode/unsafe b/snippets/rust-mode/unsafe
diff --git a/snippets/rust-mode/while b/snippets/rust-mode/while
diff --git a/snippets/sh-mode/for-one-line b/snippets/sh-mode/for-one-line
diff --git a/snippets/sh-mode/function-one-line b/snippets/sh-mode/function-one-line
diff --git a/snippets/sh-mode/getopts b/snippets/sh-mode/getopts
diff --git a/snippets/web-mode/php b/snippets/web-mode/php
