Enabling more test cases

Author: sheetalkamat

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

@@ -3,7 +3,7 @@
 ////module A {
 ////    /*var*/
 ////}
-////module A/*check*/ {
+////module /*check*/A {
 ////    var p;
 ////}
 

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

@@ -2,36 +2,36 @@
 
 ////var a = { name: 'bob', age: 18 };
 ////var b = { name: 'jim', age: 20 };
-////var c/*1*/ = [a, b];
+////var /*1*/c = [a, b];
 
 ////var a1 = { name: 'bob', age: 18 };
 ////var b1 = { name: 'jim', age: 20, dob: new Date() };
-////var c1/*2*/ = [a1, b1];
+////var /*2*/c1 = [a1, b1];
 
 ////var a2 = { name: 'bob', age: 18, address: 'springfield' };
 ////var b2 = { name: 'jim', age: 20, dob: new Date() };
-////var c2/*3*/ = [a2, b2];
-////var c2a/*4*/ = [a2, b2, a1];
+////var /*3*/c2 = [a2, b2];
+////var /*4*/c2a = [a2, b2, a1];
 
 ////interface I {
 ////    name: string;
 ////    age: number;
 ////}
 
 ////var i: I;
-////var c3/*5*/ = [a2, b2, i];
+////var /*5*/c3 = [a2, b2, i];
 
 goTo.marker('1');
-verify.quickInfoIs('{ name: string; age: number; }[]');
+verify.quickInfoIs('(var) c: {\n    name: string;\n    age: number;\n}[]');
 
 goTo.marker('2');
-verify.quickInfoIs('{ name: string; age: number; }[]');
+verify.quickInfoIs('(var) c1: {\n    name: string;\n    age: number;\n}[]');
 
 goTo.marker('3');
-verify.quickInfoIs('{}[]');
+verify.quickInfoIs('(var) c2: {}[]');
 
 goTo.marker('4');
-verify.quickInfoIs('{ name: string; age: number; }[]');
+verify.quickInfoIs('(var) c2a: {\n    name: string;\n    age: number;\n}[]');
 
 goTo.marker('5');
-verify.quickInfoIs('I[]');
+verify.quickInfoIs('(var) c3: I[]');

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

@@ -8,8 +8,8 @@
 ////module C {
 ////    export function f(x: typeof C) {
 ////        x./*1*/
-////        var r/*3*/ = new /*2*/x<number>();
-////        var r2/*5*/ = r./*4*/
+////        var /*3*/r = new /*2*/x<number>();
+////        var /*5*/r2 = r./*4*/
 ////        return typeof r;
 ////    }
 ////}
@@ -27,13 +27,13 @@ goTo.marker('2');
 verify.completionListContains('x');
 
 goTo.marker('3');
-verify.quickInfoIs('C<number>');
+verify.quickInfoIs('(local var) r: C<number>');
 
 goTo.marker('4');
 verify.completionListContains('x');
 edit.insert('x;');
 
 goTo.marker('5');
-verify.quickInfoIs('number');
+verify.quickInfoIs('(local var) r2: number');
 
 verify.numberOfErrorsInCurrentFile(0);

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

@@ -5,13 +5,13 @@
 ////        foo() { }
 ////    }
 ////    export module C {
-////    export var C/**/ = M.C
+////    export var /**/C = M.C
 ////  }
 ////}
 
 // this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
 edit.insert('');
 
 goTo.marker();
-verify.quickInfoIs('typeof C');
+verify.quickInfoIs('(var) M.C.C: typeof M.C');
 verify.numberOfErrorsInCurrentFile(0);

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

@@ -261,15 +261,8 @@ function sharedNegativeVerify()
     verify.not.completionListContains('mod2eexvar');
 }
 
-function goToMarkAndVerifyShadow(marker: string)
+function goToMarkAndVerifyShadow()
 {
-    goTo.marker(marker);
-
-    verify.completionListContains('shwvar', 'string');
-    verify.completionListContains('shwfn', '(shadow: any): void');
-    verify.completionListContains('shwcls', 'shwcls');
-    verify.completionListContains('shwint', 'shwint');
-
     sharedNegativeVerify();
     verify.not.completionListContains('mod2var');
     verify.not.completionListContains('mod2fn');
@@ -284,20 +277,30 @@ function goToMarkAndVerifyShadow(marker: string)
 }
 
 // from a shadow module with no export
-goToMarkAndVerifyShadow('shadowModuleWithNoExport');
+goTo.marker('shadowModuleWithNoExport');
+verify.completionListContains('shwvar', '(var) shwvar: string');
+verify.completionListContains('shwfn', '(function) shwfn(shadow: any): void');
+verify.completionListContains('shwcls', 'class shwcls');
+verify.completionListContains('shwint', 'interface shwint');
+goToMarkAndVerifyShadow();
 
 // from a shadow module with export
-goToMarkAndVerifyShadow('shadowModuleWithExport');
+goTo.marker('shadowModuleWithExport');
+verify.completionListContains('shwvar', '(var) mod4.shwvar: string');
+verify.completionListContains('shwfn', '(function) mod4.shwfn(shadow: any): void');
+verify.completionListContains('shwcls', 'class mod4.shwcls');
+verify.completionListContains('shwint', 'interface mod4.shwint');
+goToMarkAndVerifyShadow();
 
 // from a modlue with import
 goTo.marker('moduleWithImport');
-verify.completionListContains('mod1', 'mod1');
-verify.completionListContains('mod2', 'mod2');
-verify.completionListContains('mod3', 'mod3');
-verify.completionListContains('shwvar', 'number');
-verify.completionListContains('shwfn', '(): void');
-verify.completionListContains('shwcls', 'shwcls');
-verify.completionListContains('shwint', 'shwint');
+verify.completionListContains('mod1', 'module mod1');
+verify.completionListContains('mod2', 'module mod2');
+verify.completionListContains('mod3', 'module mod3');
+verify.completionListContains('shwvar', '(var) shwvar: number');
+verify.completionListContains('shwfn', '(function) shwfn(): void');
+verify.completionListContains('shwcls', 'class shwcls');
+verify.completionListContains('shwint', 'interface shwint');
 
 sharedNegativeVerify();
 

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

@@ -229,23 +229,23 @@ function goToMarkAndGeneralVerify(marker: string)
 {
     goTo.marker(marker);
 
-    verify.completionListContains('mod1var', 'number');
-    verify.completionListContains('mod1fn', '(): void');
-    verify.completionListContains('mod1cls', 'mod1cls');
-    verify.completionListContains('mod1int', 'mod1int');
-    verify.completionListContains('mod1mod', 'mod1mod');
-    verify.completionListContains('mod1evar', 'number');
-    verify.completionListContains('mod1efn', '(): void');
-    verify.completionListContains('mod1ecls', 'mod1ecls');
-    verify.completionListContains('mod1eint', 'mod1eint');
-    verify.completionListContains('mod1emod', 'mod1emod');
-    verify.completionListContains('mod1eexvar', 'number');
-    verify.completionListContains('mod2', 'mod2');
-    verify.completionListContains('mod3', 'mod3');
-    verify.completionListContains('shwvar', 'number');
-    verify.completionListContains('shwfn', '(): void');
-    verify.completionListContains('shwcls', 'shwcls');
-    verify.completionListContains('shwint', 'shwint');
+    verify.completionListContains('mod1var', '(var) mod1var: number');
+    verify.completionListContains('mod1fn', '(function) mod1fn(): void');
+    verify.completionListContains('mod1cls', 'class mod1cls');
+    verify.completionListContains('mod1int', 'interface mod1int');
+    verify.completionListContains('mod1mod', 'module mod1mod');
+    verify.completionListContains('mod1evar', '(var) mod1.mod1evar: number');
+    verify.completionListContains('mod1efn', '(function) mod1.mod1efn(): void');
+    verify.completionListContains('mod1ecls', 'class mod1.mod1ecls');
+    verify.completionListContains('mod1eint', 'interface mod1.mod1eint');
+    verify.completionListContains('mod1emod', 'module mod1.mod1emod');
+    verify.completionListContains('mod1eexvar', '(var) mod1.mod1eexvar: number');
+    verify.completionListContains('mod2', 'module mod2');
+    verify.completionListContains('mod3', 'module mod3');
+    verify.completionListContains('shwvar', '(var) shwvar: number');
+    verify.completionListContains('shwfn', '(function) shwfn(): void');
+    verify.completionListContains('shwcls', 'class shwcls');
+    verify.completionListContains('shwint', 'interface shwint');
 
     verify.not.completionListContains('mod2var');
     verify.not.completionListContains('mod2fn');
@@ -276,8 +276,8 @@ goToMarkAndGeneralVerify('mod1');
 
 // from function in mod1
 goToMarkAndGeneralVerify('function');
-verify.completionListContains('bar', 'number');
-verify.completionListContains('foob', '(): void');
+verify.completionListContains('bar', '(local var) bar: number');
+verify.completionListContains('foob', '(local function) foob(): void');
 
 // from class in mod1
 goToMarkAndGeneralVerify('class');
@@ -289,21 +289,21 @@ goToMarkAndGeneralVerify('interface');
 
 // from module in mod1
 goToMarkAndGeneralVerify('module');
-verify.completionListContains('m1X', 'number');
-verify.completionListContains('m1Func', '(): void');
-verify.completionListContains('m1Class', 'm1Class');
-verify.completionListContains('m1Int', 'm1Int');
-verify.completionListContains('m1Mod', 'm1Mod');
-verify.completionListContains('m1eX', 'number');
-verify.completionListContains('m1eFunc', '(): void');
-verify.completionListContains('m1eClass', 'm1eClass');
-verify.completionListContains('m1eInt', 'm1eInt');
-verify.completionListContains('m1eMod', 'm1eMod');
+verify.completionListContains('m1X', '(var) m1X: number');
+verify.completionListContains('m1Func', '(function) m1Func(): void');
+verify.completionListContains('m1Class', 'class m1Class');
+verify.completionListContains('m1Int', 'interface m1Int');
+verify.completionListContains('m1Mod', 'module m1Mod');
+verify.completionListContains('m1eX', '(var) mod1mod.m1eX: number');
+verify.completionListContains('m1eFunc', '(function) mod1mod.m1eFunc(): void');
+verify.completionListContains('m1eClass', 'class mod1mod.m1eClass');
+verify.completionListContains('m1eInt', 'interface mod1mod.m1eInt');
+verify.completionListContains('m1eMod', 'module mod1mod.m1eMod');
 
 // from exported function in mod1
 goToMarkAndGeneralVerify('exportedFunction');
-verify.completionListContains('bar', 'number');
-verify.completionListContains('foob', '(): void');
+verify.completionListContains('bar', '(local var) bar: number');
+verify.completionListContains('foob', '(local function) foob(): void');
 
 // from exported class in mod1
 goToMarkAndGeneralVerify('exportedClass');
@@ -315,31 +315,31 @@ goToMarkAndGeneralVerify('exportedInterface');
 
 // from exported module in mod1
 goToMarkAndGeneralVerify('exportedModule');
-verify.completionListContains('mX', 'number');
-verify.completionListContains('mFunc', '(): void');
-verify.completionListContains('mClass', 'mClass');
-verify.completionListContains('mInt', 'mInt');
-verify.completionListContains('mMod', 'mMod');
-verify.completionListContains('meX', 'number');
-verify.completionListContains('meFunc', '(): void');
-verify.completionListContains('meClass', 'meClass');
-verify.completionListContains('meInt', 'meInt');
-verify.completionListContains('meMod', 'meMod');
+verify.completionListContains('mX', '(var) mX: number');
+verify.completionListContains('mFunc', '(function) mFunc(): void');
+verify.completionListContains('mClass', 'class mClass');
+verify.completionListContains('mInt', 'interface mInt');
+verify.completionListContains('mMod', 'module mMod');
+verify.completionListContains('meX', '(var) mod1.mod1emod.meX: number');
+verify.completionListContains('meFunc', '(function) mod1.mod1emod.meFunc(): void');
+verify.completionListContains('meClass', 'class mod1.mod1emod.meClass');
+verify.completionListContains('meInt', 'interface mod1.mod1emod.meInt');
+verify.completionListContains('meMod', 'module mod1.mod1emod.meMod');
 
 // from extended module
 goTo.marker('extendedModule');
-verify.completionListContains('mod1evar', 'number');
-verify.completionListContains('mod1efn', '(): void');
-verify.completionListContains('mod1ecls', 'mod1ecls');
-verify.completionListContains('mod1eint', 'mod1eint');
-verify.completionListContains('mod1emod', 'mod1emod');
-verify.completionListContains('mod1eexvar', 'number');
-verify.completionListContains('mod2', 'mod2');
-verify.completionListContains('mod3', 'mod3');
-verify.completionListContains('shwvar', 'number');
-verify.completionListContains('shwfn', '(): void');
-verify.completionListContains('shwcls', 'shwcls');
-verify.completionListContains('shwint', 'shwint');
+verify.completionListContains('mod1evar', '(var) mod1.mod1evar: number');
+verify.completionListContains('mod1efn', '(function) mod1.mod1efn(): void');
+verify.completionListContains('mod1ecls', 'class mod1.mod1ecls');
+verify.completionListContains('mod1eint', 'interface mod1.mod1eint');
+verify.completionListContains('mod1emod', 'module mod1.mod1emod');
+verify.completionListContains('mod1eexvar', '(var) mod1.mod1eexvar: number');
+verify.completionListContains('mod2', 'module mod2');
+verify.completionListContains('mod3', 'module mod3');
+verify.completionListContains('shwvar', '(var) shwvar: number');
+verify.completionListContains('shwfn', '(function) shwfn(): void');
+verify.completionListContains('shwcls', 'class shwcls');
+verify.completionListContains('shwint', 'interface shwint');
 
 verify.not.completionListContains('mod2var');
 verify.not.completionListContains('mod2fn');

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

@@ -260,22 +260,22 @@ function goToMarkAndGeneralVerify(marker: string)
 
 // from global scope
 goToMarkAndGeneralVerify('global');
-verify.completionListContains('mod1', 'mod1');
-verify.completionListContains('mod2', 'mod2');
-verify.completionListContains('mod3', 'mod3');
-verify.completionListContains('shwvar', 'number');
-verify.completionListContains('shwfn', '(): void');
-verify.completionListContains('shwcls', 'shwcls');
-verify.completionListContains('shwint', 'shwint');
+verify.completionListContains('mod1', 'module mod1');
+verify.completionListContains('mod2', 'module mod2');
+verify.completionListContains('mod3', 'module mod3');
+verify.completionListContains('shwvar', '(var) shwvar: number');
+verify.completionListContains('shwfn', '(function) shwfn(): void');
+verify.completionListContains('shwcls', 'class shwcls');
+verify.completionListContains('shwint', 'interface shwint');
 
 verifyNotContainFunctionMembers();
 verifyNotContainClassMembers();
 verifyNotContainInterfaceMembers();
 
 // from function scope
 goToMarkAndGeneralVerify('function');
-verify.completionListContains('sfvar', 'number');
-verify.completionListContains('sffn', '(): void');
+verify.completionListContains('sfvar', '(local var) sfvar: number');
+verify.completionListContains('sffn', '(local function) sffn(): void');
 
 verifyNotContainClassMembers();
 verifyNotContainInterfaceMembers();

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

@@ -238,10 +238,10 @@ function goToMarkerAndVerify(marker: string)
     verify.completionListContains('mod1');
     verify.completionListContains('mod2');
     verify.completionListContains('mod3');
-    verify.completionListContains('shwvar', 'number');
-    verify.completionListContains('shwfn', '(): void');
-    verify.completionListContains('shwcls', 'shwcls');
-    verify.completionListContains('shwint', 'shwint');
+    verify.completionListContains('shwvar', '(var) shwvar: number');
+    verify.completionListContains('shwfn', '(function) shwfn(): void');
+    verify.completionListContains('shwcls', 'class shwcls');
+    verify.completionListContains('shwint', 'interface shwint');
 
     verify.not.completionListContains('mod2var');
     verify.not.completionListContains('mod2fn');
@@ -272,4 +272,4 @@ goToMarkerAndVerify('extendedClass');
 goToMarkerAndVerify('objectLiteral');
 
 goTo.marker('localVar');
-verify.completionListContains('shwvar', 'string');
+verify.completionListContains('shwvar', '(local var) shwvar: string');