microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

getSemanticDocumentHighlights: don't fail...

Browse Source 
...when missing `program.redirectTargetsMap` info.  This assertion fails
in the added test case -- looks like there is no entry in
`program.redirectTargetsMap` when it comes from a file that is no in the
project.  So in this case don't follow the (missing) info, and instead
drop the highlight.

Fixes #33722.
This commit is contained in:
Eli Barzilay 2021-03-25 03:27:24 -04:00
parent 42b0e3c463
commit eb804a9706
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/documentHighlights.ts
View File

@ -32,9 +32,11 @@ namespace ts {
const referenceEntries = FindAllReferences.getReferenceEntriesForNode(position, node, program, sourceFilesToSearch, cancellationToken, /*options*/ undefined, sourceFilesSet);
if (!referenceEntries) return undefined;
const map = arrayToMultiMap(referenceEntries.map(FindAllReferences.toHighlightSpan), e => e.fileName, e => e.span);
return arrayFrom(map.entries(), ([fileName, highlightSpans]) => {
return mapDefined(arrayFrom(map.entries()), ([fileName, highlightSpans]) => {
if (!sourceFilesSet.has(fileName)) {
Debug.assert(program.redirectTargetsMap.has(fileName));
if (!program.redirectTargetsMap.has(fileName)) {
return undefined;
}
const redirectTarget = program.getSourceFile(fileName);
const redirect = find(sourceFilesToSearch, f => !!f.redirectInfo && f.redirectInfo.redirectTarget === redirectTarget)!;
fileName = redirect.fileName;

17
tests/cases/fourslash/documentHighlights_33722.ts Normal file
View File

@ -0,0 +1,17 @@
/// <reference path="fourslash.ts" />
// @Filename: /y.ts
////class Foo {
//// private foo() {}
////}
////
////const f = () => new Foo();
////export default f;
// @Filename: /x.ts
////import y from "./y";
////
////y().[|foo|]();
const [r] = test.ranges();
verify.documentHighlightsOf(r, [], { filesToSearch: ["/x.ts"] });