merge with master

This commit is contained in:
Vladimir Matveev
2015-12-08 13:28:55 -08:00
parent 268e7c0d09
commit f3e4befc3e
12 changed files with 35 additions and 0 deletions

View File

@@ -15025,6 +15025,8 @@ namespace ts {
}
const hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined;
// if module has export assignment then 'resolveExternalModuleSymbol' will return resolved symbol for export assignment
// otherwise it will return moduleSymbol itself
moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
const symbolLinks = getSymbolLinks(moduleSymbol);