From 55d002117ce6f56eae4a8baee64a43708a58e2d6 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 13 Aug 2014 16:03:04 -0700
Subject: [PATCH] support getReferences on object literals

---
 src/compiler/checker.ts                           |  9 ++++++++-
 src/compiler/types.ts                             |  1 +
 src/services/services.ts                          | 15 ++++++++++-----
 .../referencesForObjectLiteralProperties.ts       | 15 +++++++++++++++
 .../referencesForPropertiesOfGenericType.ts       | 15 +++++++++++++++
 5 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 tests/cases/fourslash/referencesForObjectLiteralProperties.ts
 create mode 100644 tests/cases/fourslash/referencesForPropertiesOfGenericType.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3a804815e92..a852bfc8263 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -51,7 +51,8 @@ module ts {
             getTypeOfExpression: getTypeOfExpression,
             typeToString: typeToString,
             symbolToString: symbolToString,
-            getAugmentedPropertiesOfApparentType: getAugmentedPropertiesOfApparentType
+            getAugmentedPropertiesOfApparentType: getAugmentedPropertiesOfApparentType,
+            getRootSymbol: getRootSymbol
         };
 
         var undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined");
@@ -3118,6 +3119,7 @@ module ts {
                         symbol.declarations = p.declarations;
                         symbol.parent = p.parent;
                         symbol.type = widenedTypes[index++];
+                        symbol.target = p;
                         if (p.valueDeclaration) symbol.valueDeclaration = p.valueDeclaration;
                         members[symbol.name] = symbol;
                     });
@@ -3790,6 +3792,7 @@ module ts {
                         prop.parent = member.parent;
                         if (member.valueDeclaration) prop.valueDeclaration = member.valueDeclaration;
                         prop.type = type;
+                        prop.target = member;
                         member = prop;
                     }
                     else {
@@ -6672,6 +6675,10 @@ module ts {
             }
         }
 
+        function getRootSymbol(symbol: Symbol) {
+            return (symbol.flags & SymbolFlags.Transient) ? getSymbolLinks(symbol).target : symbol;
+        }
+
         // Emitter support
 
         function isExternalModuleSymbol(symbol: Symbol): boolean {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index ff1d344d733..a14955f56db 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -609,6 +609,7 @@ module ts {
         typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
         symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string;
         getAugmentedPropertiesOfApparentType(type: Type): Symbol[];
+        getRootSymbol(symbol:Symbol): Symbol;
     }
 
     export interface TextWriter {
diff --git a/src/services/services.ts b/src/services/services.ts
index 1974ece9e49..5054407dd7d 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2123,7 +2123,7 @@ module ts {
                 return getLabelReferencesInNode(labelScope, labelName);
             }
 
-            var symbol = typeChecker.getSymbolInfo(node);
+            var symbol = typeInfoResolver.getSymbolInfo(node);
 
             // Could not find a symbol e.g. unknown identifier
             if (!symbol) {
@@ -2253,7 +2253,7 @@ module ts {
                             return;
                         }
 
-                        var symbol = typeChecker.getSymbolInfo(node);
+                        var symbol = typeInfoResolver.getSymbolInfo(node);
 
                         // Could not find a symbol e.g. node is string or number keyword,
                         // or the symbol was an internal symbol and does not have a declaration e.g. undefined symbol
@@ -2261,14 +2261,14 @@ module ts {
                             return;
                         }
 
-                        if (compareSymbolsForLexicalIdentity(searchSymbol, symbol)) {
+                        if (compareSymbolsForLexicalIdentity(searchSymbol, symbol, node)) {
                             result.push(getReferenceEntry(node));
                         }
                     });
                 }
             }
 
-            function compareSymbolsForLexicalIdentity(firstSymbol: Symbol, secondSymbol: Symbol): boolean {
+            function compareSymbolsForLexicalIdentity(searchSymbol: Symbol, symbol: Symbol, node: Node): boolean {
                 //// Unwrap modules so that we're always referring to the variable.
                 //if (!firstSymbol.isAlias() && firstSymbol.isContainer()) {
                 //    var containerForFirstSymbol = (<TypeScript.PullContainerSymbol>firstSymbol);
@@ -2384,7 +2384,12 @@ module ts {
                 //    }
                 //}
 
-                return firstSymbol === secondSymbol;
+                var searchSymbolTarget = typeInfoResolver.getRootSymbol(searchSymbol);
+                var symbolTarget = typeInfoResolver.getRootSymbol(symbol);
+
+                if (searchSymbolTarget === symbolTarget) {
+                    return true;
+                }
             }
 
             function getReferenceEntry(node: Node): ReferenceEntry {
diff --git a/tests/cases/fourslash/referencesForObjectLiteralProperties.ts b/tests/cases/fourslash/referencesForObjectLiteralProperties.ts
new file mode 100644
index 00000000000..c606e2f13f3
--- /dev/null
+++ b/tests/cases/fourslash/referencesForObjectLiteralProperties.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+
+// References to an object literal property
+
+////var x = { /*1*/add: 0, b: "string" };
+////x["add"];
+////x./*2*/add;
+////var y = x;
+////y.add;
+
+goTo.marker("1");
+verify.referencesCountIs(4);
+
+goTo.marker("2");
+verify.referencesCountIs(4);
\ No newline at end of file
diff --git a/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts b/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts
new file mode 100644
index 00000000000..e5428df0d5d
--- /dev/null
+++ b/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+
+////interface IFoo<T> {
+////    /*1*/doSomething(v: T): T;
+////}
+////
+////var x: IFoo<string>;
+////x.doSomething("ss");
+////
+////var y: IFoo<number>;
+////y.doSomething(12);
+
+
+goTo.marker("1");
+verify.referencesCountIs(3);
\ No newline at end of file