diff options
| -rw-r--r-- | emmet-mode.el | 19 | ||||
| -rw-r--r-- | src/mode-def.el | 19 | ||||
| -rw-r--r-- | src/test.el | 7 |
3 files changed, 14 insertions, 31 deletions
diff --git a/emmet-mode.el b/emmet-mode.el index 5d9b913..8a9d5fb 100644 --- a/emmet-mode.el +++ b/emmet-mode.el @@ -3922,22 +3922,11 @@ accept it or skip it." (interactive "sExpression to wrap with: ") (let* ((emmet-move-cursor-between-quotes nil) (to-wrap (buffer-substring-no-properties (region-beginning) (region-end))) - (expr (concat wrap-with - ">{" - (replace-regexp-in-string - "\\$" - "!EMMET-DOLLAR-REPLACEMENT!" - (replace-regexp-in-string - "}" - "!EMMET-BRACKET-REPLACEMENT!" - to-wrap nil t) nil t) - "}")) + (expr (concat wrap-with ">{!EMMET-TO-WRAP-REPLACEMENT!}")) (markup (replace-regexp-in-string - "!EMMET-DOLLAR-REPLACEMENT!" - "$" - (replace-regexp-in-string - "!EMMET-BRACKET-REPLACEMENT!" - "}" (emmet-transform expr) nil t) nil t))) + "!EMMET-TO-WRAP-REPLACEMENT!" to-wrap + (emmet-transform expr) + t t))) (when markup (delete-region (region-beginning) (region-end)) (insert markup) diff --git a/src/mode-def.el b/src/mode-def.el index 515b51a..e0a22b9 100644 --- a/src/mode-def.el +++ b/src/mode-def.el @@ -433,22 +433,11 @@ accept it or skip it." (interactive "sExpression to wrap with: ") (let* ((emmet-move-cursor-between-quotes nil) (to-wrap (buffer-substring-no-properties (region-beginning) (region-end))) - (expr (concat wrap-with - ">{" - (replace-regexp-in-string - "\\$" - "!EMMET-DOLLAR-REPLACEMENT!" - (replace-regexp-in-string - "}" - "!EMMET-BRACKET-REPLACEMENT!" - to-wrap nil t) nil t) - "}")) + (expr (concat wrap-with ">{!EMMET-TO-WRAP-REPLACEMENT!}")) (markup (replace-regexp-in-string - "!EMMET-DOLLAR-REPLACEMENT!" - "$" - (replace-regexp-in-string - "!EMMET-BRACKET-REPLACEMENT!" - "}" (emmet-transform expr) nil t) nil t))) + "!EMMET-TO-WRAP-REPLACEMENT!" to-wrap + (emmet-transform expr) + t t))) (when markup (delete-region (region-beginning) (region-end)) (insert markup) diff --git a/src/test.el b/src/test.el index 48bb5ed..28b7db4 100644 --- a/src/test.el +++ b/src/test.el @@ -624,6 +624,7 @@ (defun emmet-wrap-with-markup-test (lis) (let ((es (car lis)) + (ins (or (elt lis 1) "This is gnarly text with $$$s and <span>markup</span> and end brackets}}s")) (indent-tabs-mode nil) (tab-width 2) (standard-indent 2)) @@ -631,7 +632,7 @@ (emmet-mode 1) (sgml-mode) (set-mark (point)) - (insert "This is gnarly text with $$$s and <span>markup</span> and end brackets}}s") + (insert ins) (emmet-wrap-with-markup es) (buffer-string)))) @@ -643,5 +644,9 @@ #'emmet-wrap-with-markup-test '((("div>ul>li*3") . "<div>\n <ul>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n </ul>\n</div>"))) +(emmet-run-test-case "Wrap with multiline content" + #'emmet-wrap-with-markup-test + '((("div>ul>li" "I am some\nmultiline\n text") . "<div>\n <ul>\n <li>I am some\n multiline\n text</li>\n </ul>\n</div>"))) + ;; start (emmet-test-cases) |