Skip to content

Commit 5ca4c99

Browse files
committed
Merge branch 'master' into abstractConstructSignatures
# Conflicts: # src/compiler/diagnosticMessages.json
2 parents 58753bb + 575baf5 commit 5ca4c99

File tree

520 files changed

+13437
-1709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

520 files changed

+13437
-1709
lines changed

package-lock.json

Lines changed: 44 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/compiler/binder.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,14 @@ namespace ts {
174174
const binder = createBinder();
175175

176176
export function bindSourceFile(file: SourceFile, options: CompilerOptions) {
177+
tracing.begin(tracing.Phase.Bind, "bindSourceFile", { path: file.path });
177178
performance.mark("beforeBind");
178179
perfLogger.logStartBindFile("" + file.fileName);
179180
binder(file, options);
180181
perfLogger.logStopBindFile();
181182
performance.mark("afterBind");
182183
performance.measure("Bind", "beforeBind", "afterBind");
184+
tracing.end();
183185
}
184186

185187
function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
@@ -2806,9 +2808,9 @@ namespace ts {
28062808
return symbol;
28072809
});
28082810
if (symbol) {
2809-
const flags = isClassExpression(node.right) ?
2810-
SymbolFlags.Property | SymbolFlags.ExportValue | SymbolFlags.Class :
2811-
SymbolFlags.Property | SymbolFlags.ExportValue;
2811+
const isAlias = isAliasableExpression(node.right) && (isExportsIdentifier(node.left.expression) || isModuleExportsAccessExpression(node.left.expression));
2812+
const flags = isAlias ? SymbolFlags.Alias : SymbolFlags.Property | SymbolFlags.ExportValue;
2813+
setParent(node.left, node);
28122814
declareSymbol(symbol.exports!, symbol, node.left, flags, SymbolFlags.None);
28132815
}
28142816
}

0 commit comments

Comments
 (0)