Include import specifiers as references in code lens

internal/ls/findallreferences.go

@@ -1905,9 +1905,12 @@ func (state *refState) getReferencesAtLocation(sourceFile *ast.SourceFile, posit
 	}
 
 	parent := referenceLocation.Parent
-	if parent.Kind == ast.KindImportSpecifier && parent.PropertyName() == referenceLocation {
+	if parent.Kind == ast.KindImportSpecifier && search.comingFrom == ImpExpKindExport {
+		propName := parent.PropertyName()
 		// This is added through `singleReferences` in ImportsResult. If we happen to see it again, don't add it again.
-		return
+		if propName == referenceLocation || (propName == nil && parent.Name() == referenceLocation) {
+			return
+		}
 	}
 
 	if parent.Kind == ast.KindExportSpecifier {
@@ -2159,6 +2162,14 @@ func (state *refState) shouldAddSingleReference(singleRef *ast.Node) bool {
 	if !state.hasMatchingMeaning(singleRef) {
 		return false
 	}
+	// Check if this node is already in any reference group to avoid duplicates
+	for _, symbolAndEntries := range state.result {
+		for _, ref := range symbolAndEntries.references {
+			if ref.node == singleRef {
+				return false
+			}
+		}
+	}
 	if state.options.use != referenceUseRename {
 		return true
 	}

internal/ls/importTracker.go

@@ -366,6 +366,11 @@ func getSearchesFromDirectImports(
 				} else {
 					localSymbol = checker.GetSymbolAtLocation(name)
 				}
+				// Include import specifiers as references to the exported symbol.
+				// Export specifiers are handled by getReferencesAtExportSpecifier, so skip them here.
+				if !ast.IsExportSpecifier(element) {
+					singleReferences = append(singleReferences, name)
+				}
 				addSearch(name, localSymbol)
 			}
 		}

testdata/baselines/reference/fourslash/codeLenses/codeLensFunctionsAndConstants01.baseline.jsonc

@@ -1,7 +1,7 @@
 // === Code Lenses ===
 // === /exports.ts ===
 // let callCount = 0;
-// export function /*CODELENS: 3 references*/foo(n: number): void {
+// export function /*CODELENS: 4 references*/foo(n: number): void {
 //   callCount++;
 //   if (n > 0) {
 // 	[|foo|](n - 1);
@@ -17,7 +17,7 @@
 // 
 
 // === /importer.ts ===
-// import { foo, bar } from "./exports";
+// import { [|foo|], bar } from "./exports";
 // 
 // [|foo|](5);
 // console.log(bar);
@@ -27,7 +27,7 @@
 
 // === Code Lenses ===
 // === /importer.ts ===
-// import { foo, bar } from "./exports";
+// import { foo, [|bar|] } from "./exports";
 // 
 // foo(5);
 // console.log([|bar|]);
@@ -38,5 +38,5 @@
 // 
 // foo(5);
 // 
-// export const /*CODELENS: 1 reference*/bar = 123;
+// export const /*CODELENS: 2 references*/bar = 123;
 // 

testdata/baselines/reference/fourslash/codeLenses/codeLensInterface01.baseline.jsonc

@@ -89,7 +89,7 @@
 
 // === Code Lenses ===
 // === /classPointable.ts ===
-// import { Pointable } from "./pointable";
+// import { [|Pointable|] } from "./pointable";
 // 
 // class Point implements [|Pointable|] {
 //   getX(): number {
@@ -98,7 +98,7 @@
 // --- (line: 7) skipped ---
 
 // === /objectPointable.ts ===
-// import { Pointable } from "./pointable";
+// import { [|Pointable|] } from "./pointable";
 // 
 // let x = 0;
 // let y = 0;
@@ -109,7 +109,7 @@
 // --- (line: 9) skipped ---
 
 // === /pointable.ts ===
-// export interface /*CODELENS: 2 references*/Pointable {
+// export interface /*CODELENS: 4 references*/Pointable {
 //   getX(): number;
 //   getY(): number;
 // }

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

@@ -14,11 +14,11 @@
 // new D();
 
 // === /b.ts ===
-// import { C } from "./a";
+// import { [|C|] } from "./a";
 // new [|C|]();
 
 // === /c.ts ===
-// import { C } from "./a";
+// import { [|C|] } from "./a";
 // class D extends C {
 //     constructor() {
 //         [|super|]();
@@ -50,11 +50,11 @@
 // new D();
 
 // === /b.ts ===
-// import { C } from "./a";
+// import { [|C|] } from "./a";
 // new [|C|]();
 
 // === /c.ts ===
-// import { C } from "./a";
+// import { [|C|] } from "./a";
 // class D extends C {
 //     constructor() {
 //         [|super|]();
@@ -86,11 +86,11 @@
 // new D();
 
 // === /b.ts ===
-// import { C } from "./a";
+// import { [|C|] } from "./a";
 // new [|C|]();
 
 // === /c.ts ===
-// import { C } from "./a";
+// import { [|C|] } from "./a";
 // class D extends C {
 //     constructor() {
 //         [|super|]();

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

@@ -6,7 +6,7 @@
 // export { [|B|] as [|B1|] } from "./f";
 
 // === /b.ts ===
-// import B, { B1 } from "./a";
+// import B, { [|B1|] } from "./a";
 // const d = new [|B|]("b");
 // const d1 = new [|B1|]("b1");
 

testdata/baselines/reference/fourslash/state/codeLensAcrossProjects.baseline

@@ -296,23 +296,23 @@ Config::
 
 // === Code Lenses ===
 // === /projects/container/compositeExec/index.ts ===
-// import { Pointable } from "../lib";
+// import { [|Pointable|] } from "../lib";
 // class Point2 implements [|Pointable|] {
 //   getX(): number {
 //     return 0;
 //   }
 // --- (line: 6) skipped ---
 
 // === /projects/container/exec/index.ts ===
-// import { Pointable } from "../lib";
+// import { [|Pointable|] } from "../lib";
 // class Point1 implements [|Pointable|] {
 //   getX(): number {
 //     return 0;
 //   }
 // --- (line: 6) skipped ---
 
 // === /projects/container/lib/bar.ts ===
-// import { Pointable } from "./index";
+// import { [|Pointable|] } from "./index";
 // class Point implements [|Pointable|] {
 //   getX(): number {
 //     return 0;
@@ -321,7 +321,7 @@ Config::
 
 // === /projects/container/lib/index.ts ===
 // 
-// export interface /*CODELENS: 3 references*/Pointable {
+// export interface /*CODELENS: 6 references*/Pointable {
 //   getX(): number;
 //   getY(): number;
 // }