Merge branch 'master' into disambiguating

tests/cases/compiler/aliasesInSystemModule1.ts

@@ -0,0 +1,18 @@
+// @module: system
+// @isolatedModules: true
+
+import alias = require('foo');
+import cls = alias.Class;
+export import cls2 = alias.Class;
+
+let x = new alias.Class();
+let y = new cls();
+let z = new cls2();
+
+module M {
+  export import cls = alias.Class;
+  let x = new alias.Class();
+  let y = new cls(); 
+  let z = new cls2();
+}
+  

tests/cases/compiler/aliasesInSystemModule2.ts

@@ -0,0 +1,17 @@
+// @module: system
+// @isolatedModules: true
+
+import {alias} from "foo";
+import cls = alias.Class;
+export import cls2 = alias.Class;
+
+let x = new alias.Class();
+let y = new cls();
+let z = new cls2();
+
+module M {
+  export import cls = alias.Class;
+  let x = new alias.Class();
+  let y = new cls(); 
+  let z = new cls2();
+}

tests/cases/compiler/classExtendsNull.ts

@@ -0,0 +1,12 @@
+class C extends null {
+    constructor() {
+        super();
+        return Object.create(null);
+    }
+}
+
+class D extends null {
+    constructor() {
+        return Object.create(null);
+    }
+}

tests/cases/compiler/constEnumMergingWithValues1.ts

@@ -0,0 +1,9 @@
+//@module: amd
+//@filename: m1.ts
+
+function foo() {}
+module foo {
+    const enum E { X }
+}
+
+export = foo

tests/cases/compiler/constEnumMergingWithValues2.ts

@@ -0,0 +1,9 @@
+//@module: amd
+//@filename: m1.ts
+
+class foo {}
+module foo {
+    const enum E { X }
+}
+
+export = foo

tests/cases/compiler/constEnumMergingWithValues3.ts

@@ -0,0 +1,9 @@
+//@module: amd
+//@filename: m1.ts
+
+enum foo { A }
+module foo {
+    const enum E { X }
+}
+
+export = foo

tests/cases/compiler/constEnumMergingWithValues4.ts

@@ -0,0 +1,13 @@
+//@module: amd
+//@filename: m1.ts
+
+module foo {
+    const enum E { X }
+}
+
+module foo {
+    var x = 1;
+}
+
+
+export = foo

tests/cases/compiler/constEnumMergingWithValues5.ts

@@ -0,0 +1,9 @@
+//@module: amd
+//@filename: m1.ts
+//@preserveConstEnums: true
+
+module foo {
+    const enum E { X }
+}
+
+export = foo

tests/cases/compiler/es5-commonjs.ts

@@ -0,0 +1,17 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}

tests/cases/compiler/es5-commonjs2.ts

@@ -0,0 +1,6 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default 1;

tests/cases/compiler/es5-commonjs3.ts

@@ -0,0 +1,7 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default "test";
+export var __esModule = 1;

tests/cases/compiler/es5-commonjs4.ts

@@ -0,0 +1,18 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
+export var __esModule = 1;

tests/cases/compiler/es5-commonjs5.ts

@@ -0,0 +1,8 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default function () {
+	return "test";
+}

tests/cases/compiler/es5-commonjs6.ts

@@ -0,0 +1,7 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default "test";
+var __esModule = 1;

tests/cases/compiler/es5-system.ts

@@ -0,0 +1,17 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: system
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}

tests/cases/compiler/isolatedModulesSourceMap.ts

@@ -3,4 +3,4 @@
 // @target: es6
 
 // @filename: file1.ts
-export var x;
+export var x = 1;

tests/cases/compiler/jsxImportInAttribute.tsx

@@ -0,0 +1,14 @@
+//@jsx: preserve
+//@module: commonjs
+
+//@filename: component.d.ts
+declare module "Test" {
+	export default class Text { }
+}
+
+//@filename: consumer.tsx
+/// <reference path="component.d.ts" />
+import Test from 'Test';
+
+let x = Test; // emit test_1.default
+<anything attr={Test} />; // ?

tests/cases/compiler/jsxViaImport.tsx

@@ -0,0 +1,23 @@
+//@jsx: preserve
+//@module: commonjs
+
+//@filename: component.d.ts
+declare module JSX {
+  interface ElementAttributesProperty { props; }
+}
+declare module React {
+  class Component<T, U> { }
+}
+declare module "BaseComponent" {
+    var base: React.Component<any, {}>;
+    export = base;
+}
+
+//@filename: consumer.tsx
+/// <reference path="component.d.ts" />
+import BaseComponent = require('BaseComponent');
+class TestComponent extends React.Component<any, {}> {
+    render() {
+        return <BaseComponent />;
+    }
+}

tests/cases/compiler/underscoreTest1.ts

@@ -383,6 +383,7 @@ module Underscore {
         evaluate?: RegExp;
         interpolate?: RegExp;
         escape?: RegExp;
+        variable?: string;
     }
 
     export interface Static {