Merge pull request #1226 from samglt/swift-string-interp

Don't pair escaped parens in swift-mode

Author: Fuco1

smartparens-swift.el

@@ -107,7 +107,8 @@
   (sp-local-pair "<" ">"
                  :when '(sp-swift-filter-angle-brackets)
                  :skip-match 'sp-swift-skip-match-angle-bracket)
-  (sp-local-pair "\"\"\"" "\"\"\""))
+  (sp-local-pair "\"\"\"" "\"\"\"")
+  (sp-local-pair "\\(" ")" :actions '(wrap insert) :when '(sp-in-string-p)))
 
 ;; Swift has no sexp suffixes.  This fixes slurping
 ;; (|foo).bar -> (foo.bar)

test/smartparens-swift-test.el

@@ -123,3 +123,10 @@ func bar(x: UInt64) -> Bool {
     (mark-whole-buffer)
     (call-interactively 'sp-kill-region)
     (should (equal (buffer-string) ""))))
+
+(ert-deftest sp-test-swift-string-interp-paren ()
+  "String interpolation should not escape closing paren"
+  (sp-test-with-temp-buffer "print(\"foo is: |\")"
+      (swift-mode)
+    (execute-kbd-macro "\\(")
+    (sp-buffer-equals "print(\"foo is: \\(|)\")")))