Skip to content

Commit c1db699

Browse files
authored
Don't skip tests named *Fourslash.ts (microsoft#48615)
1 parent dfb9f2f commit c1db699

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/testRunner/fourslashRunner.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace Harness {
5252
const testIndex = fn.indexOf("tests/");
5353
if (testIndex >= 0) fn = fn.substr(testIndex);
5454

55-
if (justName && !justName.match(/fourslash\.ts$/i) && !justName.match(/\.d\.ts$/i)) {
55+
if (justName !== "fourslash.ts") {
5656
it(this.testSuiteName + " test " + justName + " runs correctly", () => {
5757
FourSlash.runFourSlashTest(this.basePath, this.testType, fn);
5858
});

tests/cases/fourslash/commentsInterfaceFourslash.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,14 @@ verify.quickInfos({
8181
verify.quickInfoAt("8", "(property) i2.x: number", "this is x");
8282
verify.completions({
8383
marker: "8",
84-
exact: [
84+
exact: completion.functionMembersWithPrototypePlus([
8585
{ name: "x", text: "(property) i2.x: number", documentation: "this is x" },
8686
{ name: "foo", text: "(property) i2.foo: (b: number) => string", documentation: "this is foo" },
8787
{ name: "nc_x", text: "(property) i2.nc_x: number" },
8888
{ name: "nc_foo", text: "(property) i2.nc_foo: (b: number) => string" },
8989
{ name: "fnfoo", text: "(method) i2.fnfoo(b: number): string", documentation: "this is fnfoo" },
9090
{ name: "nc_fnfoo", text: "(method) i2.nc_fnfoo(b: number): string" },
91-
...completion.functionMembersWithPrototype,
92-
],
91+
]),
9392
isNewIdentifierLocation: true,
9493
});
9594

@@ -199,12 +198,12 @@ verify.quickInfoIs("(method) i3.f(a: number): string", "Function i3 f");
199198
verify.completions({
200199
marker: "41",
201200
exact: [
202-
{ name: "x", text: "(property) i3.x: number", documentation: "Comment i3 x" },
203201
{ name: "f", text: "(method) i3.f(a: number): string", documentation: "Function i3 f" },
204202
{ name: "l", text: "(property) i3.l: (b: number) => string", documentation: "i3 l" },
205-
{ name: "nc_x", text: "(property) i3.nc_x: number" },
206203
{ name: "nc_f", text: "(method) i3.nc_f(a: number): string" },
207204
{ name: "nc_l", text: "(property) i3.nc_l: (b: number) => string" },
205+
{ name: "nc_x", text: "(property) i3.nc_x: number" },
206+
{ name: "x", text: "(property) i3.x: number", documentation: "Comment i3 x" },
208207
],
209208
});
210209

0 commit comments

Comments
 (0)