Improve line-break handling with thread/unwind-first

Author: Malabarba

clojure-mode.el

@@ -1389,7 +1389,7 @@ nil."
   "Delete the surrounding sexp and return it."
   (let ((begin (point)))
     (forward-sexp)
-    (let ((result (buffer-substring-no-properties begin (point))))
+    (let ((result (buffer-substring begin (point))))
       (delete-region begin (point))
       result)))
 
@@ -1609,7 +1609,9 @@ Point must be between the opening paren and the -> symbol."
       (clojure--ensure-parens-around-function-names)
       (down-list)
       (forward-sexp)
-      (insert contents)))
+      (insert contents)
+      (forward-sexp -1)
+      (clojure--maybe-unjoin-line)))
   (forward-char))
 
 (defun clojure--pop-out-of-threading ()
@@ -1677,9 +1679,14 @@ Return nil if there are no more levels to unwind."
     (let ((contents (clojure-delete-and-extract-sexp)))
       (backward-up-list)
       (just-one-space 0)
-      (insert contents)
-      (newline-and-indent)
-      (clojure--remove-superfluous-parens)
+      (save-excursion
+        (insert contents "\n")
+        (clojure--remove-superfluous-parens))
+      (when (looking-at "\\s-*\n")
+        (join-line 'following)
+        (forward-char 1)
+        (put-text-property (point) (1+ (point))
+                           'clojure-thread-line-joined t))
       t)))
 
 (defun clojure--thread-last ()
@@ -1690,8 +1697,7 @@ Return nil if there are no more levels to unwind."
     (let ((contents (clojure-delete-and-extract-sexp)))
       (just-one-space 0)
       (backward-up-list)
-      (insert contents)
-      (newline-and-indent)
+      (insert contents "\n")
       (clojure--remove-superfluous-parens)
       ;; cljr #255 Fix dangling parens
       (forward-sexp)

test/clojure-mode-refactor-threading-test.el

@@ -331,7 +331,7 @@
       [a b])"
   (clojure-unwind-all))
 
-(def-threading-test maybe-unjoin-lines
+(def-threading-test last-maybe-unjoin-lines
     "(deftask dev []
   (comp (serve)
         (cljs (lala)
@@ -344,6 +344,27 @@
   (clojure-thread-last-all nil)
   (clojure-unwind-all))
 
+(def-threading-test empty-first-line
+    "(map
+ inc
+ [1 2])"
+    "(-> inc
+    (map
+     [1 2]))"
+  (goto-char (point-min))
+  (clojure-thread-first-all nil))
+
+(def-threading-test first-maybe-unjoin-lines
+    "(map
+ inc
+ [1 2])"
+    "(map
+ inc
+ [1 2])"
+  (goto-char (point-min))
+  (clojure-thread-first-all nil)
+  (clojure-unwind-all))
+
 (provide 'clojure-mode-refactor-threading-test)
 
 ;;; clojure-mode-refactor-threading-test.el ends here