Addressing CR feedback

ahejlsberg · ahejlsberg · commit 7b67ac243cb0 · 2015-06-09T06:48:20.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -11790,10 +11790,14 @@ module ts {
             let symbol = getReferencedValueSymbol(node);
             if (symbol) {
                 if (symbol.flags & SymbolFlags.ExportValue) {
+                    // If we reference an exported entity within the same module declaration, then whether
+                    // we prefix depends on the kind of entity. SymbolFlags.ExportHasLocal encompasses all the
+                    // kinds that we do NOT prefix.
                     let exportSymbol = getMergedSymbol(symbol.exportSymbol);
-                    if (!(exportSymbol.flags & SymbolFlags.ExportHasLocal)) {
-                        symbol = exportSymbol;
+                    if (exportSymbol.flags & SymbolFlags.ExportHasLocal) {
+                        return undefined;
                     }
+                    symbol = exportSymbol;
                 }
                 let parentSymbol = getParentOfSymbol(symbol);
                 if (parentSymbol) {
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -2841,6 +2841,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
                 }
 
                 function createPropertyAccessForDestructuringProperty(object: Expression, propName: Identifier | LiteralExpression): Expression {
+                    // We create a synthetic copy of the identifier in order to avoid the rewriting that might
+                    // otherwise occur when the identifier is emitted.
                     let syntheticName = <Identifier | LiteralExpression>createSynthesizedNode(propName.kind);
                     syntheticName.text = propName.text;
                     if (syntheticName.kind !== SyntaxKind.Identifier) {

Original file line number	Diff line number	Diff line change
`@@ -2841,6 +2841,8 @@ var __param = (this && this.__param) \|\| function (paramIndex, decorator) {`
`2841`	`2841`	`}`
`2842`	`2842`
`2843`	`2843`	`function createPropertyAccessForDestructuringProperty(object: Expression, propName: Identifier \| LiteralExpression): Expression {`
	`2844`	`+ // We create a synthetic copy of the identifier in order to avoid the rewriting that might`
	`2845`	`+ // otherwise occur when the identifier is emitted.`
`2844`	`2846`	`let syntheticName = <Identifier \| LiteralExpression>createSynthesizedNode(propName.kind);`
`2845`	`2847`	`syntheticName.text = propName.text;`
`2846`	`2848`	`if (syntheticName.kind !== SyntaxKind.Identifier) {`