microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Update LKG

Browse Source
This commit is contained in:
Mohamed Hegazy 2018-05-15 12:57:26 -07:00
parent acd7f81d0e
commit c59ea304bc
5 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/tsc.js
View File

@ -21050,6 +21050,8 @@ var ts;
function mergeSymbol(target, source) {
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
(source.flags | target.flags) & 67108864) {
var targetValueDeclaration = target.valueDeclaration;
ts.Debug.assert(!!(target.flags & 33554432));
if (source.flags & 512 && target.flags & 512 && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
target.constEnumOnlyModule = false;
}
@ -21072,12 +21074,13 @@ var ts;
}
if ((source.flags | target.flags) & 67108864) {
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
var targetInitializer = init && init.symbol ? init.symbol : target;
if (!(targetInitializer.flags & 33554432)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}

13
lib/tsserver.js
View File

@ -22486,6 +22486,8 @@ var ts;
function mergeSymbol(target, source) {
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
(source.flags | target.flags) & 67108864) {
var targetValueDeclaration = target.valueDeclaration;
ts.Debug.assert(!!(target.flags & 33554432));
if (source.flags & 512 && target.flags & 512 && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
target.constEnumOnlyModule = false;
}
@ -22508,12 +22510,13 @@ var ts;
}
if ((source.flags | target.flags) & 67108864) {
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
var targetInitializer = init && init.symbol ? init.symbol : target;
if (!(targetInitializer.flags & 33554432)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}

13
lib/tsserverlibrary.js
View File

@ -28241,6 +28241,8 @@ var ts;
function mergeSymbol(target, source) {
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
(source.flags | target.flags) & 67108864 /* JSContainer */) {
var targetValueDeclaration = target.valueDeclaration;
ts.Debug.assert(!!(target.flags & 33554432 /* Transient */));
// Javascript static-property-assignment declarations always merge, even though they are also values
if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
// reset flag when merging instantiated module into value module that has only const enums
@ -28266,12 +28268,13 @@ var ts;
}
if ((source.flags | target.flags) & 67108864 /* JSContainer */) {
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
var targetInitializer = init && init.symbol ? init.symbol : target;
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}

13
lib/typescript.js
View File

@ -26204,6 +26204,8 @@ var ts;
function mergeSymbol(target, source) {
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
(source.flags | target.flags) & 67108864 /* JSContainer */) {
var targetValueDeclaration = target.valueDeclaration;
ts.Debug.assert(!!(target.flags & 33554432 /* Transient */));
// Javascript static-property-assignment declarations always merge, even though they are also values
if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
// reset flag when merging instantiated module into value module that has only const enums
@ -26229,12 +26231,13 @@ var ts;
}
if ((source.flags | target.flags) & 67108864 /* JSContainer */) {
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
var targetInitializer = init && init.symbol ? init.symbol : target;
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}

13
lib/typescriptServices.js
View File

@ -26204,6 +26204,8 @@ var ts;
function mergeSymbol(target, source) {
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
(source.flags | target.flags) & 67108864 /* JSContainer */) {
var targetValueDeclaration = target.valueDeclaration;
ts.Debug.assert(!!(target.flags & 33554432 /* Transient */));
// Javascript static-property-assignment declarations always merge, even though they are also values
if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
// reset flag when merging instantiated module into value module that has only const enums
@ -26229,12 +26231,13 @@ var ts;
}
if ((source.flags | target.flags) & 67108864 /* JSContainer */) {
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
var targetInitializer = init && init.symbol ? init.symbol : target;
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}