Skip to content

Commit 430f361

Browse files
sheetalkamatsheetalkamat
committed
Enabling more test cases
1 parent e9681c1 commit 430f361

120 files changed

Lines changed: 1204 additions & 1350 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tests/cases/fourslash_old/addMemberToModule.ts renamed to tests/cases/fourslash/addMemberToModule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
////module A {
44
//// /*var*/
55
////}
6-
////module A/*check*/ {
6+
////module /*check*/A {
77
//// var p;
88
////}
99

tests/cases/fourslash_old/basicClassMembers.ts renamed to tests/cases/fourslash/basicClassMembers.ts

File renamed without changes.

tests/cases/fourslash_old/bestCommonTypeObjectLiterals1.ts renamed to tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,36 @@
22

33
////var a = { name: 'bob', age: 18 };
44
////var b = { name: 'jim', age: 20 };
5-
////var c/*1*/ = [a, b];
5+
////var /*1*/c = [a, b];
66

77
////var a1 = { name: 'bob', age: 18 };
88
////var b1 = { name: 'jim', age: 20, dob: new Date() };
9-
////var c1/*2*/ = [a1, b1];
9+
////var /*2*/c1 = [a1, b1];
1010

1111
////var a2 = { name: 'bob', age: 18, address: 'springfield' };
1212
////var b2 = { name: 'jim', age: 20, dob: new Date() };
13-
////var c2/*3*/ = [a2, b2];
14-
////var c2a/*4*/ = [a2, b2, a1];
13+
////var /*3*/c2 = [a2, b2];
14+
////var /*4*/c2a = [a2, b2, a1];
1515

1616
////interface I {
1717
//// name: string;
1818
//// age: number;
1919
////}
2020

2121
////var i: I;
22-
////var c3/*5*/ = [a2, b2, i];
22+
////var /*5*/c3 = [a2, b2, i];
2323

2424
goTo.marker('1');
25-
verify.quickInfoIs('{ name: string; age: number; }[]');
25+
verify.quickInfoIs('(var) c: {\n name: string;\n age: number;\n}[]');
2626

2727
goTo.marker('2');
28-
verify.quickInfoIs('{ name: string; age: number; }[]');
28+
verify.quickInfoIs('(var) c1: {\n name: string;\n age: number;\n}[]');
2929

3030
goTo.marker('3');
31-
verify.quickInfoIs('{}[]');
31+
verify.quickInfoIs('(var) c2: {}[]');
3232

3333
goTo.marker('4');
34-
verify.quickInfoIs('{ name: string; age: number; }[]');
34+
verify.quickInfoIs('(var) c2a: {\n name: string;\n age: number;\n}[]');
3535

3636
goTo.marker('5');
37-
verify.quickInfoIs('I[]');
37+
verify.quickInfoIs('(var) c3: I[]');

tests/cases/fourslash_old/cloduleAsBaseClass2.ts renamed to tests/cases/fourslash/cloduleAsBaseClass2.ts

File renamed without changes.

tests/cases/fourslash_old/cloduleTypeOf1.ts renamed to tests/cases/fourslash/cloduleTypeOf1.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
////module C {
99
//// export function f(x: typeof C) {
1010
//// x./*1*/
11-
//// var r/*3*/ = new /*2*/x<number>();
12-
//// var r2/*5*/ = r./*4*/
11+
//// var /*3*/r = new /*2*/x<number>();
12+
//// var /*5*/r2 = r./*4*/
1313
//// return typeof r;
1414
//// }
1515
////}
@@ -27,13 +27,13 @@ goTo.marker('2');
2727
verify.completionListContains('x');
2828

2929
goTo.marker('3');
30-
verify.quickInfoIs('C<number>');
30+
verify.quickInfoIs('(local var) r: C<number>');
3131

3232
goTo.marker('4');
3333
verify.completionListContains('x');
3434
edit.insert('x;');
3535

3636
goTo.marker('5');
37-
verify.quickInfoIs('number');
37+
verify.quickInfoIs('(local var) r2: number');
3838

3939
verify.numberOfErrorsInCurrentFile(0);

tests/cases/fourslash_old/cloduleWithRecursiveReference.ts renamed to tests/cases/fourslash/cloduleWithRecursiveReference.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
//// foo() { }
66
//// }
77
//// export module C {
8-
//// export var C/**/ = M.C
8+
//// export var /**/C = M.C
99
//// }
1010
////}
1111

1212
// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
1313
edit.insert('');
1414

1515
goTo.marker();
16-
verify.quickInfoIs('typeof C');
16+
verify.quickInfoIs('(var) M.C.C: typeof M.C');
1717
verify.numberOfErrorsInCurrentFile(0);

tests/cases/fourslash_old/completionListWithModulesFromModule.ts renamed to tests/cases/fourslash/completionListWithModulesFromModule.ts

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -261,15 +261,8 @@ function sharedNegativeVerify()
261261
verify.not.completionListContains('mod2eexvar');
262262
}
263263

264-
function goToMarkAndVerifyShadow(marker: string)
264+
function goToMarkAndVerifyShadow()
265265
{
266-
goTo.marker(marker);
267-
268-
verify.completionListContains('shwvar', 'string');
269-
verify.completionListContains('shwfn', '(shadow: any): void');
270-
verify.completionListContains('shwcls', 'shwcls');
271-
verify.completionListContains('shwint', 'shwint');
272-
273266
sharedNegativeVerify();
274267
verify.not.completionListContains('mod2var');
275268
verify.not.completionListContains('mod2fn');
@@ -284,20 +277,30 @@ function goToMarkAndVerifyShadow(marker: string)
284277
}
285278

286279
// from a shadow module with no export
287-
goToMarkAndVerifyShadow('shadowModuleWithNoExport');
280+
goTo.marker('shadowModuleWithNoExport');
281+
verify.completionListContains('shwvar', '(var) shwvar: string');
282+
verify.completionListContains('shwfn', '(function) shwfn(shadow: any): void');
283+
verify.completionListContains('shwcls', 'class shwcls');
284+
verify.completionListContains('shwint', 'interface shwint');
285+
goToMarkAndVerifyShadow();
288286

289287
// from a shadow module with export
290-
goToMarkAndVerifyShadow('shadowModuleWithExport');
288+
goTo.marker('shadowModuleWithExport');
289+
verify.completionListContains('shwvar', '(var) mod4.shwvar: string');
290+
verify.completionListContains('shwfn', '(function) mod4.shwfn(shadow: any): void');
291+
verify.completionListContains('shwcls', 'class mod4.shwcls');
292+
verify.completionListContains('shwint', 'interface mod4.shwint');
293+
goToMarkAndVerifyShadow();
291294

292295
// from a modlue with import
293296
goTo.marker('moduleWithImport');
294-
verify.completionListContains('mod1', 'mod1');
295-
verify.completionListContains('mod2', 'mod2');
296-
verify.completionListContains('mod3', 'mod3');
297-
verify.completionListContains('shwvar', 'number');
298-
verify.completionListContains('shwfn', '(): void');
299-
verify.completionListContains('shwcls', 'shwcls');
300-
verify.completionListContains('shwint', 'shwint');
297+
verify.completionListContains('mod1', 'module mod1');
298+
verify.completionListContains('mod2', 'module mod2');
299+
verify.completionListContains('mod3', 'module mod3');
300+
verify.completionListContains('shwvar', '(var) shwvar: number');
301+
verify.completionListContains('shwfn', '(function) shwfn(): void');
302+
verify.completionListContains('shwcls', 'class shwcls');
303+
verify.completionListContains('shwint', 'interface shwint');
301304

302305
sharedNegativeVerify();
303306

tests/cases/fourslash_old/completionListWithModulesInsideModuleScope.ts renamed to tests/cases/fourslash/completionListWithModulesInsideModuleScope.ts

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -229,23 +229,23 @@ function goToMarkAndGeneralVerify(marker: string)
229229
{
230230
goTo.marker(marker);
231231

232-
verify.completionListContains('mod1var', 'number');
233-
verify.completionListContains('mod1fn', '(): void');
234-
verify.completionListContains('mod1cls', 'mod1cls');
235-
verify.completionListContains('mod1int', 'mod1int');
236-
verify.completionListContains('mod1mod', 'mod1mod');
237-
verify.completionListContains('mod1evar', 'number');
238-
verify.completionListContains('mod1efn', '(): void');
239-
verify.completionListContains('mod1ecls', 'mod1ecls');
240-
verify.completionListContains('mod1eint', 'mod1eint');
241-
verify.completionListContains('mod1emod', 'mod1emod');
242-
verify.completionListContains('mod1eexvar', 'number');
243-
verify.completionListContains('mod2', 'mod2');
244-
verify.completionListContains('mod3', 'mod3');
245-
verify.completionListContains('shwvar', 'number');
246-
verify.completionListContains('shwfn', '(): void');
247-
verify.completionListContains('shwcls', 'shwcls');
248-
verify.completionListContains('shwint', 'shwint');
232+
verify.completionListContains('mod1var', '(var) mod1var: number');
233+
verify.completionListContains('mod1fn', '(function) mod1fn(): void');
234+
verify.completionListContains('mod1cls', 'class mod1cls');
235+
verify.completionListContains('mod1int', 'interface mod1int');
236+
verify.completionListContains('mod1mod', 'module mod1mod');
237+
verify.completionListContains('mod1evar', '(var) mod1.mod1evar: number');
238+
verify.completionListContains('mod1efn', '(function) mod1.mod1efn(): void');
239+
verify.completionListContains('mod1ecls', 'class mod1.mod1ecls');
240+
verify.completionListContains('mod1eint', 'interface mod1.mod1eint');
241+
verify.completionListContains('mod1emod', 'module mod1.mod1emod');
242+
verify.completionListContains('mod1eexvar', '(var) mod1.mod1eexvar: number');
243+
verify.completionListContains('mod2', 'module mod2');
244+
verify.completionListContains('mod3', 'module mod3');
245+
verify.completionListContains('shwvar', '(var) shwvar: number');
246+
verify.completionListContains('shwfn', '(function) shwfn(): void');
247+
verify.completionListContains('shwcls', 'class shwcls');
248+
verify.completionListContains('shwint', 'interface shwint');
249249

250250
verify.not.completionListContains('mod2var');
251251
verify.not.completionListContains('mod2fn');
@@ -276,8 +276,8 @@ goToMarkAndGeneralVerify('mod1');
276276

277277
// from function in mod1
278278
goToMarkAndGeneralVerify('function');
279-
verify.completionListContains('bar', 'number');
280-
verify.completionListContains('foob', '(): void');
279+
verify.completionListContains('bar', '(local var) bar: number');
280+
verify.completionListContains('foob', '(local function) foob(): void');
281281

282282
// from class in mod1
283283
goToMarkAndGeneralVerify('class');
@@ -289,21 +289,21 @@ goToMarkAndGeneralVerify('interface');
289289

290290
// from module in mod1
291291
goToMarkAndGeneralVerify('module');
292-
verify.completionListContains('m1X', 'number');
293-
verify.completionListContains('m1Func', '(): void');
294-
verify.completionListContains('m1Class', 'm1Class');
295-
verify.completionListContains('m1Int', 'm1Int');
296-
verify.completionListContains('m1Mod', 'm1Mod');
297-
verify.completionListContains('m1eX', 'number');
298-
verify.completionListContains('m1eFunc', '(): void');
299-
verify.completionListContains('m1eClass', 'm1eClass');
300-
verify.completionListContains('m1eInt', 'm1eInt');
301-
verify.completionListContains('m1eMod', 'm1eMod');
292+
verify.completionListContains('m1X', '(var) m1X: number');
293+
verify.completionListContains('m1Func', '(function) m1Func(): void');
294+
verify.completionListContains('m1Class', 'class m1Class');
295+
verify.completionListContains('m1Int', 'interface m1Int');
296+
verify.completionListContains('m1Mod', 'module m1Mod');
297+
verify.completionListContains('m1eX', '(var) mod1mod.m1eX: number');
298+
verify.completionListContains('m1eFunc', '(function) mod1mod.m1eFunc(): void');
299+
verify.completionListContains('m1eClass', 'class mod1mod.m1eClass');
300+
verify.completionListContains('m1eInt', 'interface mod1mod.m1eInt');
301+
verify.completionListContains('m1eMod', 'module mod1mod.m1eMod');
302302

303303
// from exported function in mod1
304304
goToMarkAndGeneralVerify('exportedFunction');
305-
verify.completionListContains('bar', 'number');
306-
verify.completionListContains('foob', '(): void');
305+
verify.completionListContains('bar', '(local var) bar: number');
306+
verify.completionListContains('foob', '(local function) foob(): void');
307307

308308
// from exported class in mod1
309309
goToMarkAndGeneralVerify('exportedClass');
@@ -315,31 +315,31 @@ goToMarkAndGeneralVerify('exportedInterface');
315315

316316
// from exported module in mod1
317317
goToMarkAndGeneralVerify('exportedModule');
318-
verify.completionListContains('mX', 'number');
319-
verify.completionListContains('mFunc', '(): void');
320-
verify.completionListContains('mClass', 'mClass');
321-
verify.completionListContains('mInt', 'mInt');
322-
verify.completionListContains('mMod', 'mMod');
323-
verify.completionListContains('meX', 'number');
324-
verify.completionListContains('meFunc', '(): void');
325-
verify.completionListContains('meClass', 'meClass');
326-
verify.completionListContains('meInt', 'meInt');
327-
verify.completionListContains('meMod', 'meMod');
318+
verify.completionListContains('mX', '(var) mX: number');
319+
verify.completionListContains('mFunc', '(function) mFunc(): void');
320+
verify.completionListContains('mClass', 'class mClass');
321+
verify.completionListContains('mInt', 'interface mInt');
322+
verify.completionListContains('mMod', 'module mMod');
323+
verify.completionListContains('meX', '(var) mod1.mod1emod.meX: number');
324+
verify.completionListContains('meFunc', '(function) mod1.mod1emod.meFunc(): void');
325+
verify.completionListContains('meClass', 'class mod1.mod1emod.meClass');
326+
verify.completionListContains('meInt', 'interface mod1.mod1emod.meInt');
327+
verify.completionListContains('meMod', 'module mod1.mod1emod.meMod');
328328

329329
// from extended module
330330
goTo.marker('extendedModule');
331-
verify.completionListContains('mod1evar', 'number');
332-
verify.completionListContains('mod1efn', '(): void');
333-
verify.completionListContains('mod1ecls', 'mod1ecls');
334-
verify.completionListContains('mod1eint', 'mod1eint');
335-
verify.completionListContains('mod1emod', 'mod1emod');
336-
verify.completionListContains('mod1eexvar', 'number');
337-
verify.completionListContains('mod2', 'mod2');
338-
verify.completionListContains('mod3', 'mod3');
339-
verify.completionListContains('shwvar', 'number');
340-
verify.completionListContains('shwfn', '(): void');
341-
verify.completionListContains('shwcls', 'shwcls');
342-
verify.completionListContains('shwint', 'shwint');
331+
verify.completionListContains('mod1evar', '(var) mod1.mod1evar: number');
332+
verify.completionListContains('mod1efn', '(function) mod1.mod1efn(): void');
333+
verify.completionListContains('mod1ecls', 'class mod1.mod1ecls');
334+
verify.completionListContains('mod1eint', 'interface mod1.mod1eint');
335+
verify.completionListContains('mod1emod', 'module mod1.mod1emod');
336+
verify.completionListContains('mod1eexvar', '(var) mod1.mod1eexvar: number');
337+
verify.completionListContains('mod2', 'module mod2');
338+
verify.completionListContains('mod3', 'module mod3');
339+
verify.completionListContains('shwvar', '(var) shwvar: number');
340+
verify.completionListContains('shwfn', '(function) shwfn(): void');
341+
verify.completionListContains('shwcls', 'class shwcls');
342+
verify.completionListContains('shwint', 'interface shwint');
343343

344344
verify.not.completionListContains('mod2var');
345345
verify.not.completionListContains('mod2fn');

tests/cases/fourslash_old/completionListWithModulesOutsideModuleScope.ts renamed to tests/cases/fourslash/completionListWithModulesOutsideModuleScope.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,22 +260,22 @@ function goToMarkAndGeneralVerify(marker: string)
260260

261261
// from global scope
262262
goToMarkAndGeneralVerify('global');
263-
verify.completionListContains('mod1', 'mod1');
264-
verify.completionListContains('mod2', 'mod2');
265-
verify.completionListContains('mod3', 'mod3');
266-
verify.completionListContains('shwvar', 'number');
267-
verify.completionListContains('shwfn', '(): void');
268-
verify.completionListContains('shwcls', 'shwcls');
269-
verify.completionListContains('shwint', 'shwint');
263+
verify.completionListContains('mod1', 'module mod1');
264+
verify.completionListContains('mod2', 'module mod2');
265+
verify.completionListContains('mod3', 'module mod3');
266+
verify.completionListContains('shwvar', '(var) shwvar: number');
267+
verify.completionListContains('shwfn', '(function) shwfn(): void');
268+
verify.completionListContains('shwcls', 'class shwcls');
269+
verify.completionListContains('shwint', 'interface shwint');
270270

271271
verifyNotContainFunctionMembers();
272272
verifyNotContainClassMembers();
273273
verifyNotContainInterfaceMembers();
274274

275275
// from function scope
276276
goToMarkAndGeneralVerify('function');
277-
verify.completionListContains('sfvar', 'number');
278-
verify.completionListContains('sffn', '(): void');
277+
verify.completionListContains('sfvar', '(local var) sfvar: number');
278+
verify.completionListContains('sffn', '(local function) sffn(): void');
279279

280280
verifyNotContainClassMembers();
281281
verifyNotContainInterfaceMembers();

tests/cases/fourslash_old/completionListWithModulesOutsideModuleScope2.ts renamed to tests/cases/fourslash/completionListWithModulesOutsideModuleScope2.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ function goToMarkerAndVerify(marker: string)
238238
verify.completionListContains('mod1');
239239
verify.completionListContains('mod2');
240240
verify.completionListContains('mod3');
241-
verify.completionListContains('shwvar', 'number');
242-
verify.completionListContains('shwfn', '(): void');
243-
verify.completionListContains('shwcls', 'shwcls');
244-
verify.completionListContains('shwint', 'shwint');
241+
verify.completionListContains('shwvar', '(var) shwvar: number');
242+
verify.completionListContains('shwfn', '(function) shwfn(): void');
243+
verify.completionListContains('shwcls', 'class shwcls');
244+
verify.completionListContains('shwint', 'interface shwint');
245245

246246
verify.not.completionListContains('mod2var');
247247
verify.not.completionListContains('mod2fn');
@@ -272,4 +272,4 @@ goToMarkerAndVerify('extendedClass');
272272
goToMarkerAndVerify('objectLiteral');
273273

274274
goTo.marker('localVar');
275-
verify.completionListContains('shwvar', 'string');
275+
verify.completionListContains('shwvar', '(local var) shwvar: string');

0 commit comments

Comments
 (0)