maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'release-2.0' into release-2.0_fix10625

Browse source
This commit is contained in:
Mohamed Hegazy 2016-09-14 13:36:07 -07:00
parent 14b59b23e7 0c443c2569
commit 9cabffe5db
7 changed files with 117 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/tsc.js
View file

@ -13414,6 +13414,7 @@ var ts;
var assignableRelation = ts.createMap();
var comparableRelation = ts.createMap();
var identityRelation = ts.createMap();
var enumRelation = ts.createMap();
var _displayBuilder;
var builtinGlobals = ts.createMap();
builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
@ -18129,8 +18130,14 @@ var ts;
if (source === target) {
return true;
}
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256) || !(target.symbol.flags & 256)) {
return false;
var id = source.id + "," + target.id;
if (enumRelation[id] !== undefined) {
return enumRelation[id];
}
if (source.symbol.name !== target.symbol.name ||
!(source.symbol.flags & 256) || !(target.symbol.flags & 256) ||
(source.flags & 524288) !== (target.flags & 524288)) {
return enumRelation[id] = false;
}
var targetEnumType = getTypeOfSymbol(target.symbol);
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@ -18141,11 +18148,11 @@ var ts;
if (errorReporter) {
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
}
return false;
return enumRelation[id] = false;
}
}
}
return true;
return enumRelation[id] = true;
}
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
if (target.flags & 8192)
@ -18169,10 +18176,19 @@ var ts;
if (relation === assignableRelation || relation === comparableRelation) {
if (source.flags & 1)
return true;
if (source.flags & (4 | 64) && target.flags & 16)
if ((source.flags & 4 | source.flags & 64) && target.flags & 272)
return true;
if (source.flags & 64 && target.flags & 256 && source.text === target.text)
if (source.flags & 256 &&
target.flags & 256 &&
source.text === target.text &&
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
return true;
}
if (source.flags & 256 &&
target.flags & 16 &&
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
return true;
}
}
return false;
}
@ -36543,7 +36559,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.0.2";
ts.version = "2.0.3";
var emptyArray = [];
function findConfigFile(searchPath, fileExists) {
while (true) {

30
lib/tsserver.js
View file

@ -14410,6 +14410,7 @@ var ts;
var assignableRelation = ts.createMap();
var comparableRelation = ts.createMap();
var identityRelation = ts.createMap();
var enumRelation = ts.createMap();
var _displayBuilder;
var builtinGlobals = ts.createMap();
builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
@ -19125,8 +19126,14 @@ var ts;
if (source === target) {
return true;
}
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256) || !(target.symbol.flags & 256)) {
return false;
var id = source.id + "," + target.id;
if (enumRelation[id] !== undefined) {
return enumRelation[id];
}
if (source.symbol.name !== target.symbol.name ||
!(source.symbol.flags & 256) || !(target.symbol.flags & 256) ||
(source.flags & 524288) !== (target.flags & 524288)) {
return enumRelation[id] = false;
}
var targetEnumType = getTypeOfSymbol(target.symbol);
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@ -19137,11 +19144,11 @@ var ts;
if (errorReporter) {
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
}
return false;
return enumRelation[id] = false;
}
}
}
return true;
return enumRelation[id] = true;
}
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
if (target.flags & 8192)
@ -19165,10 +19172,19 @@ var ts;
if (relation === assignableRelation || relation === comparableRelation) {
if (source.flags & 1)
return true;
if (source.flags & (4 | 64) && target.flags & 16)
if ((source.flags & 4 | source.flags & 64) && target.flags & 272)
return true;
if (source.flags & 64 && target.flags & 256 && source.text === target.text)
if (source.flags & 256 &&
target.flags & 256 &&
source.text === target.text &&
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
return true;
}
if (source.flags & 256 &&
target.flags & 16 &&
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
return true;
}
}
return false;
}
@ -37539,7 +37555,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.0.2";
ts.version = "2.0.3";
var emptyArray = [];
function findConfigFile(searchPath, fileExists) {
while (true) {

30
lib/tsserverlibrary.js
View file

@ -14410,6 +14410,7 @@ var ts;
var assignableRelation = ts.createMap();
var comparableRelation = ts.createMap();
var identityRelation = ts.createMap();
var enumRelation = ts.createMap();
var _displayBuilder;
var builtinGlobals = ts.createMap();
builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
@ -19125,8 +19126,14 @@ var ts;
if (source === target) {
return true;
}
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256) || !(target.symbol.flags & 256)) {
return false;
var id = source.id + "," + target.id;
if (enumRelation[id] !== undefined) {
return enumRelation[id];
}
if (source.symbol.name !== target.symbol.name ||
!(source.symbol.flags & 256) || !(target.symbol.flags & 256) ||
(source.flags & 524288) !== (target.flags & 524288)) {
return enumRelation[id] = false;
}
var targetEnumType = getTypeOfSymbol(target.symbol);
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@ -19137,11 +19144,11 @@ var ts;
if (errorReporter) {
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
}
return false;
return enumRelation[id] = false;
}
}
}
return true;
return enumRelation[id] = true;
}
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
if (target.flags & 8192)
@ -19165,10 +19172,19 @@ var ts;
if (relation === assignableRelation || relation === comparableRelation) {
if (source.flags & 1)
return true;
if (source.flags & (4 | 64) && target.flags & 16)
if ((source.flags & 4 | source.flags & 64) && target.flags & 272)
return true;
if (source.flags & 64 && target.flags & 256 && source.text === target.text)
if (source.flags & 256 &&
target.flags & 256 &&
source.text === target.text &&
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
return true;
}
if (source.flags & 256 &&
target.flags & 16 &&
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
return true;
}
}
return false;
}
@ -37539,7 +37555,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.0.2";
ts.version = "2.0.3";
var emptyArray = [];
function findConfigFile(searchPath, fileExists) {
while (true) {

30
lib/typescript.js
View file

@ -16791,6 +16791,7 @@ var ts;
var assignableRelation = ts.createMap();
var comparableRelation = ts.createMap();
var identityRelation = ts.createMap();
var enumRelation = ts.createMap();
// This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
var _displayBuilder;
var TypeSystemPropertyName;
@ -22135,8 +22136,14 @@ var ts;
if (source === target) {
return true;
}
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */)) {
return false;
var id = source.id + "," + target.id;
if (enumRelation[id] !== undefined) {
return enumRelation[id];
}
if (source.symbol.name !== target.symbol.name ||
!(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */) ||
(source.flags & 524288 /* Union */) !== (target.flags & 524288 /* Union */)) {
return enumRelation[id] = false;
}
var targetEnumType = getTypeOfSymbol(target.symbol);
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@ -22147,11 +22154,11 @@ var ts;
if (errorReporter) {
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */));
}
return false;
return enumRelation[id] = false;
}
}
}
return true;
return enumRelation[id] = true;
}
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
if (target.flags & 8192 /* Never */)
@ -22175,10 +22182,19 @@ var ts;
if (relation === assignableRelation || relation === comparableRelation) {
if (source.flags & 1 /* Any */)
return true;
if (source.flags & (4 /* Number */ | 64 /* NumberLiteral */) && target.flags & 16 /* Enum */)
if ((source.flags & 4 /* Number */ | source.flags & 64 /* NumberLiteral */) && target.flags & 272 /* EnumLike */)
return true;
if (source.flags & 64 /* NumberLiteral */ && target.flags & 256 /* EnumLiteral */ && source.text === target.text)
if (source.flags & 256 /* EnumLiteral */ &&
target.flags & 256 /* EnumLiteral */ &&
source.text === target.text &&
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
return true;
}
if (source.flags & 256 /* EnumLiteral */ &&
target.flags & 16 /* Enum */ &&
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
return true;
}
}
return false;
}
@ -43950,7 +43966,7 @@ var ts;
var ts;
(function (ts) {
/** The version of the TypeScript compiler release */
ts.version = "2.0.2";
ts.version = "2.0.3";
var emptyArray = [];
function findConfigFile(searchPath, fileExists) {
while (true) {

30
lib/typescriptServices.js
View file

@ -16791,6 +16791,7 @@ var ts;
var assignableRelation = ts.createMap();
var comparableRelation = ts.createMap();
var identityRelation = ts.createMap();
var enumRelation = ts.createMap();
// This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
var _displayBuilder;
var TypeSystemPropertyName;
@ -22135,8 +22136,14 @@ var ts;
if (source === target) {
return true;
}
if (source.symbol.name !== target.symbol.name || !(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */)) {
return false;
var id = source.id + "," + target.id;
if (enumRelation[id] !== undefined) {
return enumRelation[id];
}
if (source.symbol.name !== target.symbol.name ||
!(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */) ||
(source.flags & 524288 /* Union */) !== (target.flags & 524288 /* Union */)) {
return enumRelation[id] = false;
}
var targetEnumType = getTypeOfSymbol(target.symbol);
for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
@ -22147,11 +22154,11 @@ var ts;
if (errorReporter) {
errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */));
}
return false;
return enumRelation[id] = false;
}
}
}
return true;
return enumRelation[id] = true;
}
function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
if (target.flags & 8192 /* Never */)
@ -22175,10 +22182,19 @@ var ts;
if (relation === assignableRelation || relation === comparableRelation) {
if (source.flags & 1 /* Any */)
return true;
if (source.flags & (4 /* Number */ | 64 /* NumberLiteral */) && target.flags & 16 /* Enum */)
if ((source.flags & 4 /* Number */ | source.flags & 64 /* NumberLiteral */) && target.flags & 272 /* EnumLike */)
return true;
if (source.flags & 64 /* NumberLiteral */ && target.flags & 256 /* EnumLiteral */ && source.text === target.text)
if (source.flags & 256 /* EnumLiteral */ &&
target.flags & 256 /* EnumLiteral */ &&
source.text === target.text &&
isEnumTypeRelatedTo(source.baseType, target.baseType, errorReporter)) {
return true;
}
if (source.flags & 256 /* EnumLiteral */ &&
target.flags & 16 /* Enum */ &&
isEnumTypeRelatedTo(target, source.baseType, errorReporter)) {
return true;
}
}
return false;
}
@ -43950,7 +43966,7 @@ var ts;
var ts;
(function (ts) {
/** The version of the TypeScript compiler release */
ts.version = "2.0.2";
ts.version = "2.0.3";
var emptyArray = [];
function findConfigFile(searchPath, fileExists) {
while (true) {

2
package.json
View file

@ -2,7 +2,7 @@
"name": "typescript",
"author": "Microsoft Corp.",
"homepage": "http://typescriptlang.org/",
"version": "2.0.2",
"version": "2.0.3",
"license": "Apache-2.0",
"description": "TypeScript is a language for application scale JavaScript development",
"keywords": [

2
src/compiler/program.ts
View file

@ -5,7 +5,7 @@
namespace ts {
/** The version of the TypeScript compiler release */
export const version = "2.0.2";
export const version = "2.0.3";
const emptyArray: any[] = [];