refactor some functions

Author: marlonjsilva

src/main/clojure/com/github/clojure_lsp/intellij/editor.clj

@@ -1,9 +1,10 @@
 (ns com.github.clojure-lsp.intellij.editor
   (:require
    [com.github.clojure-lsp.intellij.db :as db]
-   [com.github.clojure-lsp.intellij.editor :as editor])
+   [com.github.clojure-lsp.intellij.editor :as editor]
+   [com.github.ericdallo.clj4intellij.app-manager :as app-manager])
   (:import
-   [com.intellij.openapi.editor Editor]
+   [com.intellij.openapi.editor CaretModel Editor LogicalPosition]
    [com.intellij.openapi.fileEditor FileDocumentManager]
    [com.intellij.openapi.project ProjectLocator]
    [com.intellij.openapi.util.text StringUtil]
@@ -23,3 +24,11 @@
 (defn guess-project-for [^VirtualFile file]
   (or (.guessProjectForFile (ProjectLocator/getInstance) file)
       (first (db/all-projects))))
+
+(defn move-caret-to-position
+  "Moves the caret to the specified logical position in the editor."
+  [^Editor editor line column]
+  (let [caret ^CaretModel (.getCaretModel editor)
+        new-position (LogicalPosition. line column)]
+    @(app-manager/invoke-later!
+      {:invoke-fn (fn [] (.moveToLogicalPosition caret new-position))})))

src/test/clojure/com/github/clojure_lsp/intellij/foo_test.clj

@@ -1,13 +1,24 @@
 (ns com.github.clojure-lsp.intellij.foo-test
   (:require
    [clojure.test :refer [deftest is]]
+   [com.github.clojure-lsp.intellij.editor :as editor]
    [com.github.clojure-lsp.intellij.test-utils :as test-utils]
-   [com.github.ericdallo.clj4intellij.app-manager :as app-manager]
    [com.github.ericdallo.clj4intellij.test :as clj4intellij.test]))
 
 (set! *warn-on-reflection* true)
 
 (deftest foo-test
+  "Tests the Forward Slurp editor action functionality in Clojure LSP.
+   This test:
+   1. Sets up a test project with a Clojure file
+   2. Opens the file in the editor
+   3. Sets up the LSP server
+   4. Moves the caret to a specific position
+   5. Executes the Forward Slurp action
+   6. Verifies the resulting text matches the expected output
+   
+   The test ensures that the Forward Slurp action correctly modifies the code structure
+   by moving the closing parenthesis forward."
   (let [project-name "clojure.core"
         {:keys [fixture project deps-file]} (test-utils/setup-test-project project-name)
         clj-file (.copyFileToProject fixture "foo.clj")]
@@ -16,9 +27,9 @@
 
     (let [editor (test-utils/open-file-in-editor fixture clj-file)]
       (test-utils/setup-lsp-server project)
-      (test-utils/move-caret-to-position editor 2 8)
+      (editor/move-caret-to-position editor 2 8)
       (test-utils/run-editor-action "ClojureLSP.ForwardSlurp" project)
       (clj4intellij.test/dispatch-all)
       (println (test-utils/get-editor-text fixture))
-      (test-utils/check-result-by-file fixture "foo_expected.clj")
+      (.checkResultByFile fixture "foo_expected.clj")
       (test-utils/teardown-test-project project))))

src/test/clojure/com/github/clojure_lsp/intellij/test_utils.clj

@@ -9,15 +9,23 @@
    [com.github.clojure_lsp.intellij.extension SettingsState]
    [com.intellij.ide DataManager]
    [com.intellij.openapi.actionSystem ActionManager]
-   [com.intellij.openapi.components ServiceManager]
-   [com.intellij.openapi.editor LogicalPosition]
-   [com.intellij.openapi.wm WindowManager]))
+   [com.intellij.openapi.components ServiceManager]))
 
 (set! *warn-on-reflection* true)
 
-(defn get-status-bar-widget [project widget-id]
-  (let [status-bar (.. (WindowManager/getInstance) (getStatusBar project))]
-    (.getWidget status-bar widget-id)))
+(defn get-editor-text
+  "Returns the text content of the editor's document."
+  [fixture]
+  (-> fixture .getEditor .getDocument .getText))
+
+(defn open-file-in-editor
+  "Opens a file in the editor and returns the editor instance."
+  [fixture file]
+  (let [project (.getProject fixture)]
+    (app-manager/write-command-action
+     project
+     (fn [] (.openFileInEditor fixture file)))
+    (.getEditor fixture)))
 
 (defn run-editor-action
   "Runs an editor action with the given ID for the specified project."
@@ -77,33 +85,6 @@
       :project project
       :deps-file deps-file})))
 
-(defn open-file-in-editor
-  "Opens a file in the editor and returns the editor instance."
-  [fixture file]
-  (let [project (.getProject fixture)]
-    (app-manager/write-command-action
-     project
-     (fn [] (.openFileInEditor fixture file)))
-    (.getEditor fixture)))
-
-(defn move-caret-to-position
-  "Moves the caret to the specified logical position in the editor."
-  [editor line column]
-  (let [caret (.getCaretModel editor)
-        new-position (LogicalPosition. line column)]
-    @(app-manager/invoke-later!
-      {:invoke-fn (fn [] (.moveToLogicalPosition caret new-position))})))
-
-(defn get-editor-text
-  "Returns the text content of the editor's document."
-  [fixture]
-  (-> fixture .getEditor .getDocument .getText))
-
-(defn check-result-by-file
-  "Checks if the current editor content matches the expected file."
-  [fixture expected-file]
-  (.checkResultByFile fixture expected-file))
-
 (defn setup-lsp-server
   "Sets up and waits for the LSP server to be ready."
   [project]