Merge branch 'master' into getReferences

mhegazy · mhegazy · commit 0f9c1adcd898 · 2014-08-27T16:21:16.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2238,6 +2238,7 @@ module ts {
                 return emptyObjectType;
             }
             var type = getDeclaredTypeOfSymbol(symbol);
+            var name = symbol.name;
             if (!(type.flags & TypeFlags.ObjectType)) {
                 error(getTypeDeclaration(symbol), Diagnostics.Global_type_0_must_be_a_class_or_interface_type, name);
                 return emptyObjectType;
diff --git a/tests/baselines/reference/noDefaultLib.errors.txt b/tests/baselines/reference/noDefaultLib.errors.txt
@@ -0,0 +1,15 @@
+!!! Cannot find global type 'Boolean'.
+!!! Cannot find global type 'IArguments'.
+==== tests/cases/compiler/noDefaultLib.ts (1 errors) ====
+    /// <reference no-default-lib="true"/>
+    var x;
+    
+    interface Array {}
+              ~~~~~
+!!! Global type 'Array' must have 1 type parameter(s).
+    interface String {}
+    interface Number {}
+    interface Object {}
+    interface Date {}
+    interface Function {}
+    interface RegExp {}
diff --git a/tests/baselines/reference/noDefaultLib.js b/tests/baselines/reference/noDefaultLib.js
@@ -0,0 +1,15 @@
+//// [noDefaultLib.ts]
+/// <reference no-default-lib="true"/>
+var x;
+
+interface Array {}
+interface String {}
+interface Number {}
+interface Object {}
+interface Date {}
+interface Function {}
+interface RegExp {}
+
+//// [noDefaultLib.js]
+/// <reference no-default-lib="true"/>
+var x;
diff --git a/tests/cases/compiler/noDefaultLib.ts b/tests/cases/compiler/noDefaultLib.ts
@@ -0,0 +1,10 @@
+/// <reference no-default-lib="true"/>
+var x;
+
+interface Array {}
+interface String {}
+interface Number {}
+interface Object {}
+interface Date {}
+interface Function {}
+interface RegExp {}
diff --git a/tests/cases/fourslash/scriptLexicalStructureItems2.ts b/tests/cases/fourslash/scriptLexicalStructureItems2.ts
@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts"/>
+
+
+/////**/
+
+goTo.marker();
+edit.insertLine("module A");
+edit.insert("export class ");
+
+// should not crash
+verify.getScriptLexicalStructureListCount(1);
+

Original file line number	Diff line number	Diff line change
`@@ -2238,6 +2238,7 @@ module ts {`
`2238`	`2238`	`return emptyObjectType;`
`2239`	`2239`	`}`
`2240`	`2240`	`var type = getDeclaredTypeOfSymbol(symbol);`
	`2241`	`+ var name = symbol.name;`
`2241`	`2242`	`if (!(type.flags & TypeFlags.ObjectType)) {`
`2242`	`2243`	`error(getTypeDeclaration(symbol), Diagnostics.Global_type_0_must_be_a_class_or_interface_type, name);`
`2243`	`2244`	`return emptyObjectType;`