Merge branch 'master' into exportDefaultType

Conflicts:
	src/compiler/checker.ts
This commit is contained in:
Mohamed Hegazy
2015-03-15 14:23:40 -07:00
59 changed files with 13641 additions and 27118 deletions

View File

@@ -0,0 +1,15 @@
// @target: es5
let parent = true;
const parent2 = true;
declare function use(a: any);
function a() {
let parent = 1;
const parent2 = 2;
function b(parent: string, parent2: number) {
use(parent);
use(parent2);
}
}

View File

@@ -0,0 +1,2 @@
let [x] = [1];
let {a: y} = {a: 1};

View File

@@ -0,0 +1,10 @@
if (true) {
let x;
if (true) {
var x = 0; // Error
var { x = 0 } = { x: 0 }; // Error
var { x: x = 0 } = { x: 0 }; // Error
var { x } = { x: 0 }; // Error
var { x: x } = { x: 0 }; // Error
}
}

View File

@@ -0,0 +1,24 @@
/// <reference path="fourslash.ts" />
// @Filename: a.ts
//// {| "itemName": "default", "kind": "class", "parentName": "" |}export default class { }
// @Filename: b.ts
//// {| "itemName": "C", "kind": "class", "parentName": "" |}export default class C { }
// @Filename: c.ts
//// {| "itemName": "default", "kind": "function", "parentName": "" |}export default function { }
// @Filename: d.ts
//// {| "itemName": "Func", "kind": "function", "parentName": "" |}export default function Func { }
test.markers().forEach(marker => {
goTo.file(marker.fileName);
verify.getScriptLexicalStructureListContains(
marker.data.itemName,
marker.data.kind,
marker.fileName,
marker.data.parentName,
marker.data.isAdditionalRange,
marker.position);
});