[Fix #877] Do not pair do in elixir strings/comments

Fuco1 · Mar 25, 2018 · 6eea872 · 6eea872
1 parent bf7bf7c
commit 6eea872
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/smartparens-elixir.el b/smartparens-elixir.el
@@ -97,7 +97,8 @@ ID, ACTION, CONTEXT."
 (sp-with-modes 'elixir-mode
   (sp-local-pair "do" "end"
                  :when '(("SPC" "RET" "<evil-ret>"))
-                 :skip-match 'sp-elixir-skip-def-p)
+                 :skip-match 'sp-elixir-skip-def-p
+                 :unless '(sp-in-comment-p sp-in-string-p))
   (sp-local-pair "def" "end"
                  :when '(("SPC" "RET" "<evil-ret>"))
                  :post-handlers '(sp-elixir-do-block-post-handler)

diff --git a/test/smartparens-elixir-test.el b/test/smartparens-elixir-test.el
@@ -122,6 +122,9 @@ end"))
 (ert-deftest sp-test-elixir-if-block-insertion-in-string ()
   (sp-test-insertion-elixir "\"a string |" "if " "\"a string if |"))
 
+(ert-deftest sp-test-elixir-do-block-insertion-in-string ()
+  (sp-test-insertion-elixir "\"a string |" "do " "\"a string do |"))
+
 (ert-deftest sp-test-elixir-forward-slurp ()
   "Ensure that commas are handled properly when slurping forward"
   (sp-test-with-temp-buffer "[1, [|2], :a]"