microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-30 01:04:49 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

address PR feedback

Browse Source
This commit is contained in:
Vladimir Matveev
2015-12-23 10:01:36 -08:00
parent 4a963a26c3
commit 3e1bc01a86
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/binder.ts
View File

@@ -109,7 +109,6 @@ namespace ts {
let blockScopeContainer: Node;
let lastContainer: Node;
let seenThisKeyword: boolean;
let isSourceFileExternalModule: boolean;
// state used by reachability checks
let hasExplicitReturn: boolean;
@@ -130,7 +129,7 @@ namespace ts {
function bindSourceFile(f: SourceFile, opts: CompilerOptions) {
file = f;
options = opts;
isSourceFileExternalModule = inStrictMode = !!file.externalModuleIndicator;
inStrictMode = !!file.externalModuleIndicator;
classifiableNames = {};
Symbol = objectAllocator.getSymbolConstructor();
@@ -354,7 +353,7 @@ namespace ts {
// NOTE: Nested ambient modules always should go to to 'locals' table to prevent their automatic merge
// during global merging in the checker. Why? The only case when ambient module is permitted inside another module is module augmentation
// and this case is specially handled. Module augmentations should only be merged with original module definition
// and should never be merged directly with other augmentation and the latter case would be possible is automatic merge is allowed.
// and should never be merged directly with other augmentation, and the latter case would be possible if automatic merge is allowed.
if (!isAmbientModule(node) && (hasExportModifier || container.flags & NodeFlags.ExportContext)) {
const exportKind =
(symbolFlags & SymbolFlags.Value ? SymbolFlags.ExportValue : 0) |

2
src/compiler/checker.ts
View File

@@ -387,7 +387,7 @@ namespace ts {
if (!mainModule) {
return;
}
// is module symbol is already merged - it is safe to use it.
// if module symbol has already been merged - it is safe to use it.
// otherwise clone it
mainModule = mainModule.flags & SymbolFlags.Merged ? mainModule : cloneSymbol(mainModule);
mergeSymbol(mainModule, moduleAugmentation.symbol);