diff options
Diffstat (limited to 'pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch')
-rw-r--r-- | pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index 9c076d06df4..d91ffcc17ab 100644 --- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,25 +1,38 @@ diff --git a/out/extension.js b/out/extension.js -index 4a2c6a9..158fe28 100644 +index e44cef2..fba0899 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -215,19 +215,7 @@ function pathToBinary() { - if (!_pathToBinaryPromise) { - let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary'); - if (!command) { // Skip install/upgrade if user has set custom binary path -- const installDir = `${extensionPath}/lsp`; -- const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter); +@@ -141,24 +141,6 @@ function updateLanguageServer() { + return __awaiter(this, void 0, void 0, function* () { + const delay = 1000 * 60 * 24; + setTimeout(updateLanguageServer, delay); // check for new updates every 24hrs +- // 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 stopClients(); - try { -- yield installer.install(installDir); +- yield installer.install(); - } - catch (err) { - reporter.sendTelemetryException(err); - throw err; - } - finally { -- yield installer.cleanupZips(installDir); +- yield installer.cleanupZips(); - } -- command = `${installDir}/terraform-ls`; -+ command = 'TERRAFORM-LS-PATH'; +- } +- } + return startClients(); // on repeat runs with no install, this will be a no-op + }); + } +@@ -256,7 +238,7 @@ function pathToBinary() { + reporter.sendTelemetryEvent('usePathToBinary'); } else { - reporter.sendTelemetryEvent('usePathToBinary'); +- command = path.join(installPath, 'terraform-ls'); ++ command = 'TERRAFORM-LS-PATH'; + } + _pathToBinaryPromise = Promise.resolve(command); + } |