public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

vscode-extensions.hashicorp.terraform: 2.8.0 -> 2.8.1
This commit is contained in:
Sandro 2021-03-10 23:24:24 +01:00 committed by GitHub
parent 28ea5a7f52 cc71e41104
commit 04bdbabcbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/vscode-extensions/terraform/default.nix
View File

@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = { mktplcRef = {
name = "terraform"; name = "terraform";
publisher = "hashicorp"; publisher = "hashicorp";
version = "2.8.0"; version = "2.8.1";
}; };
vsix = fetchurl { vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
sha256 = "1ns40xaswqhngprlpf3ck59mj3kcxngr4jk0wkf16j3cvvskn0yy"; sha256 = "1pdpl8diqybqf68jvfk4kq9wg4k6c38811mh8iq12j4ba31cig9s";
}; };
patches = [ ./fix-terraform-ls.patch ]; patches = [ ./fix-terraform-ls.patch ];

11
pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
View File

@ -1,18 +1,17 @@
diff --git a/out/extension.js b/out/extension.js diff --git a/out/extension.js b/out/extension.js
index 375048c..fa5eff0 100644 index 4a2c6a9..158fe28 100644
--- a/out/extension.js --- a/out/extension.js
+++ b/out/extension.js +++ b/out/extension.js
@@ -209,20 +209,7 @@ function pathToBinary() { @@ -215,19 +215,7 @@ function pathToBinary() {
if (!_pathToBinaryPromise) { if (!_pathToBinaryPromise) {
let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary'); let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
if (!command) { // Skip install/upgrade if user has set custom binary path if (!command) { // Skip install/upgrade if user has set custom binary path
- const installDir = `${extensionPath}/lsp`; - const installDir = `${extensionPath}/lsp`;
- const installer = new languageServerInstaller_1.LanguageServerInstaller(); - const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter);
- try { - try {
- yield installer.install(installDir); - yield installer.install(installDir);
- } - }
- catch (err) { - catch (err) {
- vscode.window.showErrorMessage(err);
- reporter.sendTelemetryException(err); - reporter.sendTelemetryException(err);
- throw err; - throw err;
- } - }
@ -22,5 +21,5 @@ index 375048c..fa5eff0 100644
- command = `${installDir}/terraform-ls`; - command = `${installDir}/terraform-ls`;
+ command = 'TERRAFORM-LS-PATH'; + command = 'TERRAFORM-LS-PATH';
} }
_pathToBinaryPromise = Promise.resolve(command); else {
} reporter.sendTelemetryEvent('usePathToBinary');