From 850cfc59ba82e4e6f09621e049eb7a4e326a9f7a Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 10 May 2018 23:05:35 -0700 Subject: [PATCH 1/2] Bump version to 2.8.4 --- package.json | 2 +- src/compiler/core.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 65cef39b7b9c5..3d78df8811834 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "http://typescriptlang.org/", - "version": "2.8.3", + "version": "2.8.4", "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ diff --git a/src/compiler/core.ts b/src/compiler/core.ts index ef3024f890d75..53e21003e7780 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -6,7 +6,7 @@ namespace ts { // If changing the text in this section, be sure to test `configureNightly` too. export const versionMajorMinor = "2.8"; /** The version of the TypeScript compiler release */ - export const version = `${versionMajorMinor}.3`; + export const version = `${versionMajorMinor}.4`; } namespace ts { From 22715daa2b41534a7c2b606663f53f229a5b7621 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 10 May 2018 23:08:10 -0700 Subject: [PATCH 2/2] Update LKG --- lib/tsc.js | 8 ++++++-- lib/tsserver.js | 8 ++++++-- lib/tsserverlibrary.js | 8 ++++++-- lib/typescript.js | 8 ++++++-- lib/typescriptServices.js | 8 ++++++-- lib/typingsInstaller.js | 2 +- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/lib/tsc.js b/lib/tsc.js index b69b99382d26f..76115b46b13cb 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 d5ba2727c19ec..2e701cd4a7601 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 8493f57c2d839..cf71f6fc8cb4d 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 4afd4b7ce8c9d..c41bc09eb309d 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 4afd4b7ce8c9d..c41bc09eb309d 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 9951f1241584f..a3cd378cf9815 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) {