Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respond to CR

Browse Source
This commit is contained in:
Ben Lichtman
2020-01-24 16:23:54 -08:00
parent 8c18c7683a
commit e479a9f679
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/project.ts
+14 -22
View File
@@ -805,17 +805,9 @@ namespace ts.server {
/* @internal */
getFileNamesWithRedirectInfo(includeProjectReferenceRedirectInfo: boolean) {
const fileNames = this.getFileNames();
if (includeProjectReferenceRedirectInfo) {
return fileNames.map((fileName): protocol.FileWithProjectReferenceRedirectInfo => ({
fileName,
isSourceOfProjectReferenceRedirect: this.isSourceOfProjectReferenceRedirect(fileName)
}));
}
return fileNames.map((fileName): protocol.FileWithProjectReferenceRedirectInfo => ({
return this.getFileNames().map((fileName): protocol.FileWithProjectReferenceRedirectInfo => ({
fileName,
isSourceOfProjectReferenceRedirect: false
isSourceOfProjectReferenceRedirect: includeProjectReferenceRedirectInfo && this.isSourceOfProjectReferenceRedirect(fileName)
}));
}
@@ -1319,9 +1311,9 @@ namespace ts.server {
getChangesSinceVersion(lastKnownVersion?: number, includeProjectReferenceRedirectInfo?: boolean): ProjectFilesWithTSDiagnostics {
const includeProjectReferenceRedirectInfoIfRequested =
includeProjectReferenceRedirectInfo
? (files: Map<boolean>) => arrayFrom(files.keys(), (fileName: string): protocol.FileWithProjectReferenceRedirectInfo => ({
? (files: Map<boolean>) => arrayFrom(files.entries(), ([fileName, isSourceOfProjectReferenceRedirect]): protocol.FileWithProjectReferenceRedirectInfo => ({
fileName,
isSourceOfProjectReferenceRedirect: files.get(fileName)! // fileName guaranteed to be in files
isSourceOfProjectReferenceRedirect
}))
: (files: Map<boolean>) => arrayFrom(files.keys());
@@ -1364,20 +1356,20 @@ namespace ts.server {
const updated: string[] = updatedFileNames ? arrayFrom(updatedFileNames.keys()) : [];
const updatedRedirects: protocol.FileWithProjectReferenceRedirectInfo[] = [];
forEachKey(currentFiles, id => {
if (!lastReportedFileNames.has(id)) {
added.set(id, currentFiles.get(id)!); // id guaranteed to be in currentFiles
forEachEntry(currentFiles, (isSourceOfProjectReferenceRedirect, fileName) => {
if (!lastReportedFileNames.has(fileName)) {
added.set(fileName, isSourceOfProjectReferenceRedirect);
}
else if (includeProjectReferenceRedirectInfo && lastReportedFileNames.get(id) !== currentFiles.get(id)){
else if (includeProjectReferenceRedirectInfo && isSourceOfProjectReferenceRedirect !== lastReportedFileNames.get(fileName)){
updatedRedirects.push({
fileName: id,
isSourceOfProjectReferenceRedirect: currentFiles.get(id)! // id guaranteed to be in currentFiles
fileName,
isSourceOfProjectReferenceRedirect
});
}
});
forEachKey(lastReportedFileNames, id => {
if (!currentFiles.has(id)) {
removed.set(id, lastReportedFileNames.get(id)!); // id guaranteed to be in lastReportedFileNames
forEachEntry(lastReportedFileNames, (isSourceOfProjectReferenceRedirect, fileName) => {
if (!currentFiles.has(fileName)) {
removed.set(fileName, isSourceOfProjectReferenceRedirect);
}
});
this.lastReportedFileNames = currentFiles;
@@ -1407,7 +1399,7 @@ namespace ts.server {
}));
const allFiles = projectFileNames.concat(externalFiles);
this.lastReportedFileNames = arrayToMap(
projectFileNames.concat(externalFiles),
allFiles,
info => info.fileName,
info => info.isSourceOfProjectReferenceRedirect
);