Send non-encoded doc uri for clojure-lsp refactorings

Fix #911
BetterThanTomorrow · Dec 31, 2020 · ee0d373 · ee0d373
1 parent 649a535
commit ee0d373
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Changes to Calva.
 
 ## [Unreleased]
+- Fix: [clojure-lsp refactorings not working on Windows](https://github.com/BetterThanTomorrow/calva/issues/911)
 - [Remove default key binding for toggling Calva key bindings](https://github.com/BetterThanTomorrow/calva/issues/815)
 
 ## [2.0.140 - 2020-12-28]

diff --git a/src/lsp.ts b/src/lsp.ts
@@ -63,11 +63,11 @@ function createClient(jarPath: string): LanguageClient {
                 }
             },
             provideCompletionItem(document, position, context, token, next) {
-                 if (util.getConnectedState()) {
-                     return null;
-                 } else {
-                     return next(document, position, context, token);
-                 }
+                if (util.getConnectedState()) {
+                    return null;
+                } else {
+                    return next(document, position, context, token);
+                }
             },
             provideSignatureHelp(document, position, context, token, next) {
                 if (util.getConnectedState()) {
@@ -161,7 +161,8 @@ function registerLspCommand(client: LanguageClient, command: ClojureLspCommand):
         if (document && document.languageId === 'clojure') {
             const line = editor.selection.active.line;
             const column = editor.selection.active.character;
-            const params = [document.uri.toString(), line, column];
+            const docUri = `${document.uri.scheme}://${document.uri.path}`;
+            const params = [docUri, line, column];
             const extraParam = command.extraParamFn ? await command.extraParamFn() : undefined;
             if (!command.extraParamFn || command.extraParamFn && extraParam) {
                 client.sendRequest('workspace/executeCommand', {