Support workspace/willRenameFiles allowing to rename ns, renaming the files properly

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## [Unreleased]
 
 - Support Create workspace edit operation. Fixes #51
+- Support Rename workspace edit operation
+- Support workspace/willRenameFiles allowing to rename ns, renaming the files properly.
 
 ## 2.5.0
 

docs/capabilities.md

@@ -27,7 +27,7 @@ Below are all the currently supported LSP capabilities and their implementation
 | workspace/symbol                       |      |       |
 | workspace/executeCommand               | √    |       |
 | workspace/applyEdit                    | √    |       |
-| workspace/willRenameFiles              |      |       |
+| workspace/willRenameFiles              | √    |       |
 | workspace/didRenameFiles               |      |       |
 | workspace/willCreateFiles              |      |       |
 | workspace/didCreateFiles               |      |       |

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

@@ -1,9 +1,7 @@
 (ns com.github.clojure-lsp.intellij.editor
   (:require
    [clojure-lsp.shared :as lsp.shared]
-   [clojure.java.io :as io]
    [com.github.clojure-lsp.intellij.editor :as editor]
-   [com.github.ericdallo.clj4intellij.app-manager :as app-manager]
    [com.github.ericdallo.clj4intellij.util :as util])
   (:import
    [com.intellij.openapi.editor Document Editor]
@@ -12,7 +10,7 @@
    [com.intellij.openapi.project Project ProjectLocator]
    [com.intellij.openapi.util TextRange]
    [com.intellij.openapi.util.text StringUtil]
-   [com.intellij.openapi.vfs VfsUtil VirtualFile]
+   [com.intellij.openapi.vfs VirtualFile]
    [com.intellij.psi PsiFile]
    [com.intellij.psi PsiManager]))
 
@@ -56,56 +54,3 @@
 (defn v-file->project ^Project [^VirtualFile v-file]
   (.guessProjectForFile (ProjectLocator/getInstance)
                         v-file))
-
-(defn ^:private create-document
-  [{:keys [uri]}]
-  (let [f (io/file (java.net.URI. uri))
-        parent-vfile (VfsUtil/createDirectories (.getAbsolutePath (.getParentFile f)))]
-    (.findOrCreateChildData parent-vfile nil (.getName f))))
-
-(defn ^:private apply-document-change
-  [{{:keys [uri]} :text-document :keys [edits]} project move-caret?]
-  (let [editor (util/uri->editor uri project false)
-        document (.getDocument editor)
-        sorted-edits (sort-by (comp #(document+position->offset % document) :start :range) > edits)]
-    (doseq [{:keys [new-text range]} sorted-edits
-            :let [start (document+position->offset (:start range) document)
-                  end (document+position->offset (:end range) document)]]
-      (cond
-        (>= end 0)
-        (if (<= (- end start) 0)
-          (.insertString document start new-text)
-          (.replaceString document start end new-text))
-
-        (= 0 start)
-        (.setText document new-text)
-
-        (> start 0)
-        (.insertString document start new-text)
-
-        :else
-        (.insertString document (.getTextLength document) (str "\n" new-text)))
-      (when move-caret?
-        (.moveToOffset (.getCaretModel editor)
-                       (+ (count new-text) start))))
-    (.saveDocument (FileDocumentManager/getInstance) document)))
-
-(defn apply-workspace-edit ^Boolean
-  [^Project project label move-caret? {:keys [document-changes]}]
-  ;; TODO Handle more resourceOperations like renaming and deleting files
-  ;; TODO Improve to check version to known if file changed
-  (app-manager/invoke-later!
-   {:invoke-fn
-    (fn []
-      (app-manager/write-action!
-       {:run-fn
-        (fn []
-          (app-manager/execute-command!
-           {:name label
-            :project project
-            :command-fn
-            (fn []
-              (doseq [document-change document-changes]
-                (case (:kind document-change)
-                  "create" (create-document document-change)
-                  (apply-document-change document-change project move-caret?))))}))}))}))

src/main/clojure/com/github/clojure_lsp/intellij/extension/rename.clj

@@ -5,6 +5,7 @@
   (:require
    [com.github.clojure-lsp.intellij.client :as lsp-client]
    [com.github.clojure-lsp.intellij.editor :as editor]
+   [com.github.clojure-lsp.intellij.file-system :as file-system]
    [com.github.ericdallo.clj4intellij.util :as util])
   (:import
    [com.intellij.openapi.actionSystem CommonDataKeys DataContext]
@@ -53,4 +54,4 @@
                                                :position {:line line
                                                           :character character}
                                                :new-name new-name}])
-                (editor/apply-workspace-edit project "LSP Rename" true))))))))
+                (file-system/apply-workspace-edit project "LSP Rename" true))))))))

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

@@ -1,11 +1,18 @@
 (ns com.github.clojure-lsp.intellij.file-system
   (:require
    [clojure.java.io :as io]
+   [com.github.clojure-lsp.intellij.client :as lsp-client]
    [com.github.clojure-lsp.intellij.config :as config]
+   [com.github.clojure-lsp.intellij.editor :as editor]
+   [com.github.ericdallo.clj4intellij.app-manager :as app-manager]
+   [com.github.ericdallo.clj4intellij.util :as util]
    [com.rpl.proxy-plus :refer [proxy+]])
   (:import
+   [com.intellij.openapi.fileEditor
+    FileDocumentManager]
    [com.intellij.openapi.project Project]
-   [com.intellij.openapi.vfs LocalFileSystem VirtualFile]))
+   [com.intellij.openapi.vfs LocalFileSystem VfsUtil VirtualFile]
+   [java.net URI]))
 
 (set! *warn-on-reflection* true)
 
@@ -30,3 +37,81 @@
       (getInputStream [_] (io/input-stream temp-file))
       (getOutputStream [_ _ _ _] (io/output-stream temp-file))
       (getModificationStamp [_] -1))))
+
+(defn ^:private create-document
+  [{:keys [uri]}]
+  (let [f (io/file (URI. uri))
+        parent-vfile (VfsUtil/createDirectories (.getAbsolutePath (.getParentFile f)))]
+    (.findOrCreateChildData parent-vfile nil (.getName f))))
+
+(declare apply-workspace-edit-sync)
+
+(defn will-rename-file [project old-uri new-uri]
+  (let [client (lsp-client/connected-client project)]
+    (->> (lsp-client/request! client [:workspace/willRenameFiles
+                                      {:files [{:old-uri old-uri
+                                                :new-uri new-uri}]}])
+         deref
+         (apply-workspace-edit-sync project false))))
+
+(defn ^:private rename-document
+  [{:keys [old-uri new-uri]} project]
+  (will-rename-file project old-uri new-uri)
+  (let [old-file (io/file (URI. old-uri))
+        new-file (io/file (URI. new-uri))
+        vfile (util/uri->v-file old-uri)]
+    (.rename vfile nil (.getName new-file))
+    (when-not (= (.getAbsolutePath (.getParentFile old-file))
+                 (.getAbsolutePath (.getParentFile new-file)))
+      (.move vfile nil (util/uri->v-file (str (.toURI (.getParentFile new-file))))))))
+
+(defn ^:private apply-document-change
+  [{{:keys [uri]} :text-document :keys [edits]} project move-caret?]
+  (let [editor (util/uri->editor uri project false)
+        document (.getDocument editor)
+        sorted-edits (sort-by (comp #(editor/document+position->offset % document) :start :range) > edits)]
+    (doseq [{:keys [new-text range]} sorted-edits
+            :let [start (editor/document+position->offset (:start range) document)
+                  end (editor/document+position->offset (:end range) document)]]
+      (cond
+        (>= end 0)
+        (if (<= (- end start) 0)
+          (.insertString document start new-text)
+          (.replaceString document start end new-text))
+
+        (= 0 start)
+        (.setText document new-text)
+
+        (> start 0)
+        (.insertString document start new-text)
+
+        :else
+        (.insertString document (.getTextLength document) (str "\n" new-text)))
+      (when move-caret?
+        (.moveToOffset (.getCaretModel editor)
+                       (+ (count new-text) start))))
+    (.saveDocument (FileDocumentManager/getInstance) document)))
+
+(defn ^:private apply-workspace-edit-sync [project move-caret? {:keys [document-changes]}]
+  (doseq [document-change document-changes]
+    (case (:kind document-change)
+      "create" (create-document document-change)
+      "rename" (rename-document document-change project)
+      (apply-document-change document-change project move-caret?))))
+
+(defn apply-workspace-edit ^Boolean
+  [^Project project label move-caret? edit]
+  ;; TODO Handle more resourceOperations like renaming and deleting files
+  ;; TODO Improve to check version to known if file changed
+  (app-manager/invoke-later!
+   {:invoke-fn
+    (fn []
+      (app-manager/write-action!
+       {:run-fn
+        (fn []
+          (app-manager/execute-command!
+           {:name label
+            :project project
+            :command-fn
+            (fn []
+              (apply-workspace-edit-sync project move-caret? edit))}))}))}))

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

@@ -23,7 +23,9 @@
 (def ^:private client-capabilities
   {:text-document {:hover {:content-format ["markdown"]}
                    :implementation {}}
-   :workspace {:workspace-edit {:document-changes true}}
+   :workspace {:workspace-edit {:document-changes true
+                                :resource-operations ["create" "rename"]}
+               :file-operations {:will-rename true}}
    :window {:show-document true}})
 
 (def ^:private artifacts

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

@@ -2,14 +2,15 @@
   (:require
    [com.github.clojure-lsp.intellij.client :as lsp-client]
    [com.github.clojure-lsp.intellij.editor :as editor]
+   [com.github.clojure-lsp.intellij.file-system :as file-system]
    [com.github.ericdallo.clj4intellij.app-manager :as app-manager]
    [com.github.ericdallo.clj4intellij.logger :as logger]
    [com.github.ericdallo.clj4intellij.util :as util]))
 
 (set! *warn-on-reflection* true)
 
 (defmethod lsp-client/workspace-apply-edit :default [{:keys [project]} {:keys [label edit]}]
-  (editor/apply-workspace-edit project label false edit)
+  (file-system/apply-workspace-edit project label false edit)
   {:applied true})
 
 (defmethod lsp-client/show-document :default [{:keys [project]} {:keys [uri take-focus selection]}]