Addressing CR feedback.

unknown · unknown · commit c3624c9b24bf · 2014-07-21T11:31:37.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -6008,16 +6008,16 @@ module ts {
             return symbol.flags & SymbolFlags.ValueModule && symbol.declarations.length === 1 && symbol.declarations[0].kind === SyntaxKind.SourceFile;
         }
 
-        function isNodeParentedBy(node: Node, parent: Node): boolean {
+        function isNodeDescendentOf(node: Node, ancestor: Node): boolean {
             while (node) {
-                if (node === parent) return true;
+                if (node === ancestor) return true;
                 node = node.parent;
             }
             return false;
         }
 
         function isUniqueLocalName(name: string, container: Node): boolean {
-            for (var node = container; isNodeParentedBy(node, container); node = node.nextContainer) {
+            for (var node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
                 if (node.locals && hasProperty(node.locals, name) && node.locals[name].flags & (SymbolFlags.Value | SymbolFlags.ExportValue)) {
                     return false;
                 }

Original file line number	Diff line number	Diff line change
`@@ -6008,16 +6008,16 @@ module ts {`
`6008`	`6008`	`return symbol.flags & SymbolFlags.ValueModule && symbol.declarations.length === 1 && symbol.declarations[0].kind === SyntaxKind.SourceFile;`
`6009`	`6009`	`}`
`6010`	`6010`
`6011`		`- function isNodeParentedBy(node: Node, parent: Node): boolean {`
	`6011`	`+ function isNodeDescendentOf(node: Node, ancestor: Node): boolean {`
`6012`	`6012`	`while (node) {`
`6013`		`- if (node === parent) return true;`
	`6013`	`+ if (node === ancestor) return true;`
`6014`	`6014`	`node = node.parent;`
`6015`	`6015`	`}`
`6016`	`6016`	`return false;`
`6017`	`6017`	`}`
`6018`	`6018`
`6019`	`6019`	`function isUniqueLocalName(name: string, container: Node): boolean {`
`6020`		`- for (var node = container; isNodeParentedBy(node, container); node = node.nextContainer) {`
	`6020`	`+ for (var node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {`
`6021`	`6021`	`if (node.locals && hasProperty(node.locals, name) && node.locals[name].flags & (SymbolFlags.Value \| SymbolFlags.ExportValue)) {`
`6022`	`6022`	`return false;`
`6023`	`6023`	`}`