Skip to content

Commit

Permalink
Load root modules args from folder scope
Browse files Browse the repository at this point in the history 
Fix enable/disable config
  • Loading branch information
@appilon
appilon committed Aug 14, 2020
1 parent 32c6470 commit ed5b5d2
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 40 deletions.
1 change: 0 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
"description": "Language Server settings",
"properties": {
"external": {
"scope": "resource",
"type": "boolean",
"default": true,
"description": "Whether an external language server binary should be launched."
Expand Down
84 changes: 45 additions & 39 deletions src/extension.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,20 @@ import { runCommand } from './terraformCommand';

let clients: Map<string, LanguageClient> = new Map();
let extensionPath: string;
// tracks if a enabling/disabling change was done via command, avoids prompting reload
let enableDisableByCommand = false;

export async function activate(context: vscode.ExtensionContext) {
extensionPath = context.extensionPath;
const commandOutput = vscode.window.createOutputChannel("Terraform");
const commandOutput = vscode.window.createOutputChannel('Terraform');
// get rid of pre-2.0.0 settings
if (config('terraform').has('languageServer.enabled')) {
const defaults = require("../package.json").contributes.configuration.properties['terraform.languageServer'].default;
await config('terraform').update('languageServer',
Object.assign(defaults, { enabled: undefined }),
true
)
try {
let current = config('terraform').get('languageServer');
await config('terraform').update('languageServer', Object.assign(current, {enabled: undefined}), vscode.ConfigurationTarget.Global);
} catch (err) {
console.error(`Error trying to erase terraform.languageServer.enabled: ${err.message}`);
}
}

// Terraform Commands
Expand All @@ -44,52 +47,52 @@ export async function activate(context: vscode.ExtensionContext) {
// Subscriptions
context.subscriptions.push(
vscode.commands.registerCommand('terraform.enableLanguageServer', async () => {
await startClients();
// TODO: this throws as an unregistered configuration in this callback?
// in theory this could cause an infinite loop with the reload hook below
// return config('terraform').update("languageServer.external", true, vscode.ConfigurationTarget.Global);
enableDisableByCommand = true;
await config('terraform').update('languageServer', { external: true }, vscode.ConfigurationTarget.Global);
return startClients();
}),
vscode.commands.registerCommand('terraform.disableLanguageServer', async () => {
await stopClients();
// TODO: this throws as an unregistered configuration in this callback?
// in theory this could cause an infinite loop with the reload hook below
// return config('terraform').update("languageServer.external", false, vscode.ConfigurationTarget.Global);
enableDisableByCommand = true;
await config('terraform').update('languageServer', { external: false }, vscode.ConfigurationTarget.Global);
return stopClients();
}),
vscode.workspace.onDidChangeConfiguration(
async (event: vscode.ConfigurationChangeEvent) => {
if (event.affectsConfiguration("terraform") || event.affectsConfiguration("terraform-ls")) {
const reloadMsg = "Reload VSCode window to apply language server changes";
const selected = await vscode.window.showInformationMessage(reloadMsg, "Reload");
if (selected === "Reload") {
vscode.commands.executeCommand("workbench.action.reloadWindow");
if (event.affectsConfiguration('terraform-ls') || (event.affectsConfiguration('terraform') && !enableDisableByCommand)) {
enableDisableByCommand = false;
const reloadMsg = 'Reload VSCode window to apply language server changes';
const selected = await vscode.window.showInformationMessage(reloadMsg, 'Reload');
if (selected === 'Reload') {
vscode.commands.executeCommand('workbench.action.reloadWindow');
}
}
}
),
vscode.workspace.onDidChangeWorkspaceFolders(
async (event: vscode.WorkspaceFoldersChangeEvent) => {
if (event.removed.length > 0) {
await stopClients(sortedWorkspaceFolders(event.removed));
await stopClients(folderNames(event.removed));
}
if (event.added.length > 0) {
await startClients(sortedWorkspaceFolders(event.added));
await startClients(folderNames(event.added));
}
}
)
);

const useLs: boolean = config('terraform').get("languageServer.external");
if (useLs) {
return vscode.commands.executeCommand("terraform.enableLanguageServer");
}
const useLs: boolean = config('terraform').get('languageServer.external');
console.log(useLs);
// if (useLs) {
// return vscode.commands.executeCommand('terraform.enableLanguageServer');
// }
}

export function deactivate() {
return stopClients();
}

async function startClients(folders = sortedWorkspaceFolders()) {
console.log("Starting:", folders);
async function startClients(folders = folderNames()) {
console.log('Starting:', folders);
const command = await pathToBinary();
let disposables: vscode.Disposable[] = [];
for (const folder of folders) {
Expand All @@ -105,13 +108,14 @@ async function startClients(folders = sortedWorkspaceFolders()) {
}

function newClient(cmd: string, folder: string) {
const binaryName = cmd.split("/").pop();
const binaryName = cmd.split('/').pop();
const channelName = `${binaryName}/${folder}`;
const f = pathToWorkspaceFolder(folder);
const serverArgs: string[] = config('terraform').get('languageServer.args');
let initializationOptions = { rootModulePaths: config('terraform').get("rootModules") };
let initializationOptions = { rootModulePaths: config('terraform-ls', f).get('rootModules') };

const setup = vscode.window.createOutputChannel(channelName);
setup.appendLine(`Launching language server: ${cmd} ${serverArgs.join(" ")} for folder: ${folder}`);
setup.appendLine(`Launching language server: ${cmd} ${serverArgs.join(' ')} for folder: ${folder}`);

const executable: Executable = {
command: cmd,
Expand All @@ -122,7 +126,6 @@ function newClient(cmd: string, folder: string) {
run: executable,
debug: executable
};
const f = vscode.workspace.getWorkspaceFolder(vscode.Uri.parse(folder));
const clientOptions: LanguageClientOptions = {
documentSelector: [{ scheme: 'file', language: 'terraform', pattern: `${f.uri.fsPath}/**/*` }],
workspaceFolder: f,
Expand All @@ -139,8 +142,8 @@ function newClient(cmd: string, folder: string) {
);
}

async function stopClients(folders = sortedWorkspaceFolders()) {
console.log("Stopping:", folders);
async function stopClients(folders = folderNames()) {
console.log('Stopping:', folders);
let promises: Thenable<void>[] = [];
for (const folder of folders) {
if (clients.has(folder)) {
Expand All @@ -156,7 +159,7 @@ async function stopClients(folders = sortedWorkspaceFolders()) {
let _pathToBinaryPromise: Promise<string>
async function pathToBinary(): Promise<string> {
if (!_pathToBinaryPromise) {
let command: string = config('terraform').get("languageServer.pathToBinary");
let command: string = config('terraform').get('languageServer.pathToBinary');
if (!command) { // Skip install/upgrade if user has set custom binary path
const installDir = `${extensionPath}/lsp`;
try {
Expand All @@ -172,12 +175,15 @@ async function pathToBinary(): Promise<string> {
return _pathToBinaryPromise;
}

function config(section: string) {
return vscode.workspace.getConfiguration(section);
function config(section: string, scope?: vscode.ConfigurationScope) {
return vscode.workspace.getConfiguration(section, scope);
}

function pathToWorkspaceFolder(folder: string) {
return vscode.workspace.getWorkspaceFolder(vscode.Uri.parse(folder));
}

// this was lifted from a sample, having the folders sorted may not be necessary
function sortedWorkspaceFolders(folders: readonly vscode.WorkspaceFolder[] = vscode.workspace.workspaceFolders): string[] {
function folderNames(folders: readonly vscode.WorkspaceFolder[] = vscode.workspace.workspaceFolders): string[] {
if (!folders) {
return [];
}
Expand All @@ -187,5 +193,5 @@ function sortedWorkspaceFolders(folders: readonly vscode.WorkspaceFolder[] = vsc
result = result + '/';
}
return result;
}).sort((a, b) => a.length - b.length);
});
}

0 comments on commit ed5b5d2

Please sign in to comment.