Merge pull request microsoft#1496 from Microsoft/bindingContainers

CyrusNajmabadi · CyrusNajmabadi · commit 539300bc5a7e · 2014-12-15T18:26:19.000-08:00
Simplify how we set container.nextContainer now that we don't double recurse during binding.
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -227,23 +227,27 @@ module ts {
             if (symbolKind & SymbolFlags.HasLocals) {
                 node.locals = {};
             }
+
             var saveParent = parent;
             var saveContainer = container;
             var savedBlockScopeContainer = blockScopeContainer;
             parent = node;
             if (symbolKind & SymbolFlags.IsContainer) {
                 container = node;
-                // If container is not on container list, add it to the list
-                if (lastContainer !== container && !container.nextContainer) {
-                    if (lastContainer) {
-                        lastContainer.nextContainer = container;
-                    }
-                    lastContainer = container;
+                Debug.assert(container.nextContainer === undefined);
+
+                if (lastContainer) {
+                    Debug.assert(lastContainer.nextContainer === undefined);
+                    lastContainer.nextContainer = container;
                 }
+
+                lastContainer = container;
             }
+
             if (isBlockScopeContainer) {
                 blockScopeContainer = node;
             }
+
             forEachChild(node, bind);
             container = saveContainer;
             parent = saveParent;
