Merge pull request #8266 from Microsoft/FixGlobalTSServerOprations

mhegazy · mhegazy · commit 4039146163ab · 2016-04-23T14:30:59.000-07:00
Fix global ts server operations in configured projects
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -747,7 +747,7 @@ namespace FourSlash {
             }
 
             const missingItem = { fileName: fileName, start: start, end: end, isWriteAccess: isWriteAccess };
-            this.raiseError(`verifyReferencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(references)})`);
+            this.raiseError(`verifyReferencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(references, undefined, 2)})`);
         }
 
         public verifyReferencesCountIs(count: number, localFilesOnly = true) {
@@ -801,7 +801,7 @@ namespace FourSlash {
 
         private testDiagnostics(expected: string, diagnostics: ts.Diagnostic[]) {
             const realized = ts.realizeDiagnostics(diagnostics, "\r\n");
-            const actual = JSON.stringify(realized, null, "  ");
+            const actual = JSON.stringify(realized, undefined, 2);
             assert.equal(actual, expected);
         }
 
@@ -876,7 +876,7 @@ namespace FourSlash {
                 }
 
                 if (ranges.length !== references.length) {
-                    this.raiseError("Rename location count does not match result.\n\nExpected: " + JSON.stringify(ranges) + "\n\nActual:" + JSON.stringify(references));
+                    this.raiseError("Rename location count does not match result.\n\nExpected: " + JSON.stringify(ranges, undefined, 2) + "\n\nActual:" + JSON.stringify(references, undefined, 2));
                 }
 
                 ranges = ranges.sort((r1, r2) => r1.start - r2.start);
@@ -889,7 +889,7 @@ namespace FourSlash {
                     if (reference.textSpan.start !== range.start ||
                         ts.textSpanEnd(reference.textSpan) !== range.end) {
 
-                        this.raiseError("Rename location results do not match.\n\nExpected: " + JSON.stringify(ranges) + "\n\nActual:" + JSON.stringify(references));
+                        this.raiseError("Rename location results do not match.\n\nExpected: " + JSON.stringify(ranges, undefined, 2) + "\n\nActual:" + JSON.stringify(references, undefined, 2));
                     }
                 }
             }
@@ -973,7 +973,7 @@ namespace FourSlash {
             }
             else {
                 if (actual) {
-                    this.raiseError(`Expected no signature help, but got "${JSON.stringify(actual)}"`);
+                    this.raiseError(`Expected no signature help, but got "${JSON.stringify(actual, undefined, 2)}"`);
                 }
             }
         }
@@ -1185,7 +1185,7 @@ namespace FourSlash {
 
         public printCurrentParameterHelp() {
             const help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);
-            Harness.IO.log(JSON.stringify(help));
+            Harness.IO.log(JSON.stringify(help, undefined, 2));
         }
 
         public printCurrentQuickInfo() {
@@ -1227,7 +1227,7 @@ namespace FourSlash {
 
         public printCurrentSignatureHelp() {
             const sigHelp = this.getActiveSignatureHelpItem();
-            Harness.IO.log(JSON.stringify(sigHelp));
+            Harness.IO.log(JSON.stringify(sigHelp, undefined, 2));
         }
 
         public printMemberListMembers() {
@@ -1257,7 +1257,7 @@ namespace FourSlash {
         public printReferences() {
             const references = this.getReferencesAtCaret();
             ts.forEach(references, entry => {
-                Harness.IO.log(JSON.stringify(entry));
+                Harness.IO.log(JSON.stringify(entry, undefined, 2));
             });
         }
 
@@ -1748,8 +1748,8 @@ namespace FourSlash {
 
             function jsonMismatchString() {
                 return Harness.IO.newLine() +
-                    "expected: '" + Harness.IO.newLine() + JSON.stringify(expected, (k, v) => v, 2) + "'" + Harness.IO.newLine() +
-                    "actual:   '" + Harness.IO.newLine() + JSON.stringify(actual, (k, v) => v, 2) + "'";
+                    "expected: '" + Harness.IO.newLine() + JSON.stringify(expected, undefined, 2) + "'" + Harness.IO.newLine() +
+                    "actual:   '" + Harness.IO.newLine() + JSON.stringify(actual, undefined, 2) + "'";
             }
         }
 
@@ -1964,7 +1964,7 @@ namespace FourSlash {
             // if there was an explicit match kind specified, then it should be validated.
             if (matchKind !== undefined) {
                 const missingItem = { name: name, kind: kind, searchValue: searchValue, matchKind: matchKind, fileName: fileName, parentName: parentName };
-                this.raiseError(`verifyNavigationItemsListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(items)})`);
+                this.raiseError(`verifyNavigationItemsListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(items, undefined, 2)})`);
             }
         }
 
@@ -2001,7 +2001,7 @@ namespace FourSlash {
             }
 
             const missingItem = { name: name, kind: kind };
-            this.raiseError(`verifyGetScriptLexicalStructureListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(items, null, " ")})`);
+            this.raiseError(`verifyGetScriptLexicalStructureListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(items, undefined, 2)})`);
         }
 
         private navigationBarItemsContains(items: ts.NavigationBarItem[], name: string, kind: string) {
@@ -2066,7 +2066,7 @@ namespace FourSlash {
             }
 
             const missingItem = { fileName: fileName, start: start, end: end, isWriteAccess: isWriteAccess };
-            this.raiseError(`verifyOccurrencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(occurrences)})`);
+            this.raiseError(`verifyOccurrencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(occurrences, undefined, 2)})`);
         }
 
         public verifyOccurrencesAtPositionListCount(expectedCount: number) {
@@ -2105,7 +2105,7 @@ namespace FourSlash {
             }
 
             const missingItem = { fileName: fileName, start: start, end: end, kind: kind };
-            this.raiseError(`verifyDocumentHighlightsAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(documentHighlights)})`);
+            this.raiseError(`verifyDocumentHighlightsAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(documentHighlights, undefined, 2)})`);
         }
 
         public verifyDocumentHighlightsAtPositionListCount(expectedCount: number, fileNamesToSearch: string[]) {
@@ -2171,9 +2171,9 @@ namespace FourSlash {
                 }
             }
 
-            const itemsString = items.map((item) => JSON.stringify({ name: item.name, kind: item.kind })).join(",\n");
+            const itemsString = items.map((item) => JSON.stringify({ name: item.name, kind: item.kind }, undefined, 2)).join(",\n");
 
-            this.raiseError(`Expected "${JSON.stringify({ name, text, documentation, kind })}" to be in list [${itemsString}]`);
+            this.raiseError(`Expected "${JSON.stringify({ name, text, documentation, kind }, undefined, 2)}" to be in list [${itemsString}]`);
         }
 
         private findFile(indexOrName: any) {
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -919,6 +919,7 @@ namespace ts.server {
                 configuredProject.updateGraph();
                 if (configuredProject.getSourceFile(info)) {
                     info.defaultProject = configuredProject;
+                    referencingProjects.push(configuredProject);
                 }
             }
             return referencingProjects;
diff --git a/tests/cases/fourslash/server/referencesInConfiguredProject.ts b/tests/cases/fourslash/server/referencesInConfiguredProject.ts
@@ -0,0 +1,20 @@
+/// <reference path="../fourslash.ts"/>
+
+// Global class reference.
+
+// @Filename: referencesForGlobals_1.ts
+////class /*2*/globalClass {
+////    public f() { }
+////}
+
+// @Filename: referencesForGlobals_2.ts
+////var c = /*1*/globalClass();
+
+// @Filename: tsconfig.json
+////{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"] }
+
+goTo.marker("1");
+verify.referencesCountIs(2);
+
+goTo.marker("2");
+verify.referencesCountIs(2);
diff --git a/tests/cases/fourslash/server/renameInConfiguredProject.ts b/tests/cases/fourslash/server/renameInConfiguredProject.ts
@@ -0,0 +1,13 @@
+/// <reference path="../fourslash.ts"/>
+
+// @Filename: referencesForGlobals_1.ts
+////var [|globalName|] = 0;
+
+// @Filename: referencesForGlobals_2.ts
+////var y = /*1*/[|globalName|];
+
+// @Filename: tsconfig.json
+////{ "files": ["referencesForGlobals_1.ts", "referencesForGlobals_2.ts"] }
+
+goTo.marker("1");
+verify.renameLocations(/*findInStrings:*/ true, /*findInComments:*/ true);

Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,7 @@ namespace FourSlash {`
`747`	`747`	`}`
`748`	`748`
`749`	`749`	`const missingItem = { fileName: fileName, start: start, end: end, isWriteAccess: isWriteAccess };`
`750`		- this.raiseError(`verifyReferencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(references)})`);
	`750`	+ this.raiseError(`verifyReferencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(references, undefined, 2)})`);
`751`	`751`	`}`
`752`	`752`
`753`	`753`	`public verifyReferencesCountIs(count: number, localFilesOnly = true) {`
`@@ -801,7 +801,7 @@ namespace FourSlash {`
`801`	`801`
`802`	`802`	`private testDiagnostics(expected: string, diagnostics: ts.Diagnostic[]) {`
`803`	`803`	`const realized = ts.realizeDiagnostics(diagnostics, "\r\n");`
`804`		`- const actual = JSON.stringify(realized, null, " ");`
	`804`	`+ const actual = JSON.stringify(realized, undefined, 2);`
`805`	`805`	`assert.equal(actual, expected);`
`806`	`806`	`}`
`807`	`807`
`@@ -876,7 +876,7 @@ namespace FourSlash {`
`876`	`876`	`}`
`877`	`877`
`878`	`878`	`if (ranges.length !== references.length) {`
`879`		`- this.raiseError("Rename location count does not match result.\n\nExpected: " + JSON.stringify(ranges) + "\n\nActual:" + JSON.stringify(references));`
	`879`	`+ this.raiseError("Rename location count does not match result.\n\nExpected: " + JSON.stringify(ranges, undefined, 2) + "\n\nActual:" + JSON.stringify(references, undefined, 2));`
`880`	`880`	`}`
`881`	`881`
`882`	`882`	`ranges = ranges.sort((r1, r2) => r1.start - r2.start);`
`@@ -889,7 +889,7 @@ namespace FourSlash {`
`889`	`889`	`if (reference.textSpan.start !== range.start \|\|`
`890`	`890`	`ts.textSpanEnd(reference.textSpan) !== range.end) {`
`891`	`891`
`892`		`- this.raiseError("Rename location results do not match.\n\nExpected: " + JSON.stringify(ranges) + "\n\nActual:" + JSON.stringify(references));`
	`892`	`+ this.raiseError("Rename location results do not match.\n\nExpected: " + JSON.stringify(ranges, undefined, 2) + "\n\nActual:" + JSON.stringify(references, undefined, 2));`
`893`	`893`	`}`
`894`	`894`	`}`
`895`	`895`	`}`
`@@ -973,7 +973,7 @@ namespace FourSlash {`
`973`	`973`	`}`
`974`	`974`	`else {`
`975`	`975`	`if (actual) {`
`976`		- this.raiseError(`Expected no signature help, but got "${JSON.stringify(actual)}"`);
	`976`	+ this.raiseError(`Expected no signature help, but got "${JSON.stringify(actual, undefined, 2)}"`);
`977`	`977`	`}`
`978`	`978`	`}`
`979`	`979`	`}`
`@@ -1185,7 +1185,7 @@ namespace FourSlash {`
`1185`	`1185`
`1186`	`1186`	`public printCurrentParameterHelp() {`
`1187`	`1187`	`const help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition);`
`1188`		`- Harness.IO.log(JSON.stringify(help));`
	`1188`	`+ Harness.IO.log(JSON.stringify(help, undefined, 2));`
`1189`	`1189`	`}`
`1190`	`1190`
`1191`	`1191`	`public printCurrentQuickInfo() {`
`@@ -1227,7 +1227,7 @@ namespace FourSlash {`
`1227`	`1227`
`1228`	`1228`	`public printCurrentSignatureHelp() {`
`1229`	`1229`	`const sigHelp = this.getActiveSignatureHelpItem();`
`1230`		`- Harness.IO.log(JSON.stringify(sigHelp));`
	`1230`	`+ Harness.IO.log(JSON.stringify(sigHelp, undefined, 2));`
`1231`	`1231`	`}`
`1232`	`1232`
`1233`	`1233`	`public printMemberListMembers() {`
`@@ -1257,7 +1257,7 @@ namespace FourSlash {`
`1257`	`1257`	`public printReferences() {`
`1258`	`1258`	`const references = this.getReferencesAtCaret();`
`1259`	`1259`	`ts.forEach(references, entry => {`
`1260`		`- Harness.IO.log(JSON.stringify(entry));`
	`1260`	`+ Harness.IO.log(JSON.stringify(entry, undefined, 2));`
`1261`	`1261`	`});`
`1262`	`1262`	`}`
`1263`	`1263`
`@@ -1748,8 +1748,8 @@ namespace FourSlash {`
`1748`	`1748`
`1749`	`1749`	`function jsonMismatchString() {`
`1750`	`1750`	`return Harness.IO.newLine() +`
`1751`		`- "expected: '" + Harness.IO.newLine() + JSON.stringify(expected, (k, v) => v, 2) + "'" + Harness.IO.newLine() +`
`1752`		`- "actual: '" + Harness.IO.newLine() + JSON.stringify(actual, (k, v) => v, 2) + "'";`
	`1751`	`+ "expected: '" + Harness.IO.newLine() + JSON.stringify(expected, undefined, 2) + "'" + Harness.IO.newLine() +`
	`1752`	`+ "actual: '" + Harness.IO.newLine() + JSON.stringify(actual, undefined, 2) + "'";`
`1753`	`1753`	`}`
`1754`	`1754`	`}`
`1755`	`1755`
`@@ -1964,7 +1964,7 @@ namespace FourSlash {`
`1964`	`1964`	`// if there was an explicit match kind specified, then it should be validated.`
`1965`	`1965`	`if (matchKind !== undefined) {`
`1966`	`1966`	`const missingItem = { name: name, kind: kind, searchValue: searchValue, matchKind: matchKind, fileName: fileName, parentName: parentName };`
`1967`		- this.raiseError(`verifyNavigationItemsListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(items)})`);
	`1967`	+ this.raiseError(`verifyNavigationItemsListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(items, undefined, 2)})`);
`1968`	`1968`	`}`
`1969`	`1969`	`}`
`1970`	`1970`
`@@ -2001,7 +2001,7 @@ namespace FourSlash {`
`2001`	`2001`	`}`
`2002`	`2002`
`2003`	`2003`	`const missingItem = { name: name, kind: kind };`
`2004`		- this.raiseError(`verifyGetScriptLexicalStructureListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(items, null, " ")})`);
	`2004`	+ this.raiseError(`verifyGetScriptLexicalStructureListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(items, undefined, 2)})`);
`2005`	`2005`	`}`
`2006`	`2006`
`2007`	`2007`	`private navigationBarItemsContains(items: ts.NavigationBarItem[], name: string, kind: string) {`
`@@ -2066,7 +2066,7 @@ namespace FourSlash {`
`2066`	`2066`	`}`
`2067`	`2067`
`2068`	`2068`	`const missingItem = { fileName: fileName, start: start, end: end, isWriteAccess: isWriteAccess };`
`2069`		- this.raiseError(`verifyOccurrencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(occurrences)})`);
	`2069`	+ this.raiseError(`verifyOccurrencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(occurrences, undefined, 2)})`);
`2070`	`2070`	`}`
`2071`	`2071`
`2072`	`2072`	`public verifyOccurrencesAtPositionListCount(expectedCount: number) {`
`@@ -2105,7 +2105,7 @@ namespace FourSlash {`
`2105`	`2105`	`}`
`2106`	`2106`
`2107`	`2107`	`const missingItem = { fileName: fileName, start: start, end: end, kind: kind };`
`2108`		- this.raiseError(`verifyDocumentHighlightsAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(documentHighlights)})`);
	`2108`	+ this.raiseError(`verifyDocumentHighlightsAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem, undefined, 2)} in the returned list: (${JSON.stringify(documentHighlights, undefined, 2)})`);
`2109`	`2109`	`}`
`2110`	`2110`
`2111`	`2111`	`public verifyDocumentHighlightsAtPositionListCount(expectedCount: number, fileNamesToSearch: string[]) {`
`@@ -2171,9 +2171,9 @@ namespace FourSlash {`
`2171`	`2171`	`}`
`2172`	`2172`	`}`
`2173`	`2173`
`2174`		`- const itemsString = items.map((item) => JSON.stringify({ name: item.name, kind: item.kind })).join(",\n");`
	`2174`	`+ const itemsString = items.map((item) => JSON.stringify({ name: item.name, kind: item.kind }, undefined, 2)).join(",\n");`
`2175`	`2175`
`2176`		- this.raiseError(`Expected "${JSON.stringify({ name, text, documentation, kind })}" to be in list [${itemsString}]`);
	`2176`	+ this.raiseError(`Expected "${JSON.stringify({ name, text, documentation, kind }, undefined, 2)}" to be in list [${itemsString}]`);
`2177`	`2177`	`}`
`2178`	`2178`
`2179`	`2179`	`private findFile(indexOrName: any) {`
Original file line number	Diff line number	Diff line change
`@@ -919,6 +919,7 @@ namespace ts.server {`
`919`	`919`	`configuredProject.updateGraph();`
`920`	`920`	`if (configuredProject.getSourceFile(info)) {`
`921`	`921`	`info.defaultProject = configuredProject;`
	`922`	`+ referencingProjects.push(configuredProject);`
`922`	`923`	`}`
`923`	`924`	`}`
`924`	`925`	`return referencingProjects;`