more

Author: jakebailey

internal/ls/documenthighlights.go

@@ -47,7 +47,8 @@ func (l *LanguageService) ProvideDocumentHighlights(ctx context.Context, documen
 		documentHighlights = l.getSyntacticDocumentHighlights(node, sourceFile)
 	}
 	// if nil is passed here we never generate an error, just pass an empty higlight
-	return lsproto.DocumentHighlightsOrNull{DocumentHighlights: &documentHighlights}, nil
+	resp := lsproto.DocumentHighlightsOrNull{DocumentHighlights: &documentHighlights}
+	return resp, nil
 }
 
 func (l *LanguageService) getSemanticDocumentHighlights(ctx context.Context, position int, node *ast.Node, program *compiler.Program, sourceFile *ast.SourceFile) []*lsproto.DocumentHighlight {

internal/ls/findallreferences.go

@@ -621,7 +621,7 @@ func (l *LanguageService) getReferencedSymbolsForNode(ctx context.Context, posit
 		}
 
 		if moduleSymbol := checker.GetMergedSymbol(resolvedRef.file.Symbol); moduleSymbol != nil {
-			return getReferencedSymbolsForModule(program, moduleSymbol /*excludeImportTypeOfExportEquals*/, false, sourceFiles, sourceFilesSet)
+			return getReferencedSymbolsForModule(ctx, program, moduleSymbol /*excludeImportTypeOfExportEquals*/, false, sourceFiles, sourceFilesSet)
 		}
 
 		// !!! not implemented
@@ -669,11 +669,11 @@ func (l *LanguageService) getReferencedSymbolsForNode(ctx context.Context, posit
 	}
 
 	if symbol.Name == ast.InternalSymbolNameExportEquals {
-		return getReferencedSymbolsForModule(program, symbol.Parent, false /*excludeImportTypeOfExportEquals*/, sourceFiles, sourceFilesSet)
+		return getReferencedSymbolsForModule(ctx, program, symbol.Parent, false /*excludeImportTypeOfExportEquals*/, sourceFiles, sourceFilesSet)
 	}
 
 	moduleReferences := l.getReferencedSymbolsForModuleIfDeclaredBySourceFile(ctx, symbol, program, sourceFiles, checker, options, sourceFilesSet) // !!! cancellationToken
-	if moduleReferences != nil && symbol.Flags&ast.SymbolFlagsTransient != 0 {
+	if moduleReferences != nil && symbol.Flags&ast.SymbolFlagsTransient == 0 {
 		return moduleReferences
 	}
 
@@ -696,7 +696,7 @@ func (l *LanguageService) getReferencedSymbolsForModuleIfDeclaredBySourceFile(ct
 	}
 	exportEquals := symbol.Exports[ast.InternalSymbolNameExportEquals]
 	// If exportEquals != nil, we're about to add references to `import("mod")` anyway, so don't double-count them.
-	moduleReferences := getReferencedSymbolsForModule(program, symbol, exportEquals != nil, sourceFiles, sourceFilesSet)
+	moduleReferences := getReferencedSymbolsForModule(ctx, program, symbol, exportEquals != nil, sourceFiles, sourceFilesSet)
 	if exportEquals == nil || !sourceFilesSet.Has(moduleSourceFileName) {
 		return moduleReferences
 	}
@@ -975,13 +975,14 @@ func getMergedAliasedSymbolOfNamespaceExportDeclaration(node *ast.Node, symbol *
 	return nil
 }
 
-func getReferencedSymbolsForModule(program *compiler.Program, symbol *ast.Symbol, excludeImportTypeOfExportEquals bool, sourceFiles []*ast.SourceFile, sourceFilesSet *collections.Set[string]) []*SymbolAndEntries {
+func getReferencedSymbolsForModule(ctx context.Context, program *compiler.Program, symbol *ast.Symbol, excludeImportTypeOfExportEquals bool, sourceFiles []*ast.SourceFile, sourceFilesSet *collections.Set[string]) []*SymbolAndEntries {
 	debug.Assert(symbol.ValueDeclaration != nil)
 
-	checker, done := program.GetTypeChecker(nil)
+	checker, done := program.GetTypeChecker(ctx)
 	defer done()
 
-	references := core.MapNonNil(findModuleReferences(program, sourceFiles, symbol, checker), func(reference ModuleReference) *referenceEntry {
+	moduleRefs := findModuleReferences(program, sourceFiles, symbol, checker)
+	references := core.MapNonNil(moduleRefs, func(reference ModuleReference) *referenceEntry {
 		switch reference.kind {
 		case ModuleReferenceKindImport:
 			parent := reference.literal.Parent

testdata/baselines/reference/fourslash/documentHighlights/documentHighlightImportPath.baseline.jsonc

@@ -1,3 +1,3 @@
 // === documentHighlights ===
 // === /b.ts ===
-// import { x } from "/*HIGHLIGHTS*/./a";
+// import { x } from "/*HIGHLIGHTS*/[|./a|]";

testdata/baselines/reference/fourslash/findAllReferences/findAllReferencesDynamicImport1.baseline.jsonc

@@ -0,0 +1,5 @@
+// === findAllReferences ===
+// === /foo.ts ===
+// export function foo() { return "foo"; }
+// /*FIND ALL REFS*/import("./foo")
+// var x = import("./foo")

testdata/baselines/reference/fourslash/findAllReferences/findAllReferencesUmdModuleAsGlobalConst.baseline.jsonc

@@ -0,0 +1,4 @@
+// === findAllReferences ===
+// === /node_modules/@types/three/index.d.ts ===
+// export * from "./three-core";
+// export as namespace /*FIND ALL REFS*/[|THREE|];

testdata/baselines/reference/fourslash/findAllReferences/findAllRefsExportEquals.baseline.jsonc

@@ -0,0 +1,31 @@
+// === findAllReferences ===
+// === /a.ts ===
+// type /*FIND ALL REFS*/[|T|] = number;
+// export = T;
+
+
+
+// === findAllReferences ===
+// === /a.ts ===
+// type T = number;
+// /*FIND ALL REFS*/export = T;
+
+
+
+// === findAllReferences ===
+// === /a.ts ===
+// type T = number;
+// export = /*FIND ALL REFS*/[|T|];
+
+// === /b.ts ===
+// import [|T|] = require("./a");
+
+
+
+// === findAllReferences ===
+// === /a.ts ===
+// type [|T|] = number;
+// export = [|T|];
+
+// === /b.ts ===
+// import /*FIND ALL REFS*/[|T|] = require("./a");

testdata/baselines/reference/fourslash/findAllReferences/findAllRefsForDefaultExport03.baseline.jsonc

@@ -0,0 +1,25 @@
+// === findAllReferences ===
+// === /findAllRefsForDefaultExport03.ts ===
+// /*FIND ALL REFS*/function f() {
+//     return 100;
+// }
+// 
+// // --- (line: 5) skipped ---
+
+
+
+// === findAllReferences ===
+// === /findAllRefsForDefaultExport03.ts ===
+// function /*FIND ALL REFS*/[|f|]() {
+//     return 100;
+// }
+// 
+// export default [|f|];
+// 
+// var x: typeof [|f|];
+// 
+// var y = [|f|]();
+// 
+// namespace [|f|] {
+//     var local = 100;
+// }

testdata/baselines/reference/fourslash/findAllReferences/findAllRefsModuleDotExports.baseline.jsonc

@@ -0,0 +1,3 @@
+// === findAllReferences ===
+// === /a.js ===
+// /*FIND ALL REFS*/const b = require("./b");

testdata/baselines/reference/fourslash/findAllReferences/findAllRefs_importType_typeofImport.baseline.jsonc

@@ -0,0 +1,4 @@
+// === findAllReferences ===
+// === /b.ts ===
+// /*FIND ALL REFS*/const x: typeof import("./a") = { x: 0 };
+// const y: typeof import("./a") = { x: 0 };