Merge branch 'master' into unionTypes

Conflicts:
	src/compiler/types.ts
	src/services/services.ts

tests/cases/fourslash/commentsExternalModules.ts

@@ -69,10 +69,10 @@ verify.memberListContains("i", "(var) m1.m2.i: m1.m2.c", "i");
 
 goTo.file("commentsExternalModules_file1.ts");
 goTo.marker('9');
-verify.quickInfoIs('(alias) extMod', "This is on import declaration");
+verify.quickInfoIs('import extMod = require("commentsExternalModules_file0")', "This is on import declaration");
 
 goTo.marker('10');
-verify.completionListContains("extMod", "(alias) extMod", "This is on import declaration");
+verify.completionListContains("extMod", 'import extMod = require("commentsExternalModules_file0")', "This is on import declaration");
 
 goTo.marker('11');
 verify.memberListContains("m1", "module extMod.m1");

tests/cases/fourslash/commentsImportDeclaration.ts

@@ -28,7 +28,7 @@ goTo.marker('2');
 verify.quickInfoIs("module m1", "ModuleComment");
 
 goTo.marker('3');
-verify.quickInfoIs("(alias) extMod", "Import declaration");
+verify.quickInfoIs('import extMod = require("commentsImportDeclaration_file0")', "Import declaration");
 
 goTo.marker('6');
 verify.memberListContains("m1", "module extMod.m1");

tests/cases/fourslash/completionListOnAliases.ts

@@ -9,7 +9,7 @@
 ////}
 
 goTo.marker("1");
-verify.memberListContains("x", "(alias) x", undefined);
+verify.memberListContains("x", "import x = M", undefined);
 
 goTo.marker("2");
 verify.memberListContains("value");

tests/cases/fourslash/exportEqualTypes.ts

@@ -15,7 +15,7 @@
 ////var /*3*/r2 = t./*4*/foo; // t should have 'foo' in dropdown list and be of type 'string'
 
 goTo.marker('1');
-verify.quickInfoIs('(alias) test');
+verify.quickInfoIs("import test = require('exportEqualTypes_file0')");
 goTo.marker('2');
 verify.quickInfoIs('(var) r1: Date');
 goTo.marker('3');

tests/cases/fourslash/externalModuleWithExportAssignment.ts

@@ -30,7 +30,7 @@
 
 goTo.file("externalModuleWithExportAssignment_file1.ts");
 goTo.marker('1');
-verify.quickInfoIs("(alias) a1");
+verify.quickInfoIs('import a1 = require("externalModuleWithExportAssignment_file0")');
 
 goTo.marker('2');
 verify.quickInfoIs("(var) a: {\n    (): a1.connectExport;\n    test1: a1.connectModule;\n    test2(): a1.connectModule;\n}", undefined);

tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts

@@ -19,7 +19,7 @@
 edit.insert('');
 
 goTo.marker('1');
-verify.quickInfoIs('(alias) Foo');
+verify.quickInfoIs("import Foo = require('mergedDeclarationsWithExportAssignment1_file0')");
 
 goTo.marker('2');
 verify.completionListContains('Foo');

tests/cases/fourslash/quickInfoOnArgumentsInsideFunction.ts

@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts'/>
+
+////function foo(x: string) {
+////    return /*1*/arguments;
+////}
+
+goTo.marker('1');
+verify.quickInfoIs('(local var) arguments: IArguments');

tests/cases/fourslash/quickInfoOnInternalAliases.ts

@@ -0,0 +1,59 @@
+/// <reference path='fourslash.ts' />
+
+/////** Module comment*/
+////export module m1 {
+////    /** m2 comments*/
+////    export module m2 {
+////        /** class comment;*/
+////        export class /*1*/c {
+////        };
+////    }
+////    export function foo() {
+////    }
+////}
+/////**This is on import declaration*/
+////import /*2*/internalAlias = m1.m2./*3*/c;
+////var /*4*/newVar = new /*5*/internalAlias();
+////var /*6*/anotherAliasVar = /*7*/internalAlias;
+////import /*8*/internalFoo = m1./*9*/foo;
+////var /*10*/callVar = /*11*/internalFoo();
+////var /*12*/anotherAliasFoo = /*13*/internalFoo;
+
+goTo.marker('1');
+verify.quickInfoIs("class m1.m2.c", "class comment;");
+
+goTo.marker('2');
+verify.quickInfoIs('import internalAlias = m1.m2.c', "This is on import declaration");
+
+goTo.marker('3');
+verify.quickInfoIs("class m1.m2.c", "class comment;");
+
+goTo.marker('4');
+verify.quickInfoIs("(var) newVar: internalAlias", "");
+
+goTo.marker('5');
+verify.quickInfoIs("(alias) new internalAlias(): internalAlias\nimport internalAlias = m1.m2.c", "");
+
+goTo.marker('6');
+verify.quickInfoIs("(var) anotherAliasVar: typeof internalAlias", "");
+
+goTo.marker('7');
+verify.quickInfoIs("import internalAlias = m1.m2.c", "This is on import declaration");
+
+goTo.marker('8');
+verify.quickInfoIs('import internalFoo = m1.foo', "");
+
+goTo.marker('9');
+verify.quickInfoIs("(function) m1.foo(): void", "");
+
+goTo.marker('10');
+verify.quickInfoIs("(var) callVar: void", "");
+
+goTo.marker('11');
+verify.quickInfoIs("(alias) internalFoo(): void\nimport internalFoo = m1.foo", "");
+
+goTo.marker('12');
+verify.quickInfoIs("(var) anotherAliasFoo: () => void", "");
+
+goTo.marker('13');
+verify.quickInfoIs("import internalFoo = m1.foo", "");

tests/cases/fourslash/quickInfoOnUndefined.ts

@@ -3,6 +3,13 @@
 ////function foo(a: string) {
 ////}
 ////foo(/*1*/undefined);
+////var x = {
+////    undefined: 10
+////};
+////x./*2*/undefined = 30;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) undefined');
+verify.quickInfoIs('(var) undefined');
+
+goTo.marker('2');
+verify.quickInfoIs('(property) undefined: number');

tests/cases/fourslash/selfReferencedExternalModule.ts

@@ -5,5 +5,5 @@
 ////A./**/I
 
 goTo.marker();
-verify.completionListContains("A", "(alias) A");
+verify.completionListContains("A", "import A = require('app')");
 verify.completionListContains("I", "(var) I: number");