Prefer getValidSourceFile over Debug.assertDefined(program.getSourceFile(*)) (microsoft#28242)

Andy · web-flow · commit 3458360322a2 · 2018-10-30T16:38:52.000-07:00
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1533,7 +1533,7 @@ namespace ts {
             const normalizedFileName = normalizePath(fileName);
             Debug.assert(filesToSearch.some(f => normalizePath(f) === normalizedFileName));
             synchronizeHostData();
-            const sourceFilesToSearch = map(filesToSearch, f => Debug.assertDefined(program.getSourceFile(f)));
+            const sourceFilesToSearch = filesToSearch.map(getValidSourceFile);
             const sourceFile = getValidSourceFile(fileName);
             return DocumentHighlights.getDocumentHighlights(program, cancellationToken, sourceFile, position, sourceFilesToSearch);
         }

Original file line number	Diff line number	Diff line change
`@@ -1533,7 +1533,7 @@ namespace ts {`
`1533`	`1533`	`const normalizedFileName = normalizePath(fileName);`
`1534`	`1534`	`Debug.assert(filesToSearch.some(f => normalizePath(f) === normalizedFileName));`
`1535`	`1535`	`synchronizeHostData();`
`1536`		`- const sourceFilesToSearch = map(filesToSearch, f => Debug.assertDefined(program.getSourceFile(f)));`
	`1536`	`+ const sourceFilesToSearch = filesToSearch.map(getValidSourceFile);`
`1537`	`1537`	`const sourceFile = getValidSourceFile(fileName);`
`1538`	`1538`	`return DocumentHighlights.getDocumentHighlights(program, cancellationToken, sourceFile, position, sourceFilesToSearch);`
`1539`	`1539`	`}`