Improve cache invalidation on client side (#254)

Author: dbaeumer

src/extension/typescriptContext/serverPlugin/src/common/api.ts

@@ -10,7 +10,7 @@ import { CompilerOptionsRunnable } from './baseContextProviders';
 import { ClassContextProvider } from './classContextProvider';
 import { ContextProvider, ContextRunnableCollector, RequestContext, type ComputeContextSession, type ContextProviderFactory, type ContextResult, type ContextRunnable, type ProviderComputeContext } from './contextProvider';
 import { FunctionContextProvider } from './functionContextProvider';
-import { ConstructorContextProvider, MethodContextProvider } from './methodContextProvider';
+import { AccessorProvider, ConstructorContextProvider, MethodContextProvider } from './methodContextProvider';
 import { ModuleContextProvider } from './moduleContextProvider';
 import { type FilePath } from './protocol';
 import { SourceFileContextProvider } from './sourceFileContextProvider';
@@ -44,6 +44,8 @@ class ContextProviders {
 		[ts.SyntaxKind.FunctionDeclaration, (node, tokenInfo, computeContext) => new FunctionContextProvider(node as tt.FunctionDeclaration, tokenInfo, computeContext)],
 		[ts.SyntaxKind.ArrowFunction, (node, tokenInfo, computeContext) => new FunctionContextProvider(node as tt.ArrowFunction, tokenInfo, computeContext)],
 		[ts.SyntaxKind.FunctionExpression, (node, tokenInfo, computeContext) => new FunctionContextProvider(node as tt.FunctionExpression, tokenInfo, computeContext)],
+		[ts.SyntaxKind.GetAccessor, (node, tokenInfo, computeContext) => new AccessorProvider(node as tt.GetAccessorDeclaration, tokenInfo, computeContext)],
+		[ts.SyntaxKind.SetAccessor, (node, tokenInfo, computeContext) => new AccessorProvider(node as tt.SetAccessorDeclaration, tokenInfo, computeContext)],
 		[ts.SyntaxKind.ClassDeclaration, ClassContextProvider.create as unknown as ContextProviderFactory],
 		[ts.SyntaxKind.Constructor, (node, tokenInfo, computeContext) => new ConstructorContextProvider(node as tt.ConstructorDeclaration, tokenInfo, computeContext)],
 		[ts.SyntaxKind.MethodDeclaration, (node, tokenInfo, computeContext) => new MethodContextProvider(node as tt.MethodDeclaration, tokenInfo, computeContext)],

src/extension/typescriptContext/serverPlugin/src/common/methodContextProvider.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import type tt from 'typescript/lib/tsserverlibrary';
+import tt from 'typescript/lib/tsserverlibrary';
 import TS from './typescript';
 const ts = TS();
 
@@ -470,7 +470,7 @@ class SimilarMethodRunnable extends SimilarPropertyRunnable<tt.MethodDeclaration
 	}
 }
 
-abstract class ClassPropertyContextProvider<T extends tt.MethodDeclaration | tt.ConstructorDeclaration> extends FunctionLikeContextProvider {
+abstract class ClassPropertyContextProvider<T extends tt.MethodDeclaration | tt.ConstructorDeclaration | tt.GetAccessorDeclaration | tt.SetAccessorDeclaration> extends FunctionLikeContextProvider {
 
 	protected readonly declaration: T;
 	public override readonly isCallableProvider: boolean;
@@ -508,9 +508,9 @@ abstract class ClassPropertyContextProvider<T extends tt.MethodDeclaration | tt.
 
 class PropertiesTypeRunnable extends AbstractContextRunnable {
 
-	private readonly declaration: tt.MethodDeclaration | tt.ConstructorDeclaration;
+	private readonly declaration: tt.MethodDeclaration | tt.ConstructorDeclaration | tt.GetAccessorDeclaration | tt.SetAccessorDeclaration;
 
-	constructor(session: ComputeContextSession, languageService: tt.LanguageService, context: RequestContext, declaration: tt.MethodDeclaration | tt.ConstructorDeclaration, priority: number = Priorities.Properties) {
+	constructor(session: ComputeContextSession, languageService: tt.LanguageService, context: RequestContext, declaration: tt.MethodDeclaration | tt.ConstructorDeclaration | tt.GetAccessorDeclaration | tt.SetAccessorDeclaration, priority: number = Priorities.Properties) {
 		super(session, languageService, context, 'PropertiesTypeRunnable', priority, ComputeCost.Medium);
 		this.declaration = declaration;
 	}
@@ -645,6 +645,18 @@ export class MethodContextProvider extends ClassPropertyContextProvider<tt.Metho
 	}
 }
 
+export class AccessorProvider extends ClassPropertyContextProvider<tt.GetAccessorDeclaration | tt.SetAccessorDeclaration> {
+
+	constructor(declaration: tt.GetAccessorDeclaration | tt.SetAccessorDeclaration, tokenInfo: TokenInfo, computeContext: ProviderComputeContext) {
+		super(declaration, tokenInfo, computeContext);
+	}
+
+	public override provide(result: ContextRunnableCollector, session: ComputeContextSession, languageService: tt.LanguageService, context: RequestContext, token: tt.CancellationToken): void {
+		super.provide(result, session, languageService, context, token);
+		result.addSecondary(new PropertiesTypeRunnable(session, languageService, context, this.declaration));
+	}
+}
+
 class ConstructorBlueprintSearch extends FindInSiblingClassSearch<tt.ConstructorDeclaration> {
 
 	constructor(program: tt.Program, symbols: Symbols, search: ConstructorBlueprintSearch);

src/extension/typescriptContext/vscode-node/languageContextService.ts

@@ -724,7 +724,7 @@ class RunnableResultManager implements vscode.Disposable {
 		this.withInRangeRunnableResults.length = 0;
 		this.outsideRangeRunnableResults.length = 0;
 		this.neighborFileRunnableResults.length = 0;
-		this.results = new Map();
+		this.results.clear();
 		this.cacheInfo = {
 			version: version,
 			state: CacheState.NotPopulated
@@ -742,7 +742,7 @@ class RunnableResultManager implements vscode.Disposable {
 			path: body.path ?? [0]
 		};
 
-		if (body.runnableResults === undefined || body.runnableResults.length === 0) {
+		if (body.runnableResults === undefined || body.runnableResults.length === 0 || body.path === undefined || body.path.length === 0 || body.path[0] === 0) {
 			return { resolved: [], cached: cachedItems, referenced: referencedItems, serverComputed: serverComputed };
 		}
 
@@ -865,7 +865,7 @@ class RunnableResultManager implements vscode.Disposable {
 		if (this.requestInfo?.document !== document.uri.toString()) {
 			return undefined;
 		}
-		if (this.cacheInfo.version !== document.version) {
+		if (this.cacheInfo.version !== document.version || this.cacheInfo.state === CacheState.NotPopulated || this.requestInfo.path.length === 0 || this.requestInfo.path[0] === 0) {
 			this.clear();
 			return undefined;
 		}