lol

Merge pull request #115835 from rhoriguchi/vscode-extensions.hashicorp.terraform

vscode-extensions.hashicorp.terraform: 2.8.0 -> 2.8.1

authored by

Sandro and committed by
GitHub
04bdbabc 28ea5a7f

+7 -8
+2 -2
pkgs/misc/vscode-extensions/terraform/default.nix
··· 3 3 mktplcRef = { 4 4 name = "terraform"; 5 5 publisher = "hashicorp"; 6 - version = "2.8.0"; 6 + version = "2.8.1"; 7 7 }; 8 8 9 9 vsix = fetchurl { 10 10 name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; 11 11 url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; 12 - sha256 = "1ns40xaswqhngprlpf3ck59mj3kcxngr4jk0wkf16j3cvvskn0yy"; 12 + sha256 = "1pdpl8diqybqf68jvfk4kq9wg4k6c38811mh8iq12j4ba31cig9s"; 13 13 }; 14 14 15 15 patches = [ ./fix-terraform-ls.patch ];
+5 -6
pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
··· 1 1 diff --git a/out/extension.js b/out/extension.js 2 - index 375048c..fa5eff0 100644 2 + index 4a2c6a9..158fe28 100644 3 3 --- a/out/extension.js 4 4 +++ b/out/extension.js 5 - @@ -209,20 +209,7 @@ function pathToBinary() { 5 + @@ -215,19 +215,7 @@ function pathToBinary() { 6 6 if (!_pathToBinaryPromise) { 7 7 let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary'); 8 8 if (!command) { // Skip install/upgrade if user has set custom binary path 9 9 - const installDir = `${extensionPath}/lsp`; 10 - - const installer = new languageServerInstaller_1.LanguageServerInstaller(); 10 + - const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter); 11 11 - try { 12 12 - yield installer.install(installDir); 13 13 - } 14 14 - catch (err) { 15 - - vscode.window.showErrorMessage(err); 16 15 - reporter.sendTelemetryException(err); 17 16 - throw err; 18 17 - } ··· 22 21 - command = `${installDir}/terraform-ls`; 23 22 + command = 'TERRAFORM-LS-PATH'; 24 23 } 25 - _pathToBinaryPromise = Promise.resolve(command); 26 - } 24 + else { 25 + reporter.sendTelemetryEvent('usePathToBinary');