Implement getScope

src/services/services.ts

@@ -2163,7 +2163,7 @@ module ts {
             // Compute the meaning from the location and the symbol it references
             var searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), symbol.getDeclarations());
 
-            var scope = getSymbolScope(symbol, node);
+            var scope = getSymbolScope(symbol);
 
             if (scope) {
                 result = [];
@@ -2184,9 +2184,42 @@ module ts {
 
             return result;
 
-            function getSymbolScope(symbol: Symbol, node: Node): Node {
-                /// TODO: find the enclosing scope
-                return undefined;
+            function getSymbolScope(symbol: Symbol): Node {
+                // If this is private property or method, the scope is the containing class
+                if (symbol.getFlags() && (SymbolFlags.Property | SymbolFlags.Method)) {
+                    var privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined);
+                    if (privateDeclaration) {
+                        return privateDeclaration.parent;
+                    }
+                }
+
+                // if this symbol is visible from its parent container, e.g. exported, then bail out
+                if (symbol.parent) {
+                    return undefined;
+                }
+
+                var scope: Node = undefined;
+
+                var declarations = symbol.getDeclarations();
+                for (var i = 0, n = declarations.length; i < n; i++) {
+                    var container = getContainerNode(declarations[i]);
+
+                    if (scope && scope !== container) {
+                        // Diffrent declarations have diffrent containers, bail out
+                        return undefined;
+                    }
+
+                    if (container.kind === SyntaxKind.SourceFile && !isExternalModule(<SourceFile>container)) {
+                        // This is a global variable and not an external module, any declaration defined
+                        // withen this scope is visible outside the file
+                        return undefined;
+                    }
+
+                    // The search scope is the container node
+                    scope = container;
+                }
+
+                return scope;
             }
 
             function getPossibleSymbolReferencePositions(sourceFile: SourceFile, symbolName: string, start: number, end: number): number[] {

tests/cases/fourslash/referencesForGlobals.ts

@@ -1,32 +1,32 @@
-/// <reference path='fourslash.ts'/>
-
-// Global variable reference.
-
-// @Filename: referencesForGlobals_1.ts
-////var /*1*/global = 2;
-////
-////class foo {
-////    constructor (public global) { }
-////    public f(global) { }
-////    public f2(global) { }
-////}
-////
-////class bar {
-////    constructor () {
-////        var n = global;
-////
-////        var f = new foo('');
-////        f.global = '';
-////    }
-////}
-////
-////var k = global;
-
-// @Filename: referencesForGlobals_2.ts
-////var m = global;
-
+/// <reference path='fourslash.ts'/>
+
+// Global variable reference.
+
+// @Filename: referencesForGlobals_1.ts
+////var /*1*/global = 2;
+////
+////class foo {
+////    constructor (public global) { }
+////    public f(global) { }
+////    public f2(global) { }
+////}
+////
+////class bar {
+////    constructor () {
+////        var n = global;
+////
+////        var f = new foo('');
+////        f.global = '';
+////    }
+////}
+////
+////var k = global;
+
+// @Filename: referencesForGlobals_2.ts
+////var m = global;
+
 // this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
-
-goTo.marker("1");
+edit.insert('');
+
+goTo.marker("1");
 verify.referencesCountIs(4);

tests/cases/fourslash/referencesForGlobals2.ts

@@ -0,0 +1,17 @@
+/// <reference path='fourslash.ts'/>
+
+// Global class reference.
+
+// @Filename: referencesForGlobals_1.ts
+////class /*2*/globalClass {
+////    public f() { }
+////}
+
+// @Filename: referencesForGlobals_2.ts
+////var c = /*1*/globalClass();
+
+goTo.marker("1");
+verify.referencesCountIs(2);
+
+goTo.marker("2");
+verify.referencesCountIs(2);

tests/cases/fourslash/referencesForGlobals3.ts

@@ -0,0 +1,17 @@
+/// <reference path='fourslash.ts'/>
+
+// Global interface reference.
+
+// @Filename: referencesForGlobals_1.ts
+////interface /*2*/globalInterface {
+////     f();
+////}
+
+// @Filename: referencesForGlobals_2.ts
+////var i: /*1*/globalInterface;
+
+goTo.marker("1");
+verify.referencesCountIs(2);
+
+goTo.marker("2");
+verify.referencesCountIs(2);

tests/cases/fourslash/referencesForGlobals4.ts

@@ -0,0 +1,17 @@
+/// <reference path='fourslash.ts'/>
+
+// Global module reference.
+
+// @Filename: referencesForGlobals_1.ts
+////module /*2*/globalModule {
+////     export f() { };
+////}
+
+// @Filename: referencesForGlobals_2.ts
+////var m = /*1*/globalModule;
+
+goTo.marker("1");
+verify.referencesCountIs(2);
+
+goTo.marker("2");
+verify.referencesCountIs(2);

tests/cases/fourslash/referencesForGlobals5.ts

@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts'/>
+
+// Global module reference.
+
+// @Filename: referencesForGlobals_1.ts
+////module globalModule {
+////    export var x;
+////}
+////
+////import /*2*/globalAlias = globalModule;
+
+// @Filename: referencesForGlobals_2.ts
+////var m = /*1*/globalAlias;
+
+goTo.marker("1");
+verify.referencesCountIs(2);
+
+goTo.marker("2");
+verify.referencesCountIs(2);