Use gotype-live only in non module & non gopls scenarios

microsoft · May 24, 2019 · d1bf95c · d1bf95c
1 parent 293bd31
commit d1bf95c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/goLiveErrors.ts b/src/goLiveErrors.ts
@@ -6,6 +6,7 @@ import cp = require('child_process');
 import path = require('path');
 import { promptForMissingTool } from './goInstallTools';
 import { buildDiagnosticCollection } from './goMain';
+import { isModSupported } from './goModules';
 
 // Interface for settings configuration for adding and removing tags
 interface GoLiveErrorsConfig {
@@ -53,7 +54,12 @@ export function parseLiveFile(e: vscode.TextDocumentChangeEvent) {
 }
 
 // processFile does the actual work once the timeout has fired
-function processFile(e: vscode.TextDocumentChangeEvent) {
+async function processFile(e: vscode.TextDocumentChangeEvent) {
+	const isMod = await isModSupported(e.document.uri);
+	if (isMod) {
+		return;
+	}
+
 	const gotypeLive = getBinPath('gotype-live');
 	if (!path.isAbsolute(gotypeLive)) {
 		return promptForMissingTool('gotype-live');

diff --git a/src/goMain.ts b/src/goMain.ts
@@ -288,6 +288,10 @@ export function activate(ctx: vscode.ExtensionContext): void {
 			});
 
 			ctx.subscriptions.push(c.start());
+
+			if (languageServerTool !== 'gopls' || !languageServerExperimentalFeatures['diagnostics']) {
+				vscode.workspace.onDidChangeTextDocument(parseLiveFile, null, ctx.subscriptions);
+			}
 		} else {
 			registerCompletionProvider(ctx);
 			ctx.subscriptions.push(vscode.languages.registerHoverProvider(GO_MODE, new GoHoverProvider()));
@@ -300,6 +304,7 @@ export function activate(ctx: vscode.ExtensionContext): void {
 			ctx.subscriptions.push(vscode.languages.registerDocumentFormattingEditProvider(GO_MODE, new GoDocumentFormattingEditProvider()));
 			ctx.subscriptions.push(vscode.languages.registerTypeDefinitionProvider(GO_MODE, new GoTypeDefinitionProvider()));
 			ctx.subscriptions.push(vscode.languages.registerRenameProvider(GO_MODE, new GoRenameProvider()));
+			vscode.workspace.onDidChangeTextDocument(parseLiveFile, null, ctx.subscriptions);
 		}
 
 		if (vscode.window.activeTextEditor && vscode.window.activeTextEditor.document.languageId === 'go' && isGoPathSet()) {
@@ -328,7 +333,6 @@ export function activate(ctx: vscode.ExtensionContext): void {
 	vscode.workspace.onDidChangeTextDocument(removeTestStatus, null, ctx.subscriptions);
 	vscode.window.onDidChangeActiveTextEditor(showHideStatus, null, ctx.subscriptions);
 	vscode.window.onDidChangeActiveTextEditor(applyCodeCoverage, null, ctx.subscriptions);
-	vscode.workspace.onDidChangeTextDocument(parseLiveFile, null, ctx.subscriptions);
 	vscode.workspace.onDidChangeTextDocument(notifyIfGeneratedFile, ctx, ctx.subscriptions);
 	startBuildOnSaveWatcher(ctx.subscriptions);