about summary refs log tree commit diff
path: root/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
blob: 9153276d3674cbf11d4561bbc3c9acd1323ffdd3 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
diff --git a/out/clientHandler.js b/out/clientHandler.js
index 7f9716d..a543d60 100644
--- a/out/clientHandler.js
+++ b/out/clientHandler.js
@@ -33,8 +33,7 @@ class ClientHandler {
             this.reporter.sendTelemetryEvent('usePathToBinary');
         }
         else {
-            const installPath = path.join(context.extensionPath, 'lsp');
-            this.pathToBinary = path.join(installPath, 'terraform-ls');
+            this.pathToBinary = 'TERRAFORM-LS-PATH';
         }
     }
     startClients(folders) {
diff --git a/out/extension.js b/out/extension.js
index 7a271fc..726bbf8 100644
--- a/out/extension.js
+++ b/out/extension.js
@@ -149,24 +149,6 @@ function updateLanguageServer(clientHandler, installPath) {
             updateLanguageServer(clientHandler, installPath);
         }, 24 * hour);
         // skip install if a language server binary path is set
-        if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) {
-            const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter);
-            const install = yield installer.needsInstall();
-            if (install) {
-                yield clientHandler.stopClients();
-                try {
-                    yield installer.install();
-                }
-                catch (err) {
-                    console.log(err); // for test failure reporting
-                    reporter.sendTelemetryException(err);
-                    throw err;
-                }
-                finally {
-                    yield installer.cleanupZips();
-                }
-            }
-        }
         return clientHandler.startClients(vscodeUtils_1.prunedFolderNames()); // on repeat runs with no install, this will be a no-op
     });
 }