mirror of
https://github.com/microsoft/TypeScript.git
synced 2025-11-18 17:21:48 +00:00
Merge remote-tracking branch 'origin/master' into release-4.2
This commit is contained in:
+3
-3
@@ -106475,7 +106475,7 @@ var ts;
|
||||
var oldSourceFile = oldSourceFiles_1[_i];
|
||||
var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
|
||||
if (shouldCreateNewSourceFile || !newFile ||
|
||||
// old file wasnt redirect but new file is
|
||||
// old file wasn't redirect but new file is
|
||||
(oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
|
||||
host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
|
||||
}
|
||||
@@ -109591,7 +109591,7 @@ var ts;
|
||||
var newReferences;
|
||||
// if not using old state, every file is changed
|
||||
if (!useOldState ||
|
||||
// File wasnt present in old state
|
||||
// File wasn't present in old state
|
||||
!(oldInfo = oldState.fileInfos.get(sourceFilePath)) ||
|
||||
// versions dont match
|
||||
oldInfo.version !== info.version ||
|
||||
@@ -110743,7 +110743,7 @@ var ts;
|
||||
var resolvedModules = [];
|
||||
var compilerOptions = resolutionHost.getCompilationSettings();
|
||||
var hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
|
||||
// All the resolutions in this file are invalidated if this file wasnt resolved using same redirect
|
||||
// All the resolutions in this file are invalidated if this file wasn't resolved using same redirect
|
||||
var program = resolutionHost.getCurrentProgram();
|
||||
var oldRedirect = program && program.getResolvedProjectReferenceToRedirect(containingFile);
|
||||
var unmatchedRedirects = oldRedirect ?
|
||||
|
||||
Reference in New Issue
Block a user