Correct node used for isDefinition calculation (microsoft#48499)

amcasey · web-flow · commit 70585aa0c0e4 · 2022-03-31T12:18:12.000-07:00
It should be adjusted as in `getReferencedSymbolsForNode`.  The baseline changes show that it was incorrectly returning false at keywords preceding definitions.
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
@@ -206,9 +206,10 @@ namespace ts.FindAllReferences {
 
     export function findReferencedSymbols(program: Program, cancellationToken: CancellationToken, sourceFiles: readonly SourceFile[], sourceFile: SourceFile, position: number): ReferencedSymbol[] | undefined {
         const node = getTouchingPropertyName(sourceFile, position);
-        const referencedSymbols = Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, { use: FindReferencesUse.References });
+        const options = { use: FindReferencesUse.References };
+        const referencedSymbols = Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options);
         const checker = program.getTypeChecker();
-        const symbol = checker.getSymbolAtLocation(node);
+        const symbol = checker.getSymbolAtLocation(getAdjustedReferenceLocation(Core.getAdjustedNode(node, options)));
         return !referencedSymbols || !referencedSymbols.length ? undefined : mapDefined<SymbolAndEntries, ReferencedSymbol>(referencedSymbols, ({ definition, references }) =>
             // Only include referenced symbols that have a valid definition.
             definition && {
@@ -622,12 +623,7 @@ namespace ts.FindAllReferences {
     export namespace Core {
         /** Core find-all-references algorithm. Handles special cases before delegating to `getReferencedSymbolsForSymbol`. */
         export function getReferencedSymbolsForNode(position: number, node: Node, program: Program, sourceFiles: readonly SourceFile[], cancellationToken: CancellationToken, options: Options = {}, sourceFilesSet: ReadonlySet<string> = new Set(sourceFiles.map(f => f.fileName))): readonly SymbolAndEntries[] | undefined {
-            if (options.use === FindReferencesUse.References) {
-                node = getAdjustedReferenceLocation(node);
-            }
-            else if (options.use === FindReferencesUse.Rename) {
-                node = getAdjustedRenameLocation(node);
-            }
+            node = getAdjustedNode(node, options);
             if (isSourceFile(node)) {
                 const resolvedRef = GoToDefinition.getReferenceAtPosition(node, position, program);
                 if (!resolvedRef?.file) {
@@ -695,6 +691,16 @@ namespace ts.FindAllReferences {
             return mergeReferences(program, moduleReferences, references, moduleReferencesOfExportTarget);
         }
 
+        export function getAdjustedNode(node: Node, options: Options) {
+            if (options.use === FindReferencesUse.References) {
+                node = getAdjustedReferenceLocation(node);
+            }
+            else if (options.use === FindReferencesUse.Rename) {
+                node = getAdjustedRenameLocation(node);
+            }
+            return node;
+        }
+
         export function getReferencesForFileName(fileName: string, program: Program, sourceFiles: readonly SourceFile[], sourceFilesSet: ReadonlySet<string> = new Set(sourceFiles.map(f => f.fileName))): readonly Entry[] {
             const moduleSymbol = program.getSourceFile(fileName)?.symbol;
             if (moduleSymbol) {
diff --git a/tests/baselines/reference/findAllRefsExportEquals.baseline.jsonc b/tests/baselines/reference/findAllRefsExportEquals.baseline.jsonc
@@ -271,7 +271,7 @@
           "length": 16
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
diff --git a/tests/baselines/reference/findAllRefs_importType_exportEquals.baseline.jsonc b/tests/baselines/reference/findAllRefs_importType_exportEquals.baseline.jsonc
@@ -774,7 +774,7 @@
           "length": 16
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -787,7 +787,7 @@
           "length": 43
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
diff --git a/tests/baselines/reference/referencesForDeclarationKeywords.baseline.jsonc b/tests/baselines/reference/referencesForDeclarationKeywords.baseline.jsonc
@@ -132,7 +132,7 @@
           "length": 13
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -220,7 +220,7 @@
           "length": 25
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -329,7 +329,7 @@ undefined
           "length": 21
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -342,7 +342,7 @@ undefined
           "length": 11
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -440,7 +440,7 @@ undefined
           "length": 21
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -453,7 +453,7 @@ undefined
           "length": 11
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -523,7 +523,7 @@ undefined
           "length": 29
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -593,7 +593,7 @@ undefined
           "length": 13
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -703,7 +703,7 @@ undefined
           "length": 12
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -773,7 +773,7 @@ undefined
           "length": 10
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -843,7 +843,7 @@ undefined
           "length": 15
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -913,7 +913,7 @@ undefined
           "length": 12
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -1085,7 +1085,7 @@ undefined
           "length": 6
         },
         "isWriteAccess": false,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -1167,7 +1167,7 @@ undefined
           "length": 6
         },
         "isWriteAccess": false,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -1249,7 +1249,7 @@ undefined
           "length": 12
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
diff --git a/tests/baselines/reference/referencesForExpressionKeywords.baseline.jsonc b/tests/baselines/reference/referencesForExpressionKeywords.baseline.jsonc
@@ -57,7 +57,7 @@
           "length": 29
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -203,7 +203,7 @@
           "length": 29
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -349,7 +349,7 @@
           "length": 29
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -495,7 +495,7 @@
           "length": 29
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -641,7 +641,7 @@
           "length": 29
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -787,7 +787,7 @@
           "length": 29
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -933,7 +933,7 @@
           "length": 29
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -1079,7 +1079,7 @@
           "length": 29
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
@@ -1253,7 +1253,7 @@
           "length": 13
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       },
       {
         "textSpan": {
diff --git a/tests/baselines/reference/referencesForModifiers.baseline.jsonc b/tests/baselines/reference/referencesForModifiers.baseline.jsonc
@@ -54,7 +54,7 @@
           "length": 105
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -116,7 +116,7 @@
           "length": 105
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -206,7 +206,7 @@
           "length": 9
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -296,7 +296,7 @@
           "length": 11
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -386,7 +386,7 @@
           "length": 9
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -476,7 +476,7 @@
           "length": 12
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -566,7 +566,7 @@
           "length": 10
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -636,7 +636,7 @@
           "length": 16
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -730,7 +730,7 @@
           "length": 22
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
@@ -792,7 +792,7 @@
           "length": 26
         },
         "isWriteAccess": true,
-        "isDefinition": false
+        "isDefinition": true
       }
     ]
   }
diff --git a/tests/baselines/reference/referencesForStatementKeywords.baseline.jsonc b/tests/baselines/reference/referencesForStatementKeywords.baseline.jsonc
diff --git a/tests/baselines/reference/referencesForTypeKeywords.baseline.jsonc b/tests/baselines/reference/referencesForTypeKeywords.baseline.jsonc

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@`
`271`	`271`	`"length": 16`
`272`	`272`	`},`
`273`	`273`	`"isWriteAccess": true,`
`274`		`- "isDefinition": false`
	`274`	`+ "isDefinition": true`
`275`	`275`	`},`
`276`	`276`	`{`
`277`	`277`	`"textSpan": {`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@`
`132`	`132`	`"length": 13`
`133`	`133`	`},`
`134`	`134`	`"isWriteAccess": true,`
`135`		`- "isDefinition": false`
	`135`	`+ "isDefinition": true`
`136`	`136`	`},`
`137`	`137`	`{`
`138`	`138`	`"textSpan": {`
`@@ -220,7 +220,7 @@`
`220`	`220`	`"length": 25`
`221`	`221`	`},`
`222`	`222`	`"isWriteAccess": true,`
`223`		`- "isDefinition": false`
	`223`	`+ "isDefinition": true`
`224`	`224`	`},`
`225`	`225`	`{`
`226`	`226`	`"textSpan": {`
`@@ -329,7 +329,7 @@ undefined`
`329`	`329`	`"length": 21`
`330`	`330`	`},`
`331`	`331`	`"isWriteAccess": true,`
`332`		`- "isDefinition": false`
	`332`	`+ "isDefinition": true`
`333`	`333`	`},`
`334`	`334`	`{`
`335`	`335`	`"textSpan": {`
`@@ -342,7 +342,7 @@ undefined`
`342`	`342`	`"length": 11`
`343`	`343`	`},`
`344`	`344`	`"isWriteAccess": true,`
`345`		`- "isDefinition": false`
	`345`	`+ "isDefinition": true`
`346`	`346`	`}`
`347`	`347`	`]`
`348`	`348`	`}`
`@@ -440,7 +440,7 @@ undefined`
`440`	`440`	`"length": 21`
`441`	`441`	`},`
`442`	`442`	`"isWriteAccess": true,`
`443`		`- "isDefinition": false`
	`443`	`+ "isDefinition": true`
`444`	`444`	`},`
`445`	`445`	`{`
`446`	`446`	`"textSpan": {`
`@@ -453,7 +453,7 @@ undefined`
`453`	`453`	`"length": 11`
`454`	`454`	`},`
`455`	`455`	`"isWriteAccess": true,`
`456`		`- "isDefinition": false`
	`456`	`+ "isDefinition": true`
`457`	`457`	`}`
`458`	`458`	`]`
`459`	`459`	`}`
`@@ -523,7 +523,7 @@ undefined`
`523`	`523`	`"length": 29`
`524`	`524`	`},`
`525`	`525`	`"isWriteAccess": true,`
`526`		`- "isDefinition": false`
	`526`	`+ "isDefinition": true`
`527`	`527`	`}`
`528`	`528`	`]`
`529`	`529`	`}`
`@@ -593,7 +593,7 @@ undefined`
`593`	`593`	`"length": 13`
`594`	`594`	`},`
`595`	`595`	`"isWriteAccess": true,`
`596`		`- "isDefinition": false`
	`596`	`+ "isDefinition": true`
`597`	`597`	`},`
`598`	`598`	`{`
`599`	`599`	`"textSpan": {`
`@@ -703,7 +703,7 @@ undefined`
`703`	`703`	`"length": 12`
`704`	`704`	`},`
`705`	`705`	`"isWriteAccess": true,`
`706`		`- "isDefinition": false`
	`706`	`+ "isDefinition": true`
`707`	`707`	`}`
`708`	`708`	`]`
`709`	`709`	`}`
`@@ -773,7 +773,7 @@ undefined`
`773`	`773`	`"length": 10`
`774`	`774`	`},`
`775`	`775`	`"isWriteAccess": true,`
`776`		`- "isDefinition": false`
	`776`	`+ "isDefinition": true`
`777`	`777`	`}`
`778`	`778`	`]`
`779`	`779`	`}`
`@@ -843,7 +843,7 @@ undefined`
`843`	`843`	`"length": 15`
`844`	`844`	`},`
`845`	`845`	`"isWriteAccess": true,`
`846`		`- "isDefinition": false`
	`846`	`+ "isDefinition": true`
`847`	`847`	`}`
`848`	`848`	`]`
`849`	`849`	`}`
`@@ -913,7 +913,7 @@ undefined`
`913`	`913`	`"length": 12`
`914`	`914`	`},`
`915`	`915`	`"isWriteAccess": true,`
`916`		`- "isDefinition": false`
	`916`	`+ "isDefinition": true`
`917`	`917`	`}`
`918`	`918`	`]`
`919`	`919`	`}`
`@@ -1085,7 +1085,7 @@ undefined`
`1085`	`1085`	`"length": 6`
`1086`	`1086`	`},`
`1087`	`1087`	`"isWriteAccess": false,`
`1088`		`- "isDefinition": false`
	`1088`	`+ "isDefinition": true`
`1089`	`1089`	`}`
`1090`	`1090`	`]`
`1091`	`1091`	`}`
`@@ -1167,7 +1167,7 @@ undefined`
`1167`	`1167`	`"length": 6`
`1168`	`1168`	`},`
`1169`	`1169`	`"isWriteAccess": false,`
`1170`		`- "isDefinition": false`
	`1170`	`+ "isDefinition": true`
`1171`	`1171`	`}`
`1172`	`1172`	`]`
`1173`	`1173`	`}`
`@@ -1249,7 +1249,7 @@ undefined`
`1249`	`1249`	`"length": 12`
`1250`	`1250`	`},`
`1251`	`1251`	`"isWriteAccess": true,`
`1252`		`- "isDefinition": false`
	`1252`	`+ "isDefinition": true`
`1253`	`1253`	`}`
`1254`	`1254`	`]`
`1255`	`1255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`"length": 105`
`55`	`55`	`},`
`56`	`56`	`"isWriteAccess": true,`
`57`		`- "isDefinition": false`
	`57`	`+ "isDefinition": true`
`58`	`58`	`}`
`59`	`59`	`]`
`60`	`60`	`}`
`@@ -116,7 +116,7 @@`
`116`	`116`	`"length": 105`
`117`	`117`	`},`
`118`	`118`	`"isWriteAccess": true,`
`119`		`- "isDefinition": false`
	`119`	`+ "isDefinition": true`
`120`	`120`	`}`
`121`	`121`	`]`
`122`	`122`	`}`
`@@ -206,7 +206,7 @@`
`206`	`206`	`"length": 9`
`207`	`207`	`},`
`208`	`208`	`"isWriteAccess": true,`
`209`		`- "isDefinition": false`
	`209`	`+ "isDefinition": true`
`210`	`210`	`}`
`211`	`211`	`]`
`212`	`212`	`}`
`@@ -296,7 +296,7 @@`
`296`	`296`	`"length": 11`
`297`	`297`	`},`
`298`	`298`	`"isWriteAccess": true,`
`299`		`- "isDefinition": false`
	`299`	`+ "isDefinition": true`
`300`	`300`	`}`
`301`	`301`	`]`
`302`	`302`	`}`
`@@ -386,7 +386,7 @@`
`386`	`386`	`"length": 9`
`387`	`387`	`},`
`388`	`388`	`"isWriteAccess": true,`
`389`		`- "isDefinition": false`
	`389`	`+ "isDefinition": true`
`390`	`390`	`}`
`391`	`391`	`]`
`392`	`392`	`}`
`@@ -476,7 +476,7 @@`
`476`	`476`	`"length": 12`
`477`	`477`	`},`
`478`	`478`	`"isWriteAccess": true,`
`479`		`- "isDefinition": false`
	`479`	`+ "isDefinition": true`
`480`	`480`	`}`
`481`	`481`	`]`
`482`	`482`	`}`
`@@ -566,7 +566,7 @@`
`566`	`566`	`"length": 10`
`567`	`567`	`},`
`568`	`568`	`"isWriteAccess": true,`
`569`		`- "isDefinition": false`
	`569`	`+ "isDefinition": true`
`570`	`570`	`}`
`571`	`571`	`]`
`572`	`572`	`}`
`@@ -636,7 +636,7 @@`
`636`	`636`	`"length": 16`
`637`	`637`	`},`
`638`	`638`	`"isWriteAccess": true,`
`639`		`- "isDefinition": false`
	`639`	`+ "isDefinition": true`
`640`	`640`	`}`
`641`	`641`	`]`
`642`	`642`	`}`
`@@ -730,7 +730,7 @@`
`730`	`730`	`"length": 22`
`731`	`731`	`},`
`732`	`732`	`"isWriteAccess": true,`
`733`		`- "isDefinition": false`
	`733`	`+ "isDefinition": true`
`734`	`734`	`}`
`735`	`735`	`]`
`736`	`736`	`}`
`@@ -792,7 +792,7 @@`
`792`	`792`	`"length": 26`
`793`	`793`	`},`
`794`	`794`	`"isWriteAccess": true,`
`795`		`- "isDefinition": false`
	`795`	`+ "isDefinition": true`
`796`	`796`	`}`
`797`	`797`	`]`
`798`	`798`	`}`