Add partial formatting support to sexp-edit-pipeline

Thread reindent-fn through find-and-edit-multi-sexp so each match site
gets the replacement form re-indented to its column. In :partial mode,
new-form is formatted once at col 1, then adjusted per match position.

Adds comprehensive test suite mirroring the edit-form-pipeline partial
tests: replace, insert-before, insert-after, replace-all, nested sexps,
multi-form replacements, and deeply nested replacements.

Author: Bruce Hauman

src/clojure_mcp/tools/form_edit/core.clj

@@ -580,36 +580,48 @@
        (filter #(match-multi-sexp match-sexprs %))
        first))
 
-(defn find-and-edit-one-multi-sexp [zloc operation match-form new-form]
-  {:pre [(#{:insert-before :insert-after :replace} operation) zloc (string? match-form) (string? new-form)]}
-  ;; no-op
-  (when-not (and (str/blank? new-form) (#{:insert-before :insert-after} operation))
-    (let [new-node (when-not (str/blank? new-form) (p/parse-string-all new-form))
-          match-sexprs (str-forms->sexps match-form)]
-      (when-let [found-loc (find-multi-sexp zloc match-sexprs)]
-        (condp = operation
-          :insert-before (insert-before-multi found-loc match-sexprs new-node)
-          :insert-after (insert-after-multi found-loc match-sexprs new-node)
-          (replace-multi found-loc match-sexprs new-form))))))
-
-(defn find-and-edit-all-multi-sexp [zloc operation match-form new-form]
-  {:pre [(#{:insert-before :insert-after :replace} operation) zloc (string? match-form) (string? new-form)]}
-  (when-not (and (str/blank? new-form) (#{:insert-before :insert-after} operation))
-    (loop [loc zloc
-           locations []]
-      (if-let [{:keys [after-loc edit-span-loc]}
-               (find-and-edit-one-multi-sexp loc operation match-form new-form)]
-        (recur after-loc (conj locations edit-span-loc))
-        (when-not (empty? locations)
-          ;; this is a location after the last match
-          ;; z/root-string on this will produce the final edited form
-          {:zloc loc
-           :locations locations})))))
-
-(defn find-and-edit-multi-sexp* [zloc match-form new-form {:keys [operation all?]}]
+(defn find-and-edit-one-multi-sexp
+  ([zloc operation match-form new-form]
+   (find-and-edit-one-multi-sexp zloc operation match-form new-form nil))
+  ([zloc operation match-form new-form reindent-fn]
+   {:pre [(#{:insert-before :insert-after :replace} operation) zloc (string? match-form) (string? new-form)]}
+   ;; no-op
+   (when-not (and (str/blank? new-form) (#{:insert-before :insert-after} operation))
+     (let [match-sexprs (str-forms->sexps match-form)]
+       (when-let [found-loc (find-multi-sexp zloc match-sexprs)]
+         (let [adjusted-form (if reindent-fn
+                               (if-let [col (some-> (z/position found-loc) second)]
+                                 (reindent-fn new-form col)
+                                 new-form)
+                               new-form)
+               new-node (when-not (str/blank? adjusted-form)
+                          (p/parse-string-all adjusted-form))]
+           (condp = operation
+             :insert-before (insert-before-multi found-loc match-sexprs new-node)
+             :insert-after (insert-after-multi found-loc match-sexprs new-node)
+             (replace-multi found-loc match-sexprs adjusted-form))))))))
+
+(defn find-and-edit-all-multi-sexp
+  ([zloc operation match-form new-form]
+   (find-and-edit-all-multi-sexp zloc operation match-form new-form nil))
+  ([zloc operation match-form new-form reindent-fn]
+   {:pre [(#{:insert-before :insert-after :replace} operation) zloc (string? match-form) (string? new-form)]}
+   (when-not (and (str/blank? new-form) (#{:insert-before :insert-after} operation))
+     (loop [loc zloc
+            locations []]
+       (if-let [{:keys [after-loc edit-span-loc]}
+                (find-and-edit-one-multi-sexp loc operation match-form new-form reindent-fn)]
+         (recur after-loc (conj locations edit-span-loc))
+         (when-not (empty? locations)
+           ;; this is a location after the last match
+           ;; z/root-string on this will produce the final edited form
+           {:zloc loc
+            :locations locations}))))))
+
+(defn find-and-edit-multi-sexp* [zloc match-form new-form {:keys [operation all? reindent-fn]}]
   (if all?
-    (find-and-edit-all-multi-sexp zloc operation match-form new-form)
-    (when-let [{:keys [after-loc edit-span-loc]} (find-and-edit-one-multi-sexp zloc operation match-form new-form)]
+    (find-and-edit-all-multi-sexp zloc operation match-form new-form reindent-fn)
+    (when-let [{:keys [after-loc edit-span-loc]} (find-and-edit-one-multi-sexp zloc operation match-form new-form reindent-fn)]
       ;; this is a location after the last match
       ;; z/root-string on this will produce the final edited form
       {:zloc after-loc

src/clojure_mcp/tools/form_edit/pipeline.clj

@@ -496,18 +496,29 @@
              update-file-timestamp))))))
 
 (defn edit-sexp
-  [{:keys [::zloc ::match-form ::new-form ::operation ::replace-all ::_whitespace-sensitive] :as ctx}]
+  [{:keys [::zloc ::match-form ::new-form ::operation ::replace-all ::_whitespace-sensitive ::nrepl-client-atom] :as ctx}]
   (try
-    (if-let [result (core/find-and-edit-multi-sexp
-                     zloc
-                     match-form
-                     new-form
-                     (cond-> {:operation operation}
-                       replace-all (assoc :all? true)))]
-      (-> ctx
-          (assoc ::zloc (:zloc result)))
-      {::error true
-       ::message (str "Could not find form: " match-form)})
+    (let [nrepl-client-map (some-> nrepl-client-atom deref)
+          cljfmt-setting (config/get-cljfmt nrepl-client-map)
+          ;; When partial mode, pre-format new-form at col 1 and build reindent-fn
+          [adjusted-form reindent-fn]
+          (if (and (= :partial cljfmt-setting) (not (str/blank? new-form)))
+            (let [formatting-options (core/project-formatting-options nrepl-client-map)
+                  formatted (core/format-form-in-isolation new-form 1 formatting-options)]
+              [formatted (fn [form-str col] (core/re-indent-to-column form-str col))])
+            [new-form nil])]
+      (if-let [result (core/find-and-edit-multi-sexp
+                       zloc
+                       match-form
+                       adjusted-form
+                       (cond-> {:operation operation}
+                         replace-all (assoc :all? true)
+                         reindent-fn (assoc :reindent-fn reindent-fn)))]
+        (-> ctx
+            (assoc ::zloc (:zloc result))
+            (cond-> reindent-fn (assoc ::pre-formatted? true)))
+        {::error true
+         ::message (str "Could not find form: " match-form)}))
     (catch Exception e
       {::error true
        ::message (str "Error editing form: " (.getMessage e))})))