Merge branch 'master' into exportEqualsMerged

microsoft · Mar 25, 2015 · 1c45b77 · 1c45b77
2 parents aa01dcd + baac6d8
commit 1c45b77
Show file tree

Hide file tree

Showing 28 changed files with 572 additions and 206 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -7,6 +7,15 @@ module ts {
 
     /* @internal */ export let checkTime = 0;
 
+    /* @internal */
+    export function getSymbolId(symbol: Symbol): number {
+        if (!symbol.id) {
+            symbol.id = nextSymbolId++;
+        }
+
+        return symbol.id;
+    }
+
     export function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker {
         let Symbol = objectAllocator.getSymbolConstructor();
         let Type = objectAllocator.getTypeConstructor();
@@ -250,8 +259,8 @@ module ts {
 
         function getSymbolLinks(symbol: Symbol): SymbolLinks {
             if (symbol.flags & SymbolFlags.Transient) return <TransientSymbol>symbol;
-            if (!symbol.id) symbol.id = nextSymbolId++;
-            return symbolLinks[symbol.id] || (symbolLinks[symbol.id] = {});
+            var id = getSymbolId(symbol);
+            return symbolLinks[id] || (symbolLinks[id] = {});
         }
 
         function getNodeLinks(node: Node): NodeLinks {

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -10,6 +10,22 @@ module ts {
     /** The version of the TypeScript compiler release */
     export let version = "1.5.0.0";
 
+    export function findConfigFile(searchPath: string): string {
+        var fileName = "tsconfig.json";
+        while (true) {
+            if (sys.fileExists(fileName)) {
+                return fileName;
+            }
+            var parentPath = getDirectoryPath(searchPath);
+            if (parentPath === searchPath) {
+                break;
+            }
+            searchPath = parentPath;
+            fileName = "../" + fileName;
+        }
+        return undefined;
+    }
+
     export function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost {
         let currentDirectory: string;
         let existingDirectories: Map<boolean> = {};

diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -132,23 +132,6 @@ module ts {
         return typeof JSON === "object" && typeof JSON.parse === "function";
     }
 
-    function findConfigFile(): string {
-        var searchPath = normalizePath(sys.getCurrentDirectory());
-        var fileName = "tsconfig.json";
-        while (true) {
-            if (sys.fileExists(fileName)) {
-                return fileName;
-            }
-            var parentPath = getDirectoryPath(searchPath);
-            if (parentPath === searchPath) {
-                break;
-            }
-            searchPath = parentPath;
-            fileName = "../" + fileName;
-        }
-        return undefined;
-    }
-
     export function executeCommandLine(args: string[]): void {
         var commandLine = parseCommandLine(args);
         var configFileName: string;                 // Configuration file name (if any)
@@ -198,7 +181,8 @@ module ts {
             }
         }
         else if (commandLine.fileNames.length === 0 && isJSONSupported()) {
-            configFileName = findConfigFile();
+            var searchPath = normalizePath(sys.getCurrentDirectory());
+            configFileName = findConfigFile(searchPath);
         }
 
         if (commandLine.fileNames.length === 0 && !configFileName) {

diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -330,6 +330,9 @@ module Harness.LanguageService {
         getReferencesAtPosition(fileName: string, position: number): ts.ReferenceEntry[] {
             return unwrapJSONCallResult(this.shim.getReferencesAtPosition(fileName, position));
         }
+        findReferences(fileName: string, position: number): ts.ReferencedSymbol[] {
+            return unwrapJSONCallResult(this.shim.findReferences(fileName, position));
+        }
         getOccurrencesAtPosition(fileName: string, position: number): ts.ReferenceEntry[] {
             return unwrapJSONCallResult(this.shim.getOccurrencesAtPosition(fileName, position));
         }

diff --git a/src/server/client.ts b/src/server/client.ts
@@ -300,6 +300,11 @@ module ts.server {
             });
         }
 
+        findReferences(fileName: string, position: number): ReferencedSymbol[]{
+            // Not yet implemented.
+            return [];
+        }
+
         getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[] {
             var lineOffset = this.positionToOneBasedLineOffset(fileName, position);
             var args: protocol.FileLocationRequestArgs = {