microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-25 02:50:59 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fixed es2015 imports from export=

Browse Source 
(cherry picked from commit 9e46c180b4)
This commit is contained in:
Bill Ticehurst
2016-02-25 17:06:31 -08:00
parent 4ec4ce814d
commit b760fc0ae0
6 changed files with 82 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/checker.ts
View File

@@ -964,8 +964,16 @@ namespace ts {
if (targetSymbol) {
const name = specifier.propertyName || specifier.name;
if (name.text) {
let symbolFromVariable: Symbol;
// First check if module was specified with "export=". If so, get the member from the resolved type
if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
const members = (getTypeOfSymbol(targetSymbol) as ResolvedType).members;
symbolFromVariable = members && members[name.text];
}
else {
symbolFromVariable = getPropertyOfVariable(targetSymbol, name.text);
}
const symbolFromModule = getExportOfModule(targetSymbol, name.text);
const symbolFromVariable = getPropertyOfVariable(targetSymbol, name.text);
const symbol = symbolFromModule && symbolFromVariable ?
combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
symbolFromModule || symbolFromVariable;