Fix bug causing lint processes to sometimes not be killed when desire…

…d (#1791) * Fix bug causing lint processes to sometimes not be killed when desired * same for goVet
husains · Jul 17, 2018 · 67d4d93 · 67d4d93
1 parent da265b0
commit 67d4d93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/goLint.ts b/src/goLint.ts
@@ -43,6 +43,8 @@ export function lintCode(lintWorkspace?: boolean) {
  * @param lintWorkspace If true runs linter in all workspace.
  */
 export function goLint(fileUri: vscode.Uri, goConfig: vscode.WorkspaceConfiguration, lintWorkspace?: boolean): Promise<ICheckResult[]> {
+	epoch++;
+	let closureEpoch = epoch;
 	if (tokenSource) {
 		if (running) {
 			tokenSource.cancel();
@@ -113,12 +115,14 @@ export function goLint(fileUri: vscode.Uri, goConfig: vscode.WorkspaceConfigurat
 		false,
 		tokenSource.token
 	).then((result) => {
-		running = false;
+		if (closureEpoch === epoch)
+			running = false;
 		return result;
 	});
 
 	return lintPromise;
 }
 
+let epoch = 0;
 let tokenSource: vscode.CancellationTokenSource;
 let running = false;
diff --git a/src/goVet.ts b/src/goVet.ts
@@ -44,6 +44,8 @@ export function vetCode(vetWorkspace?: boolean) {
  * @param vetWorkspace If true vets code in all workspace.
  */
 export function goVet(fileUri: vscode.Uri, goConfig: vscode.WorkspaceConfiguration, vetWorkspace?: boolean): Promise<ICheckResult[]> {
+	epoch++;
+	let closureEpoch = epoch;
 	if (tokenSource) {
 		if (running) {
 			tokenSource.cancel();
@@ -83,13 +85,15 @@ export function goVet(fileUri: vscode.Uri, goConfig: vscode.WorkspaceConfigurati
 			false,
 			tokenSource.token
 		).then((result) => {
-			running = false;
+			if (closureEpoch === epoch)
+				running = false;
 			return result;
 		});
 	});
 
 	return vetPromise;
 }
 
+let epoch = 0;
 let tokenSource: vscode.CancellationTokenSource;
 let running = false;