Skip to content

Commit c59ea30

Browse files
mhegazymhegazy
committed
Update LKG
1 parent acd7f81 commit c59ea30

File tree

5 files changed

+40
-25
lines changed

5 files changed

+40
-25
lines changed

‎lib/tsc.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21050,6 +21050,8 @@ var ts;
2105021050
function mergeSymbol(target, source) {
2105121051
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
2105221052
(source.flags | target.flags) & 67108864) {
21053+
var targetValueDeclaration = target.valueDeclaration;
21054+
ts.Debug.assert(!!(target.flags & 33554432));
2105321055
if (source.flags & 512 && target.flags & 512 && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
2105421056
target.constEnumOnlyModule = false;
2105521057
}
@@ -21072,12 +21074,13 @@ var ts;
2107221074
}
2107321075
if ((source.flags | target.flags) & 67108864) {
2107421076
var sourceInitializer = ts.getJSInitializerSymbol(source);
21075-
var targetInitializer = ts.getJSInitializerSymbol(target);
21077+
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
21078+
var targetInitializer = init && init.symbol ? init.symbol : target;
21079+
if (!(targetInitializer.flags & 33554432)) {
21080+
var mergedInitializer = getMergedSymbol(targetInitializer);
21081+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
21082+
}
2107621083
if (sourceInitializer !== source || targetInitializer !== target) {
21077-
if (!(targetInitializer.flags & 33554432)) {
21078-
var mergedInitializer = getMergedSymbol(targetInitializer);
21079-
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
21080-
}
2108121084
mergeSymbol(targetInitializer, sourceInitializer);
2108221085
}
2108321086
}

‎lib/tsserver.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22486,6 +22486,8 @@ var ts;
2248622486
function mergeSymbol(target, source) {
2248722487
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
2248822488
(source.flags | target.flags) & 67108864) {
22489+
var targetValueDeclaration = target.valueDeclaration;
22490+
ts.Debug.assert(!!(target.flags & 33554432));
2248922491
if (source.flags & 512 && target.flags & 512 && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
2249022492
target.constEnumOnlyModule = false;
2249122493
}
@@ -22508,12 +22510,13 @@ var ts;
2250822510
}
2250922511
if ((source.flags | target.flags) & 67108864) {
2251022512
var sourceInitializer = ts.getJSInitializerSymbol(source);
22511-
var targetInitializer = ts.getJSInitializerSymbol(target);
22513+
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
22514+
var targetInitializer = init && init.symbol ? init.symbol : target;
22515+
if (!(targetInitializer.flags & 33554432)) {
22516+
var mergedInitializer = getMergedSymbol(targetInitializer);
22517+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
22518+
}
2251222519
if (sourceInitializer !== source || targetInitializer !== target) {
22513-
if (!(targetInitializer.flags & 33554432)) {
22514-
var mergedInitializer = getMergedSymbol(targetInitializer);
22515-
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
22516-
}
2251722520
mergeSymbol(targetInitializer, sourceInitializer);
2251822521
}
2251922522
}

‎lib/tsserverlibrary.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28241,6 +28241,8 @@ var ts;
2824128241
function mergeSymbol(target, source) {
2824228242
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
2824328243
(source.flags | target.flags) & 67108864 /* JSContainer */) {
28244+
var targetValueDeclaration = target.valueDeclaration;
28245+
ts.Debug.assert(!!(target.flags & 33554432 /* Transient */));
2824428246
// Javascript static-property-assignment declarations always merge, even though they are also values
2824528247
if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
2824628248
// reset flag when merging instantiated module into value module that has only const enums
@@ -28266,12 +28268,13 @@ var ts;
2826628268
}
2826728269
if ((source.flags | target.flags) & 67108864 /* JSContainer */) {
2826828270
var sourceInitializer = ts.getJSInitializerSymbol(source);
28269-
var targetInitializer = ts.getJSInitializerSymbol(target);
28271+
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
28272+
var targetInitializer = init && init.symbol ? init.symbol : target;
28273+
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
28274+
var mergedInitializer = getMergedSymbol(targetInitializer);
28275+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
28276+
}
2827028277
if (sourceInitializer !== source || targetInitializer !== target) {
28271-
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
28272-
var mergedInitializer = getMergedSymbol(targetInitializer);
28273-
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
28274-
}
2827528278
mergeSymbol(targetInitializer, sourceInitializer);
2827628279
}
2827728280
}

‎lib/typescript.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26204,6 +26204,8 @@ var ts;
2620426204
function mergeSymbol(target, source) {
2620526205
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
2620626206
(source.flags | target.flags) & 67108864 /* JSContainer */) {
26207+
var targetValueDeclaration = target.valueDeclaration;
26208+
ts.Debug.assert(!!(target.flags & 33554432 /* Transient */));
2620726209
// Javascript static-property-assignment declarations always merge, even though they are also values
2620826210
if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
2620926211
// reset flag when merging instantiated module into value module that has only const enums
@@ -26229,12 +26231,13 @@ var ts;
2622926231
}
2623026232
if ((source.flags | target.flags) & 67108864 /* JSContainer */) {
2623126233
var sourceInitializer = ts.getJSInitializerSymbol(source);
26232-
var targetInitializer = ts.getJSInitializerSymbol(target);
26234+
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
26235+
var targetInitializer = init && init.symbol ? init.symbol : target;
26236+
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
26237+
var mergedInitializer = getMergedSymbol(targetInitializer);
26238+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
26239+
}
2623326240
if (sourceInitializer !== source || targetInitializer !== target) {
26234-
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
26235-
var mergedInitializer = getMergedSymbol(targetInitializer);
26236-
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
26237-
}
2623826241
mergeSymbol(targetInitializer, sourceInitializer);
2623926242
}
2624026243
}

‎lib/typescriptServices.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26204,6 +26204,8 @@ var ts;
2620426204
function mergeSymbol(target, source) {
2620526205
if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
2620626206
(source.flags | target.flags) & 67108864 /* JSContainer */) {
26207+
var targetValueDeclaration = target.valueDeclaration;
26208+
ts.Debug.assert(!!(target.flags & 33554432 /* Transient */));
2620726209
// Javascript static-property-assignment declarations always merge, even though they are also values
2620826210
if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
2620926211
// reset flag when merging instantiated module into value module that has only const enums
@@ -26229,12 +26231,13 @@ var ts;
2622926231
}
2623026232
if ((source.flags | target.flags) & 67108864 /* JSContainer */) {
2623126233
var sourceInitializer = ts.getJSInitializerSymbol(source);
26232-
var targetInitializer = ts.getJSInitializerSymbol(target);
26234+
var init = ts.getDeclaredJavascriptInitializer(targetValueDeclaration) || ts.getAssignedJavascriptInitializer(targetValueDeclaration);
26235+
var targetInitializer = init && init.symbol ? init.symbol : target;
26236+
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
26237+
var mergedInitializer = getMergedSymbol(targetInitializer);
26238+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
26239+
}
2623326240
if (sourceInitializer !== source || targetInitializer !== target) {
26234-
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
26235-
var mergedInitializer = getMergedSymbol(targetInitializer);
26236-
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
26237-
}
2623826241
mergeSymbol(targetInitializer, sourceInitializer);
2623926242
}
2624026243
}

0 commit comments

Comments
 (0)