Improve completions testing

tests/cases/fourslash/augmentedTypesClass1.ts

@@ -6,8 +6,6 @@
 ////var r = new c5b();
 ////r./*2*/
 
-goTo.marker('1');
-verify.completionListContains('prototype', '(property) c5b.prototype: c5b');
+verify.completions({ at: "1", includes: { name: "prototype", text: '(property) c5b.prototype: c5b' } });
 edit.insert('y;');
-goTo.marker('2');
-verify.completionListContains('foo', '(method) c5b.foo(): void');
+verify.completions({ at: "2", includes: { name: "foo", text: '(method) c5b.foo(): void' } });

tests/cases/fourslash/augmentedTypesModule6.ts

@@ -8,25 +8,19 @@
 ////var r2: m3f.I = r;
 ////r2./*6*/
 
-goTo.marker('1');
-verify.completionListContains('I');
-verify.not.completionListContains('foo');
+verify.completions({ at: "1", includes: "I", excludes: "foo" });
 edit.insert('I;');
 
-goTo.marker('2');
-verify.completionListContains('m3f');
+verify.completions({ at: "2", includes: "m3f" });
 
 goTo.marker('3');
 verify.currentSignatureHelpIs('m3f(): m3f');
 
 verify.quickInfoAt("4", "var r: m3f");
 
-goTo.marker('5');
-verify.completionListContains('foo');
+verify.completions({ at: "5", includes: "foo" });
 edit.insert('foo(1)');
 
-goTo.marker('6');
-verify.completionListContains('foo');
+verify.completions({ at: "6", includes: "foo" });
 edit.insert('foo(');
 verify.currentSignatureHelpIs('foo(): void');
-

tests/cases/fourslash/cloduleAsBaseClass2.ts

@@ -28,22 +28,10 @@
 ////d./*1*/
 ////D./*2*/
 
-goTo.marker('1');
-verify.completionListContains('foo');
-verify.completionListContains('foo2');
-verify.not.completionListContains('bar');
-verify.not.completionListContains('bar2');
-verify.not.completionListContains('baz');
-verify.not.completionListContains('x');
+verify.completions({ at: "1", are: ["foo2", "foo"] });
 edit.insert('foo()');
 
-goTo.marker('2');
-verify.not.completionListContains('foo');
-verify.not.completionListContains('foo2');
-verify.completionListContains('bar');
-verify.completionListContains('bar2');
-verify.completionListContains('baz');
-verify.completionListContains('x');
+verify.completions({ at: "2", includes: ["bar", "bar2", "baz", "x"], excludes: ["foo", "foo2"] });
 edit.insert('bar()');
 
 verify.noErrors();

tests/cases/fourslash/cloduleTypeOf1.ts

@@ -14,18 +14,14 @@
 ////    }
 ////}
 
-goTo.marker('1');
-verify.completionListContains('f');
-verify.completionListContains('foo');
+verify.completions({ at: "1", includes: ["f", "foo"] });
 edit.insert('foo(1);');
 
-goTo.marker('2');
-verify.completionListContains('x');
+verify.completions({ at: "2", includes: "x" });
 
 verify.quickInfoAt("3", "(local var) r: C<number>");
 
-goTo.marker('4');
-verify.completionListContains('x');
+verify.completions({ at: "4", includes: "x" });
 edit.insert('x;');
 
 verify.quickInfoAt("5", "(local var) r2: number");

tests/cases/fourslash/commentsEnums.ts

@@ -17,16 +17,19 @@ verify.quickInfos({
     4: "var x: Colors"
 });
 
-goTo.marker('5');
-verify.completionListContains("Colors", "enum Colors", "Enum of colors");
+verify.completions({
+    at: "5",
+    includes: { name: "Colors", text: "enum Colors", documentation: "Enum of colors" },
+    isNewIdentifierLocation: true,
+});
 verify.quickInfoIs("enum Colors", "Enum of colors");
 
-goTo.marker('6');
-verify.completionListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
-verify.completionListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
+const completions = [
+    { name: "Cornflower", text: "(enum member) Colors.Cornflower = 0", documentation: "Fancy name for 'blue'" },
+    { name: "FancyPink", text: "(enum member) Colors.FancyPink = 1", documentation: "Fancy name for 'pink'" },
+];
+verify.completions({ at: "6", includes: completions });
 verify.quickInfoIs("(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
 
-goTo.marker('7');
-verify.completionListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
-verify.completionListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
+verify.completions({ at: "7", includes: completions });
 verify.quickInfoIs("(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");

tests/cases/fourslash/commentsImportDeclaration.ts

@@ -29,13 +29,16 @@ verify.quickInfos({
     3: ['import extMod = require("./commentsImportDeclaration_file0")', "Import declaration"]
 });
 
-goTo.marker('6');
-verify.completionListContains("m1", "namespace extMod.m1");
+verify.completions({ at: "6", are: [{ name: "m1", text: "namespace extMod.m1", documentation: "NamespaceComment" }] });
 
-goTo.marker('7');
-verify.completionListContains("b", "var extMod.m1.b: number", "b's comment");
-verify.completionListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
-verify.completionListContains("m2", "namespace extMod.m1.m2");
+verify.completions({
+    at: "7",
+    are: [
+        { name: "fooExport", text: "function extMod.m1.fooExport(): number", documentation: "exported function" },
+        { name: "b", text: "var extMod.m1.b: number", documentation: "b's comment" },
+        { name: "m2", text: "namespace extMod.m1.m2", documentation: "m2 comments" },
+    ]
+})
 
 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("exported function");
@@ -44,6 +47,10 @@ verify.quickInfos({
     9: "var newVar: extMod.m1.m2.c"
 });
 
-goTo.marker('10');
-verify.completionListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
-verify.completionListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
+verify.completions({
+    at: "10",
+    are:  [
+        { name: "c", text: "constructor extMod.m1.m2.c(): extMod.m1.m2.c" },
+        { name: "i", text: "var extMod.m1.m2.i: extMod.m1.m2.c", documentation: "i" },
+    ],
+});

tests/cases/fourslash/commentsVariables.ts

@@ -43,16 +43,26 @@
 
 verify.quickInfoAt("1", "var myVariable: number", "This is my variable");
 
-goTo.marker('2');
-verify.completionListContains("myVariable", "var myVariable: number", "This is my variable");
-
-goTo.marker('3');
-verify.completionListContains("myVariable", "var myVariable: number", "This is my variable");
-verify.completionListContains("d", "var d: number", "d variable");
-
-goTo.marker('4');
-verify.completionListContains("foo", "function foo(): void", "foos comment");
-verify.completionListContains("fooVar", "var fooVar: () => void", "fooVar comment");
+verify.completions(
+    {
+        at: "2",
+        includes: { name: "myVariable", text: "var myVariable: number", documentation: "This is my variable" },
+    },
+    {
+        at: "3",
+        includes: [
+            { name: "myVariable", text: "var myVariable: number", documentation: "This is my variable" },
+            { name: "d", text: "var d: number", documentation: "d variable" }
+        ],
+    },
+    {
+        at: "4",
+        includes: [
+            { name: "foo", text: "function foo(): void", documentation: "foos comment" },
+            { name: "fooVar", text: "var fooVar: () => void", documentation:"fooVar comment" },
+        ]
+    },
+)
 
 goTo.marker('5');
 verify.currentSignatureHelpDocCommentIs("foos comment");
@@ -62,9 +72,13 @@ goTo.marker('6');
 verify.currentSignatureHelpDocCommentIs("fooVar comment");
 verify.quickInfoAt("6q", "var fooVar: () => void", "fooVar comment");
 
-goTo.marker('7');
-verify.completionListContains("foo", "function foo(): void", "foos comment");
-verify.completionListContains("fooVar", "var fooVar: () => void", "fooVar comment");
+verify.completions({
+    at: "7",
+    includes: [
+        { name: "foo", text: "function foo(): void", documentation: "foos comment" },
+        { name: "fooVar", text: "var fooVar: () => void", documentation:"fooVar comment" },
+    ],
+});
 
 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("foos comment");
@@ -77,11 +91,8 @@ verify.quickInfos({
     "9aq": ["var fooVar: () => void", "fooVar comment"]
 });
 
-goTo.marker('10');
-verify.completionListContains("i", "var i: c", "instance comment");
-
-goTo.marker('11');
-verify.completionListContains("i1_i", "var i1_i: i1", "interface instance comments");
+verify.completions({ at: "10", includes: { name: "i", text: "var i: c", documentation: "instance comment" } });
+verify.completions({ at: "11", includes: { name: "i1_i", text: "var i1_i: i1", documentation: "interface instance comments" } });
 
 verify.quickInfos({
     12: ["var fooVar: () => void", "fooVar comment"],

tests/cases/fourslash/completionForStringLiteralNonrelativeImport10.ts

@@ -17,19 +17,11 @@
 // @Filename: package.json
 //// { "dependencies": { "fake-module": "latest" } }
 // @Filename: node_modules/fake-module/ts.ts
-//// /*module1*/
+////
 
 // @Filename: dir1/dir2/dir3/package.json
 //// { "dependencies": { "fake-module3": "latest" } }
 // @Filename: dir1/dir2/dir3/node_modules/fake-module3/ts.ts
-//// /*module3*/
+////
 
-const kinds = ["import_as", "import_equals", "require"];
-
-for (const kind of kinds) {
-    goTo.marker(kind + "0");
-    verify.completionListIsEmpty();
-
-    goTo.marker(kind + "1");
-    verify.completionListIsEmpty();
-}
+verify.completions({ at: test.markerNames(), are: [], isNewIdentifierLocation: true });

tests/cases/fourslash/completionForStringLiteralNonrelativeImport11.ts

@@ -21,18 +21,16 @@
 // @Filename: node_modules/module-from-node/index.ts
 //// /*module1*/
 
-
-
 const kinds = ["import_as", "import_equals", "require"];
-
-for (const kind of kinds) {
-    goTo.marker(kind + "0");
-
-    verify.completionListContains("module");
-    verify.not.completionListItemsCountIsGreaterThan(1);
-
-    goTo.marker(kind + "1");
-
-    verify.completionListContains("index");
-    verify.not.completionListItemsCountIsGreaterThan(1);
-}
+verify.completions(
+    {
+        at: kinds.map(k => `${k}0`),
+        are: "module",
+        isNewIdentifierLocation: true,
+    },
+    {
+        at: kinds.map(k => `${k}1`),
+        are: "index",
+        isNewIdentifierLocation: true,
+    },
+)

tests/cases/fourslash/completionForStringLiteralNonrelativeImport12.ts

@@ -15,14 +15,8 @@
 ////     "peerDependencies": { "peer-module": "latest" }
 //// }
 
-const kinds = ["import_as", "import_equals", "require"];
-
-for (const kind of kinds) {
-    goTo.marker(kind + "0");
-
-    verify.completionListContains("module");
-    verify.completionListContains("dev-module");
-    verify.completionListContains("optional-module");
-    verify.completionListContains("peer-module");
-    verify.not.completionListItemsCountIsGreaterThan(4);
-}
+verify.completions({
+    at: test.markerNames(),
+    are: ["module", "dev-module", "peer-module", "optional-module"],
+    isNewIdentifierLocation: true,
+});

tests/cases/fourslash/completionForStringLiteralNonrelativeImport4.ts

@@ -10,25 +10,20 @@
 // @Filename: package.json
 //// { "dependencies": { "fake-module": "latest" } }
 // @Filename: node_modules/fake-module/ts.ts
-//// /*module1*/
+////
 
 // @Filename: dir1/package.json
 //// { "dependencies": { "fake-module2": "latest" } }
 // @Filename: dir1/node_modules/fake-module2/index.ts
-//// /*module2*/
+////
 
 // @Filename: dir1/dir2/dir3/package.json
 //// { "dependencies": { "fake-module3": "latest" } }
 // @Filename: dir1/dir2/dir3/node_modules/fake-module3/ts.ts
-//// /*module3*/
+////
 
-const kinds = ["import_as", "import_equals", "require"];
-
-for (const kind of kinds) {
-    goTo.marker(kind + "0");
-
-    verify.completionListContains("fake-module");
-    verify.completionListContains("fake-module2");
-    verify.completionListContains("fake-module3");
-    verify.not.completionListItemsCountIsGreaterThan(3);
-}
+verify.completions({
+    at: test.markerNames(),
+    are: ["fake-module3", "fake-module2", "fake-module"],
+    isNewIdentifierLocation: true,
+});

tests/cases/fourslash/completionForStringLiteralNonrelativeImport5.ts

@@ -16,24 +16,18 @@
 
 // @Filename: ambientModules.d.ts
 //// declare module "ambientModule" {}
-//// declare module "otherAmbientModule" {} /*dummy0*/
+//// declare module "otherAmbientModule" {}
 
 // @Filename: ambientModules2.d.ts
-//// declare module "otherOtherAmbientModule" {} /*dummy1*/
-
-const kinds = ["import_as", "import_equals", "require"];
-
-for (const kind of kinds) {
-    goTo.marker(kind + "0");
-
-    verify.completionListContains("ambientModule");
-    verify.completionListContains("otherAmbientModule");
-    verify.completionListContains("otherOtherAmbientModule");
-    verify.not.completionListItemsCountIsGreaterThan(3);
-
-    goTo.marker(kind + "1");
-
-    verify.completionListContains("ambientModule");
-    verify.not.completionListItemsCountIsGreaterThan(1);
-}
-
+//// declare module "otherOtherAmbientModule" {}
+
+verify.completions({
+    at: test.markerNames().filter(k => k.endsWith("0")),
+    are: ["ambientModule", "otherAmbientModule", "otherOtherAmbientModule"],
+    isNewIdentifierLocation: true,
+});
+verify.completions({
+    at: test.markerNames().filter(k => !k.endsWith("0")),
+    are: "ambientModule",
+    isNewIdentifierLocation: true,
+});

tests/cases/fourslash/completionForStringLiteralNonrelativeImport7.ts

@@ -15,16 +15,10 @@
 // @Filename: package.json
 //// { "dependencies": { "module-from-node": "latest" } }
 // @Filename: node_modules/module-from-node/index.ts
-//// /*module1*/
+////
 
-
-
-const kinds = ["import_as", "import_equals", "require"];
-
-for (const kind of kinds) {
-    goTo.marker(kind + "0");
-
-    verify.completionListContains("module");
-    verify.completionListContains("module-from-node");
-    verify.not.completionListItemsCountIsGreaterThan(2);
-}
+verify.completions({
+    at: test.markerNames(),
+    are: ["module", "module-from-node"],
+    isNewIdentifierLocation: true,
+});