Skip to content

Commit fced94a

Browse files
committed
Remove unused definitions
1 parent 5a5a059 commit fced94a

8 files changed

Lines changed: 42 additions & 92 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(ns pez.baldr
1+
(ns e2e.baldr
22
(:require #?(:cljs [cljs.test :as t]
33
:clj [clojure.test :as t])
44
[clojure.string :as string]))
@@ -35,7 +35,7 @@
3535
(context-color ctx)))
3636
new-contexts))
3737
:always (conj (str (indent (+ 2 (count contexts)))
38-
(str (bullet-color bullet) " " (color message)))))))
38+
(bullet-color bullet) " " (color message))))))
3939

4040
(defn- report! [m config]
4141
(let [contexts #?(:cljs (:testing-contexts (t/get-current-env))

e2e-test-ws/.joyride/src/e2e/test_runner.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
(js/setTimeout #(run-when-ws-activated nss-syms (inc tries)) 10)
8080
(:running @db/!state))))
8181

82-
(defn run-all-tests [src-path]
82+
(defn ^:export run-all-tests [src-path]
8383
(let [running (p/deferred)]
8484
(swap! db/!state assoc :running running)
8585
(p/let [nss-syms (find-test-nss+ src-path)

e2e-test-ws/.joyride/src/tests/mcp/a_activation_test.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(ns tests.mcp.a-activation-test
22
(:require
33
["vscode" :as vscode]
4-
[cljs.test :refer [deftest is testing]]
4+
[cljs.test :refer [is testing]]
55
[e2e.macros :refer [deftest-async]]
66
[e2e.utils :refer [wait-for+]]
77
[promesa.core :as p]))

e2e-test-ws/.joyride/src/tests/mcp/structural_editing_test.cljs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116

117117
(defn- edit-with-decoy-and-verify+
118118
"Activate decoy editor, perform edit, verify active editor unchanged and file not visible."
119-
[socket file-path tool-call-fn prev-content]
119+
[_socket _file-path tool-call-fn prev-content]
120120
(p/let [_ (activate-decoy-editor+)
121121
active-before (active-editor-path)
122122
result (tool-call-fn)
@@ -142,7 +142,7 @@
142142
"Edit should not leave more than 1 consecutive blank line"))
143143

144144
(defn- test-replace-trims-whitespace+ [socket file-path]
145-
(p/let [{:keys [result content] :as ctx}
145+
(p/let [ctx
146146
(edit-with-decoy-and-verify+
147147
socket file-path
148148
#(mcp/call-tool socket 101 "clojure_edit_files"
@@ -173,7 +173,7 @@
173173

174174
(defn- test-insert-proper-spacing+ [socket file-path]
175175
(p/let [content-before (read-test-file+ nil)
176-
{:keys [result content] :as ctx}
176+
{:keys [_result content] :as ctx}
177177
(edit-with-decoy-and-verify+
178178
socket file-path
179179
#(mcp/call-tool socket 103 "clojure_edit_files"
@@ -252,15 +252,15 @@
252252

253253
(defn- test-delete-first-form+ [socket file-path]
254254
(delete-and-verify-gone+ socket file-path
255-
{:id 106 :line 3 :target-text "(defn multiply-numbers"
256-
:form-name "(defn multiply-numbers"
257-
:test-label "delete first form keeps spacing stable"}))
255+
{:id 106 :line 3 :target-text "(defn multiply-numbers"
256+
:form-name "(defn multiply-numbers"
257+
:test-label "delete first form keeps spacing stable"}))
258258

259259
(defn- test-delete-last-form+ [socket file-path]
260260
(delete-and-verify-gone+ socket file-path
261-
{:id 107 :line 8 :target-text "(defn divide-numbers"
262-
:form-name "(defn divide-numbers"
263-
:test-label "delete last form keeps spacing stable"}))
261+
{:id 107 :line 8 :target-text "(defn divide-numbers"
262+
:form-name "(defn divide-numbers"
263+
:test-label "delete last form keeps spacing stable"}))
264264

265265
(defn- test-wrong-target-text+ [socket file-path]
266266
(p/let [result (mcp/call-tool socket 108 "clojure_edit_files"
@@ -340,29 +340,29 @@
340340

341341
(defn- test-continue-on-runtime-failure+ [socket]
342342
(test-continue-on-failure+ socket
343-
{:test-label "batch continues past runtime failure"
344-
:id-create 120 :id-batch 121
345-
:valid-edit {:type "replace" :filePath (continue-file-path)
346-
:line 3 :targetLineText "(defn add-numbers"
347-
:newForm "(defn add-numbers\n \"Adds two numbers\"\n [a b]\n (+ a b))"}
348-
:invalid-edit {:type "replace" :filePath (continue-file-path)
349-
:line 8 :targetLineText "(defn nonexistent-function"
350-
:newForm "(defn replaced [] :replaced)"}
351-
:expected-content "Adds two numbers"
352-
:expected-error "Target line text not found"}))
343+
{:test-label "batch continues past runtime failure"
344+
:id-create 120 :id-batch 121
345+
:valid-edit {:type "replace" :filePath (continue-file-path)
346+
:line 3 :targetLineText "(defn add-numbers"
347+
:newForm "(defn add-numbers\n \"Adds two numbers\"\n [a b]\n (+ a b))"}
348+
:invalid-edit {:type "replace" :filePath (continue-file-path)
349+
:line 8 :targetLineText "(defn nonexistent-function"
350+
:newForm "(defn replaced [] :replaced)"}
351+
:expected-content "Adds two numbers"
352+
:expected-error "Target line text not found"}))
353353

354354
(defn- test-continue-on-edit-validation-failure+ [socket]
355355
(test-continue-on-failure+ socket
356-
{:test-label "batch continues past edit-level validation failure"
357-
:id-create 122 :id-batch 123
358-
:valid-edit {:type "replace" :filePath (continue-file-path)
359-
:line 3 :targetLineText "(defn add-numbers"
360-
:newForm "(defn add-numbers\n \"Modified\"\n [a b]\n (+ a b))"}
361-
:invalid-edit {:type "replace" :filePath (continue-file-path)
362-
:line 8 :targetLineText "; this is a comment"
363-
:newForm "(defn replaced [] :replaced)"}
364-
:expected-content "\"Modified\""
365-
:expected-error "comment"}))
356+
{:test-label "batch continues past edit-level validation failure"
357+
:id-create 122 :id-batch 123
358+
:valid-edit {:type "replace" :filePath (continue-file-path)
359+
:line 3 :targetLineText "(defn add-numbers"
360+
:newForm "(defn add-numbers\n \"Modified\"\n [a b]\n (+ a b))"}
361+
:invalid-edit {:type "replace" :filePath (continue-file-path)
362+
:line 8 :targetLineText "; this is a comment"
363+
:newForm "(defn replaced [] :replaced)"}
364+
:expected-content "\"Modified\""
365+
:expected-error "comment"}))
366366

367367
;; --- Test orchestrator ---
368368

scripts/tasks.clj

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88

99
(def vsix-test-workspace "./e2e-test-vsix")
1010

11-
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
12-
(defn publish! [args]
11+
(defn ^:export publish! [args]
1312
(publish/yolo! args))
1413

15-
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
16-
(defn print-release-notes! [{:keys [version]}]
14+
(defn ^:export print-release-notes! [{:keys [version]}]
1715
(let [changelog-text (publish/get-changelog-text-for-version version)]
1816
(println changelog-text)))
1917

20-
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
21-
(defn bump-version! [{:keys [bump-branch user-email user-name dry force]}]
18+
(defn ^:export bump-version! [{:keys [bump-branch user-email user-name dry force]}]
2219
(if force
2320
(do
2421
(println "Bumping version")
@@ -98,8 +95,7 @@
9895
(println (format "Status: TESTS FAILED (%d problems, exit code %d, %.1fs)" problems exit-code elapsed-s))
9996
(throw (ex-info "E2E tests failed" {:babashka/exit exit-code}))))))
10097

101-
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
102-
(defn run-e2e-tests-with-vsix! [{:keys [vsix calva-vsix]}]
98+
(defn ^:export run-e2e-tests-with-vsix! [{:keys [vsix calva-vsix]}]
10399
(println "Running end-to-end tests using vsix:" vsix)
104100
(apply util/shell false "node" "./e2e-test-ws/launch.js" (str "--vsix=" vsix)
105101
(when calva-vsix [(str "--calva-vsix=" calva-vsix)])))
@@ -116,8 +112,7 @@
116112
(fs/copy src (fs/path e2e-tmp-dir item)))))
117113
e2e-tmp-dir)
118114

119-
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
120-
(defn run-e2e-tests-from-working-dir! [{:keys [is-ci calva-vsix]}]
115+
(defn ^:export run-e2e-tests-from-working-dir! [{:keys [is-ci calva-vsix]}]
121116
(println "Running end-to-end tests using working directory")
122117
(if is-ci
123118
(util/shell false "node" "./e2e-test-ws/launch.js")
@@ -126,7 +121,6 @@
126121
(apply run-e2e-launch! (str "--test-workspace=" tmp-ws)
127122
(when calva-vsix [(str "--calva-vsix=" calva-vsix)])))))
128123

129-
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
130124
(defn package-pre-release! [{:keys [slug dry]}]
131125
(let [current-version (-> (util/sh false "node" "-p" "require('./package').version")
132126
:out string/trim)
@@ -147,17 +141,15 @@
147141
(util/shell dry "npm" "version" "--no-git-tag-version" current-version)
148142
{:vsix-file vsix-file}))
149143

150-
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
151-
(defn package-and-test-prerelease! [{:keys [slug dry]}]
144+
(defn ^:export package-and-test-prerelease! [{:keys [slug dry]}]
152145
(let [opts {:slug slug :dry dry}
153146
vsix-result (package-pre-release! opts)
154147
vsix-file (:vsix-file vsix-result)]
155148
(println "Created VSIX:" vsix-file)
156149
(println "Running e2e tests on the packaged VSIX...")
157150
(run-e2e-tests-with-vsix! {:vsix vsix-file})))
158151

159-
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
160-
(defn launch-with-vsix! [{:keys [vsix]}]
152+
(defn ^:export launch-with-vsix! [{:keys [vsix]}]
161153
(println "Uninstalling any existing Calva Backseat Driver extension...")
162154
(util/shell false "code-insiders" "--uninstall-extension" "betterthantomorrow.calva-backseat-driver")
163155

@@ -167,8 +159,7 @@
167159
(println "Launching VS Code Insiders with test workspace...")
168160
(util/shell false "code-insiders" vsix-test-workspace))
169161

170-
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
171-
(defn run-mcp-inspector! [{:keys [vsix port-file]}]
162+
(defn ^:export run-mcp-inspector! [{:keys [vsix port-file]}]
172163
(let [server-script (if vsix
173164
(let [vsix-basename (fs/strip-ext (fs/file-name vsix))
174165
extension-path (str (fs/home)

src/calva_backseat_driver/integrations/calva/editor.cljs

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@
235235
:editor/original-line-number (:editor/line-number opts)))))
236236
(p/catch (fn [e] {:success false :error (.-message e)}))))))
237237

238+
#_{:clojure-lsp/ignore [:clojure-lsp/unused-public-var]}
238239
(comment
239-
240240
(p/let [edit-result (apply-form-edit-by-line-with-text-targeting
241241
{:editor/file-path "/Users/pez/Projects/calva-mcp-server/test-projects/example/src/mini/playground.clj"
242242
:editor/line-number 214
@@ -310,18 +310,6 @@
310310
:error (.-message error)
311311
:file-path file-path})))))))
312312

313-
(defn structural-create-file+
314-
"Create a new Clojure file with exact content using vscode/workspace.fs API"
315-
[file-path content]
316-
(p/let [result (create-file-core+ file-path content)]
317-
(if (:success result)
318-
(p/let [_ (p/delay 1000)
319-
diagnostics-after-edit (get-diagnostics-for-file file-path)]
320-
(assoc result
321-
:message "File created successfully"
322-
:diagnostics-after-edit diagnostics-after-edit))
323-
result)))
324-
325313
(defn append-code-core+
326314
"Append a top-level form to the end of a file. Returns {:success true :appended-at-end true} or {:success false ...}"
327315
[file-path code]
@@ -352,15 +340,3 @@
352340
(p/catch (fn [error]
353341
{:success false
354342
:error (.-message error)}))))))
355-
356-
(defn append-code+
357-
"Append a top-level form to the end of a file at guaranteed top level"
358-
[file-path code]
359-
(p/let [diagnostics-before-edit (get-diagnostics-for-file file-path)
360-
result (append-code-core+ file-path code)]
361-
(if (:success result)
362-
(p/let [diagnostics-after-edit (poll-diagnostics+ file-path diagnostics-before-edit)]
363-
(assoc result
364-
:diagnostics-before-edit diagnostics-before-edit
365-
:diagnostics-after-edit diagnostics-after-edit))
366-
result)))

src/calva_backseat_driver/integrations/calva/features.cljs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -204,22 +204,6 @@
204204
{:search-padding (.get config "fuzzyLineTargetingPadding")
205205
:context-padding (.get config "lineContextResponsePadding")}))
206206

207-
208-
209-
(defn- form-edit+ [{:ex/keys [dispatch!]
210-
:calva/keys [file-path line target-line-text new-form]
211-
:keys [ranges-fn-key log-verb]}]
212-
(let [{:keys [search-padding context-padding]} (get-editor-config)]
213-
(dispatch! [[:app/ax.log :debug "[Editor]" log-verb "form at line" line "in" file-path]])
214-
(editor/apply-form-edit-by-line-with-text-targeting
215-
{:editor/file-path file-path
216-
:editor/line-number line
217-
:editor/target-line target-line-text
218-
:editor/new-form new-form
219-
:editor/ranges-fn-key ranges-fn-key
220-
:editor/search-padding search-padding
221-
:editor/context-padding context-padding})))
222-
223207
(defn- apply-single-edit+
224208
"Apply a single edit operation. Returns {:success true ...} or {:success false ...}"
225209
[edit search-padding context-padding]

src/calva_backseat_driver/integrations/vscode/cursor_config.cljs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
(def cursor-mcp-server-name "backseat-driver")
66
(def cursor-mcp-extension-segment "extension")
7-
(def cursor-mcp-reload-client-command-id "mcp.reloadClient")
87

98
(defn cursor-mcp-settings-display-name []
109
(str cursor-mcp-extension-segment "-" cursor-mcp-server-name))

0 commit comments

Comments
 (0)