diff --git a/lib/tsc.js b/lib/tsc.js index b69b99382d2..76115b46b13 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -170,7 +170,7 @@ var ts; var ts; (function (ts) { ts.versionMajorMinor = "2.8"; - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".4"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { @@ -21074,6 +21074,10 @@ var ts; var sourceInitializer = ts.getJSInitializerSymbol(source); var targetInitializer = ts.getJSInitializerSymbol(target); if (sourceInitializer !== source || targetInitializer !== target) { + if (!(targetInitializer.flags & 33554432)) { + var mergedInitializer = getMergedSymbol(targetInitializer); + targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer; + } mergeSymbol(targetInitializer, sourceInitializer); } } @@ -34944,7 +34948,7 @@ var ts; checkGrammarForGenerator(node); } var links = getNodeLinks(node); - var type = getTypeOfSymbol(node.symbol); + var type = getTypeOfSymbol(getMergedSymbol(node.symbol)); if (!(links.flags & 1024)) { var contextualSignature = getContextualSignature(node); if (!(links.flags & 1024)) { diff --git a/lib/tsserver.js b/lib/tsserver.js index d5ba2727c19..2e701cd4a76 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -1366,7 +1366,7 @@ var ts; var ts; (function (ts) { ts.versionMajorMinor = "2.8"; - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".4"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { @@ -22510,6 +22510,10 @@ var ts; var sourceInitializer = ts.getJSInitializerSymbol(source); var targetInitializer = ts.getJSInitializerSymbol(target); if (sourceInitializer !== source || targetInitializer !== target) { + if (!(targetInitializer.flags & 33554432)) { + var mergedInitializer = getMergedSymbol(targetInitializer); + targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer; + } mergeSymbol(targetInitializer, sourceInitializer); } } @@ -36380,7 +36384,7 @@ var ts; checkGrammarForGenerator(node); } var links = getNodeLinks(node); - var type = getTypeOfSymbol(node.symbol); + var type = getTypeOfSymbol(getMergedSymbol(node.symbol)); if (!(links.flags & 1024)) { var contextualSignature = getContextualSignature(node); if (!(links.flags & 1024)) { diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index 8493f57c2d8..cf71f6fc8cb 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -1605,7 +1605,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "2.8"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".4"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { @@ -28268,6 +28268,10 @@ var ts; var sourceInitializer = ts.getJSInitializerSymbol(source); var targetInitializer = ts.getJSInitializerSymbol(target); if (sourceInitializer !== source || targetInitializer !== target) { + if (!(targetInitializer.flags & 33554432 /* Transient */)) { + var mergedInitializer = getMergedSymbol(targetInitializer); + targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer; + } mergeSymbol(targetInitializer, sourceInitializer); } } @@ -44665,7 +44669,7 @@ var ts; checkGrammarForGenerator(node); } var links = getNodeLinks(node); - var type = getTypeOfSymbol(node.symbol); + var type = getTypeOfSymbol(getMergedSymbol(node.symbol)); // Check if function expression is contextually typed and assign parameter types if so. if (!(links.flags & 1024 /* ContextChecked */)) { var contextualSignature = getContextualSignature(node); diff --git a/lib/typescript.js b/lib/typescript.js index 4afd4b7ce8c..c41bc09eb30 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -1605,7 +1605,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "2.8"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".4"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { @@ -26231,6 +26231,10 @@ var ts; var sourceInitializer = ts.getJSInitializerSymbol(source); var targetInitializer = ts.getJSInitializerSymbol(target); if (sourceInitializer !== source || targetInitializer !== target) { + if (!(targetInitializer.flags & 33554432 /* Transient */)) { + var mergedInitializer = getMergedSymbol(targetInitializer); + targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer; + } mergeSymbol(targetInitializer, sourceInitializer); } } @@ -42628,7 +42632,7 @@ var ts; checkGrammarForGenerator(node); } var links = getNodeLinks(node); - var type = getTypeOfSymbol(node.symbol); + var type = getTypeOfSymbol(getMergedSymbol(node.symbol)); // Check if function expression is contextually typed and assign parameter types if so. if (!(links.flags & 1024 /* ContextChecked */)) { var contextualSignature = getContextualSignature(node); diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index 4afd4b7ce8c..c41bc09eb30 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -1605,7 +1605,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "2.8"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".4"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { @@ -26231,6 +26231,10 @@ var ts; var sourceInitializer = ts.getJSInitializerSymbol(source); var targetInitializer = ts.getJSInitializerSymbol(target); if (sourceInitializer !== source || targetInitializer !== target) { + if (!(targetInitializer.flags & 33554432 /* Transient */)) { + var mergedInitializer = getMergedSymbol(targetInitializer); + targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer; + } mergeSymbol(targetInitializer, sourceInitializer); } } @@ -42628,7 +42632,7 @@ var ts; checkGrammarForGenerator(node); } var links = getNodeLinks(node); - var type = getTypeOfSymbol(node.symbol); + var type = getTypeOfSymbol(getMergedSymbol(node.symbol)); // Check if function expression is contextually typed and assign parameter types if so. if (!(links.flags & 1024 /* ContextChecked */)) { var contextualSignature = getContextualSignature(node); diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index 9951f124158..a3cd378cf98 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -180,7 +180,7 @@ var ts; var ts; (function (ts) { ts.versionMajorMinor = "2.8"; - ts.version = ts.versionMajorMinor + ".3"; + ts.version = ts.versionMajorMinor + ".4"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) {