Only re-request diagnostics if the file has actually been opened

mjbvz · mjbvz · commit a8f8a2dca084 · 2020-04-11T17:30:12.000-07:00
Fixes microsoft#95027 Hovers cause VS Code to quickly open and the close the target file. We never actually sync the file with the TypeScript server when this happens. However on file close, we always re-request diagnostics for the project. This fix makes it so that we only re-request diagnostics if the file has actually been opened on the TSServer
diff --git a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
@@ -82,12 +82,16 @@ class BufferSynchronizer {
 		}
 	}
 
-	public close(resource: vscode.Uri, filepath: string) {
+	/**
+	 * @return Was the buffer open?
+	 */
+	public close(resource: vscode.Uri, filepath: string): boolean {
 		if (this.supportsBatching) {
-			this.updatePending(resource, new CloseOperation(filepath));
+			return this.updatePending(resource, new CloseOperation(filepath));
 		} else {
 			const args: Proto.FileRequestArgs = { file: filepath };
 			this.client.executeWithoutWaitingForResponse('close', args);
+			return true;
 		}
 	}
 
@@ -155,14 +159,14 @@ class BufferSynchronizer {
 		return this.client.apiVersion.gte(API.v340);
 	}
 
-	private updatePending(resource: vscode.Uri, op: BufferOperation): void {
+	private updatePending(resource: vscode.Uri, op: BufferOperation): boolean {
 		switch (op.type) {
 			case BufferOperationType.Close:
 				const existing = this._pending.get(resource);
 				switch (existing?.type) {
 					case BufferOperationType.Open:
 						this._pending.delete(resource);
-						return; // Open then close. No need to do anything
+						return false; // Open then close. No need to do anything
 				}
 				break;
 		}
@@ -172,6 +176,7 @@ class BufferSynchronizer {
 			this.flush();
 		}
 		this._pending.set(resource, op);
+		return true;
 	}
 }
 
@@ -232,9 +237,16 @@ class SyncedBuffer {
 		}
 	}
 
-	public close(): void {
-		this.synchronizer.close(this.resource, this.filepath);
+	/**
+	 * @return Was the buffer open?
+	 */
+	public close(): boolean {
+		if (this.state !== BufferState.Open) {
+			this.state = BufferState.Closed;
+			return false;
+		}
 		this.state = BufferState.Closed;
+		return this.synchronizer.close(this.resource, this.filepath);
 	}
 
 	public onContentChanged(events: readonly vscode.TextDocumentContentChangeEvent[]): void {
@@ -454,9 +466,11 @@ export default class BufferSyncSupport extends Disposable {
 		this.pendingDiagnostics.delete(resource);
 		this.pendingGetErr?.files.delete(resource);
 		this.syncedBuffers.delete(resource);
-		syncedBuffer.close();
+		const wasBufferOpen = syncedBuffer.close();
 		this._onDelete.fire(resource);
-		this.requestAllDiagnostics();
+		if (wasBufferOpen) {
+			this.requestAllDiagnostics();
+		}
 	}
 
 	public interuptGetErr<R>(f: () => R): R {

Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,16 @@ class BufferSynchronizer {`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`- public close(resource: vscode.Uri, filepath: string) {`
	`85`	`+ /**`
	`86`	`+ * @return Was the buffer open?`
	`87`	`+ */`
	`88`	`+ public close(resource: vscode.Uri, filepath: string): boolean {`
`86`	`89`	`if (this.supportsBatching) {`
`87`		`- this.updatePending(resource, new CloseOperation(filepath));`
	`90`	`+ return this.updatePending(resource, new CloseOperation(filepath));`
`88`	`91`	`} else {`
`89`	`92`	`const args: Proto.FileRequestArgs = { file: filepath };`
`90`	`93`	`this.client.executeWithoutWaitingForResponse('close', args);`
	`94`	`+ return true;`
`91`	`95`	`}`
`92`	`96`	`}`
`93`	`97`
`@@ -155,14 +159,14 @@ class BufferSynchronizer {`
`155`	`159`	`return this.client.apiVersion.gte(API.v340);`
`156`	`160`	`}`
`157`	`161`
`158`		`- private updatePending(resource: vscode.Uri, op: BufferOperation): void {`
	`162`	`+ private updatePending(resource: vscode.Uri, op: BufferOperation): boolean {`
`159`	`163`	`switch (op.type) {`
`160`	`164`	`case BufferOperationType.Close:`
`161`	`165`	`const existing = this._pending.get(resource);`
`162`	`166`	`switch (existing?.type) {`
`163`	`167`	`case BufferOperationType.Open:`
`164`	`168`	`this._pending.delete(resource);`
`165`		`- return; // Open then close. No need to do anything`
	`169`	`+ return false; // Open then close. No need to do anything`
`166`	`170`	`}`
`167`	`171`	`break;`
`168`	`172`	`}`
`@@ -172,6 +176,7 @@ class BufferSynchronizer {`
`172`	`176`	`this.flush();`
`173`	`177`	`}`
`174`	`178`	`this._pending.set(resource, op);`
	`179`	`+ return true;`
`175`	`180`	`}`
`176`	`181`	`}`
`177`	`182`
`@@ -232,9 +237,16 @@ class SyncedBuffer {`
`232`	`237`	`}`
`233`	`238`	`}`
`234`	`239`
`235`		`- public close(): void {`
`236`		`- this.synchronizer.close(this.resource, this.filepath);`
	`240`	`+ /**`
	`241`	`+ * @return Was the buffer open?`
	`242`	`+ */`
	`243`	`+ public close(): boolean {`
	`244`	`+ if (this.state !== BufferState.Open) {`
	`245`	`+ this.state = BufferState.Closed;`
	`246`	`+ return false;`
	`247`	`+ }`
`237`	`248`	`this.state = BufferState.Closed;`
	`249`	`+ return this.synchronizer.close(this.resource, this.filepath);`
`238`	`250`	`}`
`239`	`251`
`240`	`252`	`public onContentChanged(events: readonly vscode.TextDocumentContentChangeEvent[]): void {`
`@@ -454,9 +466,11 @@ export default class BufferSyncSupport extends Disposable {`
`454`	`466`	`this.pendingDiagnostics.delete(resource);`
`455`	`467`	`this.pendingGetErr?.files.delete(resource);`
`456`	`468`	`this.syncedBuffers.delete(resource);`
`457`		`- syncedBuffer.close();`
	`469`	`+ const wasBufferOpen = syncedBuffer.close();`
`458`	`470`	`this._onDelete.fire(resource);`
`459`		`- this.requestAllDiagnostics();`
	`471`	`+ if (wasBufferOpen) {`
	`472`	`+ this.requestAllDiagnostics();`
	`473`	`+ }`
`460`	`474`	`}`
`461`	`475`
`462`	`476`	`public interuptGetErr<R>(f: () => R): R {`