Dbaeumer/fun-marmot-blue (#297)

* WIP

* Make TypeOfLocalsRunnable work in more cases.

Author: dbaeumer

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

@@ -194,6 +194,8 @@ export class TypeOfLocalsRunnable extends AbstractContextRunnable {
 			return;
 		}
 		const sourceFile = token.getSourceFile();
+		// When we try to capture locals outside of a callable (e.g. top level in a source file) we capture the declarations as
+		// scope. If we are inside the body of the callable defines the scope.
 		let variableDeclarations: Set<tt.VariableDeclarationList> | undefined = this.cacheScope === undefined ? new Set() : undefined;
 		// The symbols are block scope variables. We try to find the type of the variable
 		// to include it in the context.
@@ -202,12 +204,6 @@ export class TypeOfLocalsRunnable extends AbstractContextRunnable {
 			if (this.excludes.has(symbol)) {
 				continue;
 			}
-			const symbolSourceFile = Symbols.getPrimarySourceFile(symbol);
-			// If the symbol is not defined in the current source file we skip it. It would otherwise
-			// pollute with too many types from the global scope from other files.
-			if (symbolSourceFile !== sourceFile || this.skipSourceFile(symbolSourceFile)) {
-				continue;
-			}
 			const declaration: tt.VariableDeclaration | undefined = Symbols.getDeclaration(symbol, ts.SyntaxKind.VariableDeclaration);
 			if (declaration === undefined) {
 				continue;

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

@@ -807,19 +807,17 @@ class RunnableResultManager implements vscode.Disposable {
 					items.set(key, item);
 				}
 			};
-			// Clear all within runnable results that don't contain the requested position.
-			for (let i = 0; i < this.withInRangeRunnableResults.length;) {
-				const entry = this.withInRangeRunnableResults[i];
-				if (entry.range.contains(position)) {
-					i++;
-					continue;
-				}
-				const id = entry.resultId;
-				this.results.delete(id);
-				this.withInRangeRunnableResults.splice(i, 1);
-			}
 			for (const [id, item] of this.results.entries()) {
-				handleRunnableResult(id, item);
+				const scope = item.cache?.scope;
+				if (scope === undefined || scope.kind !== protocol.CacheScopeKind.WithinRange) {
+					handleRunnableResult(id, item);
+				} else {
+					const r = scope.range;
+					const range = new vscode.Range(r.start.line, r.start.character, r.end.line, r.end.character);
+					if (range.contains(position)) {
+						handleRunnableResult(id, item);
+					}
+				}
 			}
 		}
 		return { client, clientOnTimeout, server, itemMap: items, resultMap: new Map(this.results) };