cleaning up leftovers for edit locations removal

Author: Bruce Hauman

src/clojure_mcp/tools/form_edit/core.clj

@@ -239,39 +239,6 @@
          {:zloc updated-zloc
           :similar-matches (:similar-matches find-result)})))))
 
-;; Offset calculation functions for highlighting modified code
-
-(defn row-col->offset
-  "Convert row and column coordinates to a character offset in a string.
-   
-   Arguments:
-   - s: The source string
-   - target-row: The target row (1-based)
-   - target-col: The target column (1-based)
-   
-   Returns the character offset in the string."
-  [s target-row target-col]
-  (loop [lines (str/split-lines s)
-         current-row 1
-         offset 0]
-    (if (or (empty? lines) (>= current-row target-row))
-      (+ offset target-col) ; Add col for 1-based index
-      (recur (next lines)
-             (inc current-row)
-             (+ offset (count (first lines)) 1)))))
-
-(defn zloc-offsets
-  "Calculate character offsets for a zipper location's start and end positions.
-   
-   Arguments:
-   - source-str: The source code string
-   - positions: A vector of [row col] pairs
-   
-   Returns a vector of character offsets."
-  [source-str positions]
-  (mapv (fn [[row col]] (row-col->offset source-str row col))
-        positions))
-
 ;; Source code formatting
 
 (def default-formatting-options
@@ -604,4 +571,4 @@
 (defn find-and-edit-multi-sexp [zloc match-form new-form opts]
   (or (find-and-edit-multi-sexp* zloc match-form new-form opts)
       (binding [*match-clean* true]
-        (find-and-edit-multi-sexp* zloc match-form new-form opts))))
+        (find-and-edit-multi-sexp* zloc match-form new-form opts))))

src/clojure_mcp/tools/form_edit/pipeline.clj

@@ -447,8 +447,7 @@
                      (cond-> {:operation operation}
                        replace-all (assoc :all? true)))]
       (-> ctx
-          (assoc ::zloc (:zloc result))
-          (assoc ::edit-locations (:locations result)))
+          (assoc ::zloc (:zloc result)))
       {::error true
        ::message (str "Could not find form: " match-form)})
     (catch Exception e
@@ -498,4 +497,4 @@
          ctx
          (-> ctx
              save-file
-             update-file-timestamp))))))
+             update-file-timestamp))))))

src/clojure_mcp/tools/unified_clojure_edit/core.clj

@@ -4,16 +4,9 @@
    without any MCP-specific code."
   (:require
    [clojure-mcp.sexp.match :as match]
-   [clojure-mcp.tools.form-edit.core :as form-edit]
    [rewrite-clj.zip :as z]
    [rewrite-clj.parser :as p]))
 
-;; Re-export common utilities from form-edit.core
-(def format-source-string form-edit/format-source-string)
-(def load-file-content form-edit/load-file-content)
-(def save-file-content form-edit/save-file-content)
-(def zloc-offsets form-edit/zloc-offsets)
-
 (defn find-pattern-match
   "Finds a pattern match in Clojure source code.
    

test/clojure_mcp/tools/form_edit/core_test.clj

@@ -420,15 +420,6 @@
       (is (= :list (z/tag defn-zloc)))
       (is (str/includes? (z/string defn-zloc) "defn test")))))
 
-(deftest row-col-offset-test
-  (testing "row-col->offset correctly calculates character offsets"
-    (let [source "Line 1\nLine 2\nLine 3"]
-      (is (= 0 (sut/row-col->offset source 1 0)))
-      (is (= 3 (sut/row-col->offset source 1 3)))
-      (is (= 7 (sut/row-col->offset source 2 0)))
-      (is (= 10 (sut/row-col->offset source 2 3)))
-      (is (= 14 (sut/row-col->offset source 3 0))))))
-
 (deftest format-source-string-test
   (testing "format-source-string correctly formats source code"
     (let [unformatted "(defn   example-fn[x y]  (+ x  y)   )"