Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vscode-extensions.hashicorp.terraform: 2.10.2 -> 2.11.0 #123585

Merged
merged 1 commit into from May 19, 2021
Merged

vscode-extensions.hashicorp.terraform: 2.10.2 -> 2.11.0 #123585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/misc/vscode-extensions/terraform/default.nix
View file
Open in desktop
Expand Up @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
version = "2.10.2";
version = "2.11.0";
};

vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix";
sha256 = "0fkkjkybjshgzbkc933jscxyxqwmqnhq3718pnw9hsac8qv0grrz";
sha256 = "0wqdya353b415qxs8jczmis3q6d8fddv1pdd8jdd0w64s1ibv3sy";
};

patches = [ ./fix-terraform-ls.patch ];
Expand Down
10 changes: 5 additions & 5 deletions pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
View file
Open in desktop
@@ -1,11 +1,11 @@
diff --git a/out/extension.js b/out/extension.js
index e815393..aeade0e 100644
index e932d27..099126b 100644
--- a/out/extension.js
+++ b/out/extension.js
@@ -141,25 +141,6 @@ function updateLanguageServer() {
@@ -143,25 +143,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
const delay = 1000 * 60 * 60 * 24;
languageServerUpdater.timeout(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);
Expand All @@ -28,7 +28,7 @@ index e815393..aeade0e 100644
return startClients(); // on repeat runs with no install, this will be a no-op
});
}
@@ -257,7 +238,7 @@ function pathToBinary() {
@@ -259,7 +240,7 @@ function pathToBinary() {
reporter.sendTelemetryEvent('usePathToBinary');
}
else {
Expand Down