Skip to content

Commit c798e21

Browse files
committed
Compare merged targetInitializer to target
Instead of the unmerged one
1 parent 68875dc commit c798e21

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/compiler/checker.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -898,11 +898,11 @@ namespace ts {
898898
const sourceInitializer = getJSInitializerSymbol(source);
899899
const init = getDeclaredJavascriptInitializer(targetValueDeclaration) || getAssignedJavascriptInitializer(targetValueDeclaration);
900900
let targetInitializer = init && init.symbol ? init.symbol : target;
901+
if (!(targetInitializer.flags & SymbolFlags.Transient)) {
902+
const mergedInitializer = getMergedSymbol(targetInitializer);
903+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
904+
}
901905
if (sourceInitializer !== source || targetInitializer !== target) {
902-
if (!(targetInitializer.flags & SymbolFlags.Transient)) {
903-
const mergedInitializer = getMergedSymbol(targetInitializer);
904-
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
905-
}
906906
mergeSymbol(targetInitializer, sourceInitializer);
907907
}
908908
}

0 commit comments

Comments
 (0)