MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Sandro 2021-07-20 09:38:08 +02:00 committed by GitHub
commit 709c41f190
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/misc/vscode-extensions/terraform/default.nix
View file

@ -3,19 +3,19 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
version = "2.13.0";
version = "2.13.2";
};
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 = "1wc4jl4h3ja4ivynf20yxzwqssi6yd7alvqvcjrkksic98480qcz";
sha256 = "0h7c6p2dcwsg7wlp49p2fsq0f164pzkx65929imd1m2df77aykqa";
};
patches = [ ./fix-terraform-ls.patch ];
postPatch = ''
substituteInPlace out/extension.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
substituteInPlace out/clientHandler.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
'';
meta = with lib; {

38
pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
View file

@ -1,17 +1,30 @@
diff --git a/out/clientHandler.js b/out/clientHandler.js
index 7f9716d..a543d60 100644
--- a/out/clientHandler.js
+++ b/out/clientHandler.js
@@ -33,8 +33,7 @@ class ClientHandler {
this.reporter.sendTelemetryEvent('usePathToBinary');
}
else {
- const installPath = path.join(context.extensionPath, 'lsp');
- this.pathToBinary = path.join(installPath, 'terraform-ls');
+ this.pathToBinary = 'TERRAFORM-LS-PATH';
}
}
startClients(folders) {
diff --git a/out/extension.js b/out/extension.js
index e932d27..099126b 100644
index 7a271fc..726bbf8 100644
--- a/out/extension.js
+++ b/out/extension.js
@@ -143,25 +143,6 @@ function updateLanguageServer() {
return __awaiter(this, void 0, void 0, function* () {
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
@@ -149,24 +149,6 @@ function updateLanguageServer(clientHandler, installPath) {
updateLanguageServer(clientHandler, installPath);
}, 24 * hour);
// 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();
- yield clientHandler.stopClients();
- try {
- yield installer.install();
- }
@ -25,15 +38,6 @@ index e932d27..099126b 100644
- }
- }
- }
return startClients(); // on repeat runs with no install, this will be a no-op
return clientHandler.startClients(vscodeUtils_1.prunedFolderNames()); // on repeat runs with no install, this will be a no-op
});
}
@@ -259,7 +240,7 @@ function pathToBinary() {
reporter.sendTelemetryEvent('usePathToBinary');
}
else {
- command = path.join(installPath, 'terraform-ls');
+ command = 'TERRAFORM-LS-PATH';
}
_pathToBinaryPromise = Promise.resolve(command);
}