diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-11 00:39:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 00:39:21 +0000 |
| commit | 0a8ec23e515004d017533aa313fb3a86295cd906 (patch) | |
| tree | 9706a00a305ba5a4e30f684c7935363c76c63b14 /pkgs/misc/vscode-extensions | |
| parent | 6a3a358b0d8c1460434e5686ca8d05b41d5002fd (diff) | |
| parent | 74fd954e6fa1585e892ca4f1494a755418c6d88f (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/vscode-extensions')
| -rw-r--r-- | pkgs/misc/vscode-extensions/terraform/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index 39dd6f90b80a..7e7d0c618b7c 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.7.0"; + version = "2.8.1"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; - sha256 = "0lpsng7rd88ppjybmypzw42czr6swwin5cyl78v36z3wjwqx26xp"; + sha256 = "1pdpl8diqybqf68jvfk4kq9wg4k6c38811mh8iq12j4ba31cig9s"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index 3d5cc51fe2a4..9c076d06df4d 100644 --- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,18 +1,17 @@ diff --git a/out/extension.js b/out/extension.js -index 375048c..fa5eff0 100644 +index 4a2c6a9..158fe28 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -209,20 +209,7 @@ function pathToBinary() { +@@ -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(); +- const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter); - try { - yield installer.install(installDir); - } - catch (err) { -- vscode.window.showErrorMessage(err); - reporter.sendTelemetryException(err); - throw err; - } @@ -22,5 +21,5 @@ index 375048c..fa5eff0 100644 - command = `${installDir}/terraform-ls`; + command = 'TERRAFORM-LS-PATH'; } - _pathToBinaryPromise = Promise.resolve(command); - } + else { + reporter.sendTelemetryEvent('usePathToBinary'); |