Simplify diagnostics fourslash tests (#22245)

Andy · web-flow · commit 6385c66215f2 · 2018-03-01T07:34:51.000-08:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -1239,22 +1239,23 @@ Actual: ${stringify(fullActual)}`);
             return this.languageService.findReferences(this.activeFile.fileName, this.currentCaretPosition);
         }
 
-        public getSyntacticDiagnostics(expected: ReadonlyArray<ts.RealizedDiagnostic>) {
+        public getSyntacticDiagnostics(expected: ReadonlyArray<FourSlashInterface.Diagnostic>) {
             const diagnostics = this.languageService.getSyntacticDiagnostics(this.activeFile.fileName);
-            this.testDiagnostics(expected, diagnostics);
+            this.testDiagnostics(expected, diagnostics, "error");
         }
 
-        public getSemanticDiagnostics(expected: ReadonlyArray<ts.RealizedDiagnostic>) {
+        public getSemanticDiagnostics(expected: ReadonlyArray<FourSlashInterface.Diagnostic>) {
             const diagnostics = this.languageService.getSemanticDiagnostics(this.activeFile.fileName);
-            this.testDiagnostics(expected, diagnostics);
+            this.testDiagnostics(expected, diagnostics, "error");
         }
 
-        public getSuggestionDiagnostics(expected: ReadonlyArray<ts.RealizedDiagnostic>): void {
-            this.testDiagnostics(expected, this.languageService.getSuggestionDiagnostics(this.activeFile.fileName));
+        public getSuggestionDiagnostics(expected: ReadonlyArray<FourSlashInterface.Diagnostic>): void {
+            this.testDiagnostics(expected, this.languageService.getSuggestionDiagnostics(this.activeFile.fileName), "suggestion");
         }
 
-        private testDiagnostics(expected: ReadonlyArray<ts.RealizedDiagnostic>, diagnostics: ReadonlyArray<ts.Diagnostic>) {
-            assert.deepEqual(ts.realizeDiagnostics(diagnostics, ts.newLineCharacter), expected);
+        private testDiagnostics(expected: ReadonlyArray<FourSlashInterface.Diagnostic>, diagnostics: ReadonlyArray<ts.Diagnostic>, category: string) {
+            assert.deepEqual(ts.realizeDiagnostics(diagnostics, ts.newLineCharacter), expected.map<ts.RealizedDiagnostic>(e => (
+                { message: e.message, category, code: e.code, ...ts.createTextSpanFromRange(e.range || this.getRanges()[0]) })));
         }
 
         public verifyQuickInfoAt(markerName: string, expectedText: string, expectedDocumentation?: string) {
@@ -4676,4 +4677,10 @@ namespace FourSlashInterface {
         source?: string;
         description: string;
     }
+
+    export interface Diagnostic {
+        message: string;
+        range?: FourSlash.Range;
+        code: number;
+    }
 }
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
@@ -347,9 +347,9 @@ declare namespace FourSlashInterface {
             start: number;
             length: number;
         }, displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[], tags: ts.JSDocTagInfo[]): void;
-        getSyntacticDiagnostics(expected: ReadonlyArray<RealizedDiagnostic>): void;
-        getSemanticDiagnostics(expected: ReadonlyArray<RealizedDiagnostic>): void;
-        getSuggestionDiagnostics(expected: ReadonlyArray<RealizedDiagnostic>): void;
+        getSyntacticDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
+        getSemanticDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
+        getSuggestionDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
         ProjectInfo(expected: string[]): void;
         allRangesAppearInImplementationList(markerName: string): void;
     }
@@ -521,11 +521,10 @@ declare namespace FourSlashInterface {
         text: string;
         range: Range;
     }
-    interface RealizedDiagnostic {
+    interface Diagnostic {
         message: string;
-        start: number;
-        length: number;
-        category: string;
+        /** @default `test.ranges()[0]` */
+        range?: Range;
         code: number;
     }
 }
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics1.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics1.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// import a = b;
+////[|import a = b;|]
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'import ... =' can only be used in a .ts file.",
-    start: 0,
-    length: 13,
-    category: "error",
     code: 8002
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics10.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics10.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// function F<T>() { }
+////function F<[|T|]>() { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'type parameter declarations' can only be used in a .ts file.",
-    start: 11,
-    length: 1,
-    category: "error",
     code: 8004
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics11.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics11.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// function F(): number { }
+////function F(): [|number|] { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'types' can only be used in a .ts file.",
-    start: 14,
-    length: 6,
-    category: "error",
     code: 8010
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics12.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics12.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// declare var v;
+////[|declare|] var v;
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'declare' can only be used in a .ts file.",
-    start: 0,
-    length: 7,
-    category: "error",
     code: 8009
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics13.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics13.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// var v: () => number;
+////var v: [|() => number|];
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'types' can only be used in a .ts file.",
-    start: 7,
-    length: 12,
-    category: "error",
     code: 8010
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics14.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics14.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// Foo<number>();
+////Foo<[|number|]>();
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'type arguments' can only be used in a .ts file.",
-    start: 4,
-    length: 6,
-    category: "error",
     code: 8011
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics15.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics15.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// function F(public p) { }
+////function F([|public|] p) { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'parameter modifiers' can only be used in a .ts file.",
-    start: 11,
-    length: 6,
-    category: "error",
     code: 8012
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics16.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics16.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// function F(p?) { }
+////function F(p[|?|]) { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'?' can only be used in a .ts file.",
-    start: 12,
-    length: 1,
-    category: "error",
     code: 8009
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics17.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics17.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// function F(a: number) { }
+////function F(a: [|number|]) { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'types' can only be used in a .ts file.",
-    start: 14,
-    length: 6,
-    category: "error",
     code: 8010
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics18.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics18.ts
@@ -5,32 +5,23 @@
 ////class C {
 ////    x; // Regular property declaration allowed
 ////    static y; // static allowed
-////    public z; // public not allowed
+////    [|public|] z; // public not allowed
 ////}
 
 goTo.file("a.js");
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "\'public\' can only be used in a .ts file.",
-    start: 93,
-    length: 6,
-    category: "error",
     code: 8009
-  }
-]);
+}]);
 
 // @Filename: b.js
 ////class C {
-////    x: number; // Types not allowed
+////    x: [|number|]; // Types not allowed
 ////}
 
 goTo.file("b.js");
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'types' can only be used in a .ts file.",
-    start: 17,
-    length: 6,
-    category: "error",
+    range: test.ranges()[1],
     code: 8010
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics19.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics19.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// enum E { }
+////enum [|E|] { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'enum declarations' can only be used in a .ts file.",
-    start: 5,
-    length: 1,
-    category: "error",
     code: 8015
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics2.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics2.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// export = b;
+////[|export = b;|]
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'export=' can only be used in a .ts file.",
-    start: 0,
-    length: 11,
-    category: "error",
     code: 8003
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics3.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics3.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// class C<T> { }
+////class C<[|T|]> { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'type parameter declarations' can only be used in a .ts file.",
-    start: 8,
-    length: 1,
-    category: "error",
     code: 8004
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics4.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics4.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// public class C { }
+////[|public|] class C { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'public' can only be used in a .ts file.",
-    start: 0,
-    length: 6,
-    category: "error",
     code: 8009
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics5.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics5.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// class C implements D { }
+////class C [|implements D|] { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'implements clauses' can only be used in a .ts file.",
-    start: 8,
-    length: 12,
-    category: "error",
     code: 8005
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics6.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics6.ts
@@ -2,14 +2,9 @@
 
 // @allowJs: true
 // @Filename: a.js
-//// interface I { }
+////interface [|I|] { }
 
-verify.getSyntacticDiagnostics([
-  {
+verify.getSyntacticDiagnostics([{
     message: "'interface declarations' can only be used in a .ts file.",
-    start: 10,
-    length: 1,
-    category: "error",
     code: 8006
-  }
-]);
+}]);
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics7.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics7.ts
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics8.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics8.ts
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics9.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics9.ts
diff --git a/tests/cases/fourslash/jsDocAugmentsAndExtends.ts b/tests/cases/fourslash/jsDocAugmentsAndExtends.ts
diff --git a/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_named.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_named.ts
diff --git a/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics01.ts b/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics01.ts
diff --git a/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts b/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts

Original file line number	Diff line number	Diff line change
@@ -1239,22 +1239,23 @@ Actual: ${stringify(fullActual)}`);
`1239`	`1239`	`return this.languageService.findReferences(this.activeFile.fileName, this.currentCaretPosition);`
`1240`	`1240`	`}`
`1241`	`1241`
`1242`		`- public getSyntacticDiagnostics(expected: ReadonlyArray<ts.RealizedDiagnostic>) {`
	`1242`	`+ public getSyntacticDiagnostics(expected: ReadonlyArray<FourSlashInterface.Diagnostic>) {`
`1243`	`1243`	`const diagnostics = this.languageService.getSyntacticDiagnostics(this.activeFile.fileName);`
`1244`		`- this.testDiagnostics(expected, diagnostics);`
	`1244`	`+ this.testDiagnostics(expected, diagnostics, "error");`
`1245`	`1245`	`}`
`1246`	`1246`
`1247`		`- public getSemanticDiagnostics(expected: ReadonlyArray<ts.RealizedDiagnostic>) {`
	`1247`	`+ public getSemanticDiagnostics(expected: ReadonlyArray<FourSlashInterface.Diagnostic>) {`
`1248`	`1248`	`const diagnostics = this.languageService.getSemanticDiagnostics(this.activeFile.fileName);`
`1249`		`- this.testDiagnostics(expected, diagnostics);`
	`1249`	`+ this.testDiagnostics(expected, diagnostics, "error");`
`1250`	`1250`	`}`
`1251`	`1251`
`1252`		`- public getSuggestionDiagnostics(expected: ReadonlyArray<ts.RealizedDiagnostic>): void {`
`1253`		`- this.testDiagnostics(expected, this.languageService.getSuggestionDiagnostics(this.activeFile.fileName));`
	`1252`	`+ public getSuggestionDiagnostics(expected: ReadonlyArray<FourSlashInterface.Diagnostic>): void {`
	`1253`	`+ this.testDiagnostics(expected, this.languageService.getSuggestionDiagnostics(this.activeFile.fileName), "suggestion");`
`1254`	`1254`	`}`
`1255`	`1255`
`1256`		`- private testDiagnostics(expected: ReadonlyArray<ts.RealizedDiagnostic>, diagnostics: ReadonlyArray<ts.Diagnostic>) {`
`1257`		`- assert.deepEqual(ts.realizeDiagnostics(diagnostics, ts.newLineCharacter), expected);`
	`1256`	`+ private testDiagnostics(expected: ReadonlyArray<FourSlashInterface.Diagnostic>, diagnostics: ReadonlyArray<ts.Diagnostic>, category: string) {`
	`1257`	`+ assert.deepEqual(ts.realizeDiagnostics(diagnostics, ts.newLineCharacter), expected.map<ts.RealizedDiagnostic>(e => (`
	`1258`	`+ { message: e.message, category, code: e.code, ...ts.createTextSpanFromRange(e.range \|\| this.getRanges()[0]) })));`
`1258`	`1259`	`}`
`1259`	`1260`
`1260`	`1261`	`public verifyQuickInfoAt(markerName: string, expectedText: string, expectedDocumentation?: string) {`
`@@ -4676,4 +4677,10 @@ namespace FourSlashInterface {`
`4676`	`4677`	`source?: string;`
`4677`	`4678`	`description: string;`
`4678`	`4679`	`}`
	`4680`	`+`
	`4681`	`+ export interface Diagnostic {`
	`4682`	`+ message: string;`
	`4683`	`+ range?: FourSlash.Range;`
	`4684`	`+ code: number;`
	`4685`	`+ }`
`4679`	`4686`	`}`