@@ -21387,28 +21387,28 @@ var ts;
2138721387 }
2138821388 var visitedSymbolTables = [];
2138921389 return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
21390- function getAccessibleSymbolChainFromSymbolTable(symbols) {
21390+ function getAccessibleSymbolChainFromSymbolTable(symbols, ignoreQualification ) {
2139121391 if (!ts.pushIfUnique(visitedSymbolTables, symbols)) {
2139221392 return undefined;
2139321393 }
21394- var result = trySymbolTable(symbols);
21394+ var result = trySymbolTable(symbols, ignoreQualification );
2139521395 visitedSymbolTables.pop();
2139621396 return result;
2139721397 }
2139821398 function canQualifySymbol(symbolFromSymbolTable, meaning) {
2139921399 return !needsQualification(symbolFromSymbolTable, enclosingDeclaration, meaning) ||
2140021400 !!getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning), useOnlyExternalAliasing);
2140121401 }
21402- function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol) {
21402+ function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol, ignoreQualification ) {
2140321403 return symbol === (resolvedAliasSymbol || symbolFromSymbolTable) &&
2140421404 !ts.some(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
21405- canQualifySymbol(symbolFromSymbolTable, meaning);
21405+ (ignoreQualification || canQualifySymbol(symbolFromSymbolTable, meaning) );
2140621406 }
2140721407 function isUMDExportSymbol(symbol) {
2140821408 return symbol && symbol.declarations && symbol.declarations[0] && ts.isNamespaceExportDeclaration(symbol.declarations[0]);
2140921409 }
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 )) {
2141221412 return [symbol];
2141321413 }
2141421414 return ts.forEachEntry(symbols, function (symbolFromSymbolTable) {
@@ -21417,11 +21417,11 @@ var ts;
2141721417 && !(isUMDExportSymbol(symbolFromSymbolTable) && enclosingDeclaration && ts.isExternalModule(ts.getSourceFileOfNode(enclosingDeclaration)))
2141821418 && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))) {
2141921419 var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
21420- if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol)) {
21420+ if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification )) {
2142121421 return [symbolFromSymbolTable];
2142221422 }
2142321423 var candidateTable = getExportsOfSymbol(resolvedImportedSymbol);
21424- var accessibleSymbolsFromExports = candidateTable && getAccessibleSymbolChainFromSymbolTable(candidateTable);
21424+ var accessibleSymbolsFromExports = candidateTable && getAccessibleSymbolChainFromSymbolTable(candidateTable, true );
2142521425 if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
2142621426 return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
2142721427 }
@@ -47176,7 +47176,7 @@ var ts;
4717647176 return ts.visitEachChild(node, visitor, context);
4717747177 }
4717847178 function visitLabeledStatement(node) {
47179- if (enclosingFunctionFlags & 2 && enclosingFunctionFlags & 1 ) {
47179+ if (enclosingFunctionFlags & 2) {
4718047180 var statement = ts.unwrapInnermostStatementOfLabel(node);
4718147181 if (statement.kind === 217 && statement.awaitModifier) {
4718247182 return visitForOfStatement(statement, node);
@@ -61711,13 +61711,13 @@ var ts;
6171161711 var host = system;
6171261712 host.onConfigFileDiagnostic = reportDiagnostic;
6171361713 host.onUnRecoverableConfigFileDiagnostic = function (diagnostic) { return reportUnrecoverableDiagnostic(ts.sys, reportDiagnostic, diagnostic); };
61714- var result = parseConfigFile (configFileName, optionsToExtend, host);
61714+ var result = getParsedCommandLineOfConfigFile (configFileName, optionsToExtend, host);
6171561715 host.onConfigFileDiagnostic = undefined;
6171661716 host.onUnRecoverableConfigFileDiagnostic = undefined;
6171761717 return result;
6171861718 }
6171961719 ts.parseConfigFileWithSystem = parseConfigFileWithSystem;
61720- function parseConfigFile (configFileName, optionsToExtend, host) {
61720+ function getParsedCommandLineOfConfigFile (configFileName, optionsToExtend, host) {
6172161721 var configFileText;
6172261722 try {
6172361723 configFileText = host.readFile(configFileName);
@@ -61739,7 +61739,7 @@ var ts;
6173961739 configParseResult.errors.forEach(function (diagnostic) { return host.onConfigFileDiagnostic(diagnostic); });
6174061740 return configParseResult;
6174161741 }
61742- ts.parseConfigFile = parseConfigFile ;
61742+ ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile ;
6174361743 function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName) {
6174461744 var diagnostics = program.getSyntacticDiagnostics().slice();
6174561745 var reportSemanticDiagnostics = false;
@@ -62146,7 +62146,7 @@ var ts;
6214662146 watchConfigFileWildCardDirectories();
6214762147 }
6214862148 function parseConfigFile() {
62149- var configParseResult = ts.parseConfigFile (configFileName, optionsToExtendForConfigFile, parseConfigFileHost);
62149+ var configParseResult = ts.getParsedCommandLineOfConfigFile (configFileName, optionsToExtendForConfigFile, parseConfigFileHost);
6215062150 rootFileNames = configParseResult.fileNames;
6215162151 compilerOptions = configParseResult.options;
6215262152 configFileSpecs = configParseResult.configFileSpecs;
0 commit comments