@@ -21387,28 +21387,28 @@ var ts;
21387
21387
}
21388
21388
var visitedSymbolTables = [];
21389
21389
return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
21390
- function getAccessibleSymbolChainFromSymbolTable(symbols) {
21390
+ function getAccessibleSymbolChainFromSymbolTable(symbols, ignoreQualification ) {
21391
21391
if (!ts.pushIfUnique(visitedSymbolTables, symbols)) {
21392
21392
return undefined;
21393
21393
}
21394
- var result = trySymbolTable(symbols);
21394
+ var result = trySymbolTable(symbols, ignoreQualification );
21395
21395
visitedSymbolTables.pop();
21396
21396
return result;
21397
21397
}
21398
21398
function canQualifySymbol(symbolFromSymbolTable, meaning) {
21399
21399
return !needsQualification(symbolFromSymbolTable, enclosingDeclaration, meaning) ||
21400
21400
!!getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning), useOnlyExternalAliasing);
21401
21401
}
21402
- function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol) {
21402
+ function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol, ignoreQualification ) {
21403
21403
return symbol === (resolvedAliasSymbol || symbolFromSymbolTable) &&
21404
21404
!ts.some(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
21405
- canQualifySymbol(symbolFromSymbolTable, meaning);
21405
+ (ignoreQualification || canQualifySymbol(symbolFromSymbolTable, meaning) );
21406
21406
}
21407
21407
function isUMDExportSymbol(symbol) {
21408
21408
return symbol && symbol.declarations && symbol.declarations[0] && ts.isNamespaceExportDeclaration(symbol.declarations[0]);
21409
21409
}
21410
- function trySymbolTable(symbols) {
21411
- if (isAccessible(symbols.get(symbol.escapedName))) {
21410
+ function trySymbolTable(symbols, ignoreQualification ) {
21411
+ if (isAccessible(symbols.get(symbol.escapedName), undefined, ignoreQualification )) {
21412
21412
return [symbol];
21413
21413
}
21414
21414
return ts.forEachEntry(symbols, function (symbolFromSymbolTable) {
@@ -21417,11 +21417,11 @@ var ts;
21417
21417
&& !(isUMDExportSymbol(symbolFromSymbolTable) && enclosingDeclaration && ts.isExternalModule(ts.getSourceFileOfNode(enclosingDeclaration)))
21418
21418
&& (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))) {
21419
21419
var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
21420
- if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol)) {
21420
+ if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification )) {
21421
21421
return [symbolFromSymbolTable];
21422
21422
}
21423
21423
var candidateTable = getExportsOfSymbol(resolvedImportedSymbol);
21424
- var accessibleSymbolsFromExports = candidateTable && getAccessibleSymbolChainFromSymbolTable(candidateTable);
21424
+ var accessibleSymbolsFromExports = candidateTable && getAccessibleSymbolChainFromSymbolTable(candidateTable, true );
21425
21425
if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
21426
21426
return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
21427
21427
}
@@ -47176,7 +47176,7 @@ var ts;
47176
47176
return ts.visitEachChild(node, visitor, context);
47177
47177
}
47178
47178
function visitLabeledStatement(node) {
47179
- if (enclosingFunctionFlags & 2 && enclosingFunctionFlags & 1 ) {
47179
+ if (enclosingFunctionFlags & 2) {
47180
47180
var statement = ts.unwrapInnermostStatementOfLabel(node);
47181
47181
if (statement.kind === 217 && statement.awaitModifier) {
47182
47182
return visitForOfStatement(statement, node);
@@ -61711,13 +61711,13 @@ var ts;
61711
61711
var host = system;
61712
61712
host.onConfigFileDiagnostic = reportDiagnostic;
61713
61713
host.onUnRecoverableConfigFileDiagnostic = function (diagnostic) { return reportUnrecoverableDiagnostic(ts.sys, reportDiagnostic, diagnostic); };
61714
- var result = parseConfigFile (configFileName, optionsToExtend, host);
61714
+ var result = getParsedCommandLineOfConfigFile (configFileName, optionsToExtend, host);
61715
61715
host.onConfigFileDiagnostic = undefined;
61716
61716
host.onUnRecoverableConfigFileDiagnostic = undefined;
61717
61717
return result;
61718
61718
}
61719
61719
ts.parseConfigFileWithSystem = parseConfigFileWithSystem;
61720
- function parseConfigFile (configFileName, optionsToExtend, host) {
61720
+ function getParsedCommandLineOfConfigFile (configFileName, optionsToExtend, host) {
61721
61721
var configFileText;
61722
61722
try {
61723
61723
configFileText = host.readFile(configFileName);
@@ -61739,7 +61739,7 @@ var ts;
61739
61739
configParseResult.errors.forEach(function (diagnostic) { return host.onConfigFileDiagnostic(diagnostic); });
61740
61740
return configParseResult;
61741
61741
}
61742
- ts.parseConfigFile = parseConfigFile ;
61742
+ ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile ;
61743
61743
function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName) {
61744
61744
var diagnostics = program.getSyntacticDiagnostics().slice();
61745
61745
var reportSemanticDiagnostics = false;
@@ -62146,7 +62146,7 @@ var ts;
62146
62146
watchConfigFileWildCardDirectories();
62147
62147
}
62148
62148
function parseConfigFile() {
62149
- var configParseResult = ts.parseConfigFile (configFileName, optionsToExtendForConfigFile, parseConfigFileHost);
62149
+ var configParseResult = ts.getParsedCommandLineOfConfigFile (configFileName, optionsToExtendForConfigFile, parseConfigFileHost);
62150
62150
rootFileNames = configParseResult.fileNames;
62151
62151
compilerOptions = configParseResult.options;
62152
62152
configFileSpecs = configParseResult.configFileSpecs;
0 commit comments