From 20b2f6d4d4d062b0338909fe4dfbc7a1772f88c7 Mon Sep 17 00:00:00 2001 From: Audrey Eschright Date: Mon, 20 Apr 2020 16:19:58 -0700 Subject: [PATCH] Turn on language server by default Fixes #6 --- out/languageServerInstaller.js | 4 ++-- out/languageServerInstaller.js.map | 2 +- package.json | 2 +- src/languageServerInstaller.ts | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/out/languageServerInstaller.js b/out/languageServerInstaller.js index a5d51a60f..30b598227 100644 --- a/out/languageServerInstaller.js +++ b/out/languageServerInstaller.js @@ -39,7 +39,7 @@ class LanguageServerInstaller { this.checkCurrent().then((version) => { fs.mkdirSync(directory, { recursive: true }); this.installPkg(directory, version, identifer).then(() => { - vscode.window.showInformationMessage(`Installed terraform-ls ${version}`, 'Start server'); + vscode.window.showInformationMessage(`Installed terraform-ls ${version}`); return resolve(); }).catch((err) => { return reject(err); @@ -57,7 +57,7 @@ class LanguageServerInstaller { if (selected === 'Install') { fs.mkdirSync(directory, { recursive: true }); this.installPkg(directory, newVersion, identifer).then(() => { - vscode.window.showInformationMessage(`Installed terraform-ls ${newVersion}`, 'Start server'); + vscode.window.showInformationMessage(`Installed terraform-ls ${newVersion}`); return resolve(); }).catch((err) => { return reject(err); diff --git a/out/languageServerInstaller.js.map b/out/languageServerInstaller.js.map index 9203d1f6e..6fd5e8ef1 100644 --- a/out/languageServerInstaller.js.map +++ b/out/languageServerInstaller.js.map @@ -1 +1 @@ -{"version":3,"file":"languageServerInstaller.js","sourceRoot":"","sources":["../src/languageServerInstaller.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"languageServerInstaller.js","sourceRoot":"","sources":["../src/languageServerInstaller.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 21af618a4..f29cbed35 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "terraform.languageServer.external": { "scope": "resource", "type": "boolean", - "default": false, + "default": true, "description": "Whether an external language server binary should be launched." }, "terraform.languageServer.pathToBinary": { diff --git a/src/languageServerInstaller.ts b/src/languageServerInstaller.ts index 04dd9c88f..f47f65198 100644 --- a/src/languageServerInstaller.ts +++ b/src/languageServerInstaller.ts @@ -29,7 +29,7 @@ export class LanguageServerInstaller { this.checkCurrent().then((version: string) => { fs.mkdirSync(directory, { recursive: true }); this.installPkg(directory, version, identifer).then(() => { - vscode.window.showInformationMessage(`Installed terraform-ls ${version}`, 'Start server'); + vscode.window.showInformationMessage(`Installed terraform-ls ${version}`); return resolve(); }).catch((err) => { return reject(err); @@ -46,7 +46,7 @@ export class LanguageServerInstaller { if (selected === 'Install') { fs.mkdirSync(directory, { recursive: true }); this.installPkg(directory, newVersion, identifer).then(() => { - vscode.window.showInformationMessage(`Installed terraform-ls ${newVersion}`, 'Start server'); + vscode.window.showInformationMessage(`Installed terraform-ls ${newVersion}`); return resolve(); }).catch((err) => { return reject(err);