Scala wrap indented region correctly

Fuco1 · Sep 11, 2021 · 1ebf53b · 1ebf53b
1 parent 2834c66
commit 1ebf53b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/smartparens-scala.el b/smartparens-scala.el
@@ -56,6 +56,7 @@
 (defun sp-scala-wrap-with-indented-newlines (_1 action _2)
   "Post handler for the wrap ACTION, putting the region on indented newlines."
   (when (eq action 'wrap)
+    (indent-for-tab-command)
     (sp-get sp-last-wrapped-region
       (let ((beg :beg-in)
             (end :end-in))

diff --git a/test/smartparens-scala-test.el b/test/smartparens-scala-test.el
@@ -44,6 +44,13 @@
     (execute-kbd-macro "{")
     (should (equal (buffer-string) "{\n  foo\n}"))))
 
+(ert-deftest sp-test-scala-curly-wrap-indent ()
+  "Wrap an indented region in an indented block"
+  (sp-test-with-temp-buffer "if (true)\n  |fooM"
+      (scala-mode)
+    (execute-kbd-macro "{")
+    (should (equal (buffer-string) "if (true)\n{\n  foo\n}"))))
+
 (ert-deftest sp-test-scala-triple-quotes ()
   "Close triple quotes"
   (sp-test-with-temp-buffer "sql|"