Apply padding indents on all lines

src/cljs-lib/src/calva/fmt/formatter.cljs

@@ -107,12 +107,16 @@
                   (second (re-find #"^(.*)\n?" tail))))))
 
 
-(defn- normalize-indents
+(defn normalize-indents
   "Normalizes indents based on where the text starts on the first line"
-  [{:keys [range-text eol] :as m}]
-  (let [indent-before (apply str (repeat (indent-before-range m) " "))
-        lines (clojure.string/split range-text #"\r?\n(?!\s*;)" -1)]
-    (assoc m :range-text (clojure.string/join (str eol indent-before) lines))))
+  [{:keys [range-text indent eol] :as m}]
+  (let [lines (clojure.string/split range-text #"\r?\n(?!\s*;)" -1)
+        padded-lines (map (fn [line]
+                            (if (re-matches #"^ *$" line)
+                              eol
+                              (str eol indent (clojure.string/replace line #" *$" ""))))
+                          (rest lines))]
+    (assoc m :range-text (clojure.string/join (conj padded-lines (first lines))))))
 
 
 (defn index-for-tail-in-range
@@ -135,23 +139,32 @@
 (defn format-text-at-range
   "Formats text from all-text at the range"
   [{:keys [range idx] :as m}]
-  (let [indent-before (indent-before-range m)
-        padding (apply str (repeat indent-before " "))
+  (let [indents (indent-before-range m)
+        padding (apply str (repeat indents " "))
         range-text (extract-range-text m)
-        padded-text (str padding range-text)
         range-index (- idx (first range))
         tail (subs range-text range-index)
-        formatted-m (format-text (assoc m :range-text padded-text))
-        formatted-text (subs (:range-text formatted-m) indent-before)]
+        formatted-m (format-text (assoc m :range-text range-text))
+        formatted-text (:range-text formatted-m)]
     (-> (assoc formatted-m
                :range-text formatted-text
-               :range-tail tail))))
-
-(defn format-text-at-range-bridge
-  [m]
-  (format-text-at-range m))
+               :range-tail tail
+               :indent padding)
+        (normalize-indents))))
 
 (comment
+  (-> {:eol "\n"
+       :all-text "  (foo)\n(defn bar\n[x]\nbaz)"
+       :range [2 26]}
+      format-text-at-range)
+  (-> {:eol "\n"
+       :all-text "  (foo)
+  (defn bar
+         [x]
+
+baz)"
+       :range [10 38]}
+      format-text-at-range)
   (format-text-at-range {:all-text "  '([]\n[])"
                          :idx 7
                          :on-type true
@@ -162,7 +175,24 @@
   (format-text-at-range {:eol "\n"
                          :all-text "[:foo\n\n(foo)(bar)]"
                          :idx 6
-                         :range [0 18]}))
+                         :range [0 18]})
+  (-> {:eol "\n"
+       :all-text "      (defn foo [a b]
+  (let [x + a b]
+    (println \"sum is\" x)))
+
+(defn bar [a b]
+  (let [x + a b]
+    (println \"sum is\" x)))"
+       :idx 6
+       :range [6 129]}
+      (format-text-at-range)))
+
+
+(defn format-text-at-range-bridge
+  [m]
+  (format-text-at-range m))
+
 
 
 (defn add-indent-token-if-empty-current-line

src/cljs-lib/test/calva/fmt/formatter_test.cljs

@@ -4,7 +4,7 @@
             [calva.fmt.formatter :as sut]))
 
 (deftest format-text-at-range
-  (is (= "(foo)\n(defn bar\n  [x]\n  baz)"
+  (is (= "(foo)\n  (defn bar\n    [x]\n    baz)"
          (:range-text (sut/format-text-at-range {:eol "\n" :all-text "  (foo)\n(defn bar\n[x]\nbaz)" :range [2 26]}))))
   (is (not (contains? (sut/format-text-at-range {:eol "\n" :all-text "  (foo)\n(defn bar\n[x]\nbaz)" :range [2 26]}) :new-index))))
 
@@ -115,6 +115,7 @@ bar))")
   (is (= "(foo)\n  (defn bar\n    [x]\n    baz)"
          (:range-text (sut/normalize-indents {:eol "\n"
                                               :all-text "  (foo)\n(defn bar\n[x]\nbaz)"
+                                              :indent "  "
                                               :range [2 26]
                                               :range-text "(foo)\n(defn bar\n  [x]\n  baz)"})))))
 
@@ -140,8 +141,10 @@ bar))")
 (deftest format-text-at-idx-on-type
   (is (= "(bar \n\n )"
          (:range-text (sut/format-text-at-idx-on-type {:eol "\n" :all-text "(bar \n\n)" :range [0 8] :idx 7}))))
-  (is (= "(bar \n \n )"
+  (is (= "(bar \n\n )"
          (:range-text (sut/format-text-at-idx-on-type {:eol "\n" :all-text "(bar \n \n)" :range [0 9] :idx 8}))))
+  (is (= "(bar \n \n )"
+         (:range-text (sut/format-text-at-idx-on-type {:eol "\n" :all-text "(bar \n \n)" :range [0 9] :idx 6}))))
   (is (= "(bar \n \n )"
          (:range-text (sut/format-text-at-idx-on-type {:eol "\n" :all-text "(bar \n\n)" :range [0 8] :idx 6}))))
   (is (= "\"bar \n \n \""