From c242d4a46b1085718d5607591b013288c9c88f9c Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Tue, 29 Mar 2022 22:35:54 +0000 Subject: [PATCH] Bump version to 4.6.4 and LKG --- lib/tsc.js | 2 +- lib/tsserver.js | 16 +++++++--------- lib/tsserverlibrary.js | 16 +++++++--------- lib/typescript.js | 16 +++++++--------- lib/typescriptServices.js | 16 +++++++--------- lib/typingsInstaller.js | 2 +- package.json | 2 +- src/compiler/corePublic.ts | 2 +- 8 files changed, 32 insertions(+), 40 deletions(-) diff --git a/lib/tsc.js b/lib/tsc.js index 15018eb19297b..636e39ae1f4ff 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { var ts; (function (ts) { ts.versionMajorMinor = "4.6"; - ts.version = "4.6.3"; + ts.version = "4.6.4"; var NativeCollections; (function (NativeCollections) { var globals = typeof globalThis !== "undefined" ? globalThis : diff --git a/lib/tsserver.js b/lib/tsserver.js index 5b89bb70fc48a..60a159a673ef0 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -100,7 +100,7 @@ var ts; // The following is baselined as a literal template type without intervention /** The version of the TypeScript compiler release */ // eslint-disable-next-line @typescript-eslint/no-inferrable-types - ts.version = "4.6.3"; + ts.version = "4.6.4"; /* @internal */ var Comparison; (function (Comparison) { @@ -124964,12 +124964,8 @@ var ts; } } ts.findNextToken = findNextToken; - /** - * Finds the rightmost token satisfying `token.end <= position`, - * excluding `JsxText` tokens containing only whitespace. - */ function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) { - var result = find(startNode || sourceFile); + var result = find((startNode || sourceFile)); ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result))); return result; function find(n) { @@ -144061,6 +144057,7 @@ var ts; return formatting.getFormattingScanner(sourceFile.text, sourceFile.languageVariant, getScanStartPosition(enclosingNode, originalRange, sourceFile), originalRange.end, function (scanner) { return formatSpanWorker(originalRange, enclosingNode, formatting.SmartIndenter.getIndentationForNode(enclosingNode, originalRange, sourceFile, formatContext.options), getOwnOrInheritedDelta(enclosingNode, formatContext.options, sourceFile), scanner, formatContext, requestKind, prepareRangeContainsErrorFunction(sourceFile.parseDiagnostics, originalRange), sourceFile); }); } function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) { + var _b; var options = _a.options, getRules = _a.getRules, host = _a.host; // formatting context is used by rules provider var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options); @@ -144092,11 +144089,12 @@ var ts; } } if (previousRange && formattingScanner.getStartPos() >= originalRange.end) { - var token = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() : + var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() : formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token : undefined; - if (token) { - processPair(token, sourceFile.getLineAndCharacterOfPosition(token.pos).line, enclosingNode, previousRange, previousRangeStartLine, previousParent, enclosingNode, + if (tokenInfo) { + var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent; + processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent, /*dynamicIndentation*/ undefined); } } diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index 3da500f878173..fcb589891a4d5 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -294,7 +294,7 @@ var ts; // The following is baselined as a literal template type without intervention /** The version of the TypeScript compiler release */ // eslint-disable-next-line @typescript-eslint/no-inferrable-types - ts.version = "4.6.3"; + ts.version = "4.6.4"; /* @internal */ var Comparison; (function (Comparison) { @@ -125575,12 +125575,8 @@ var ts; } } ts.findNextToken = findNextToken; - /** - * Finds the rightmost token satisfying `token.end <= position`, - * excluding `JsxText` tokens containing only whitespace. - */ function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) { - var result = find(startNode || sourceFile); + var result = find((startNode || sourceFile)); ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result))); return result; function find(n) { @@ -144672,6 +144668,7 @@ var ts; return formatting.getFormattingScanner(sourceFile.text, sourceFile.languageVariant, getScanStartPosition(enclosingNode, originalRange, sourceFile), originalRange.end, function (scanner) { return formatSpanWorker(originalRange, enclosingNode, formatting.SmartIndenter.getIndentationForNode(enclosingNode, originalRange, sourceFile, formatContext.options), getOwnOrInheritedDelta(enclosingNode, formatContext.options, sourceFile), scanner, formatContext, requestKind, prepareRangeContainsErrorFunction(sourceFile.parseDiagnostics, originalRange), sourceFile); }); } function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) { + var _b; var options = _a.options, getRules = _a.getRules, host = _a.host; // formatting context is used by rules provider var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options); @@ -144703,11 +144700,12 @@ var ts; } } if (previousRange && formattingScanner.getStartPos() >= originalRange.end) { - var token = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() : + var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() : formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token : undefined; - if (token) { - processPair(token, sourceFile.getLineAndCharacterOfPosition(token.pos).line, enclosingNode, previousRange, previousRangeStartLine, previousParent, enclosingNode, + if (tokenInfo) { + var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent; + processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent, /*dynamicIndentation*/ undefined); } } diff --git a/lib/typescript.js b/lib/typescript.js index a852c867159d1..3be91a8fa92f4 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -294,7 +294,7 @@ var ts; // The following is baselined as a literal template type without intervention /** The version of the TypeScript compiler release */ // eslint-disable-next-line @typescript-eslint/no-inferrable-types - ts.version = "4.6.3"; + ts.version = "4.6.4"; /* @internal */ var Comparison; (function (Comparison) { @@ -125575,12 +125575,8 @@ var ts; } } ts.findNextToken = findNextToken; - /** - * Finds the rightmost token satisfying `token.end <= position`, - * excluding `JsxText` tokens containing only whitespace. - */ function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) { - var result = find(startNode || sourceFile); + var result = find((startNode || sourceFile)); ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result))); return result; function find(n) { @@ -144672,6 +144668,7 @@ var ts; return formatting.getFormattingScanner(sourceFile.text, sourceFile.languageVariant, getScanStartPosition(enclosingNode, originalRange, sourceFile), originalRange.end, function (scanner) { return formatSpanWorker(originalRange, enclosingNode, formatting.SmartIndenter.getIndentationForNode(enclosingNode, originalRange, sourceFile, formatContext.options), getOwnOrInheritedDelta(enclosingNode, formatContext.options, sourceFile), scanner, formatContext, requestKind, prepareRangeContainsErrorFunction(sourceFile.parseDiagnostics, originalRange), sourceFile); }); } function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) { + var _b; var options = _a.options, getRules = _a.getRules, host = _a.host; // formatting context is used by rules provider var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options); @@ -144703,11 +144700,12 @@ var ts; } } if (previousRange && formattingScanner.getStartPos() >= originalRange.end) { - var token = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() : + var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() : formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token : undefined; - if (token) { - processPair(token, sourceFile.getLineAndCharacterOfPosition(token.pos).line, enclosingNode, previousRange, previousRangeStartLine, previousParent, enclosingNode, + if (tokenInfo) { + var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent; + processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent, /*dynamicIndentation*/ undefined); } } diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index bff3d39041a05..e958d4e4d3a2c 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -294,7 +294,7 @@ var ts; // The following is baselined as a literal template type without intervention /** The version of the TypeScript compiler release */ // eslint-disable-next-line @typescript-eslint/no-inferrable-types - ts.version = "4.6.3"; + ts.version = "4.6.4"; /* @internal */ var Comparison; (function (Comparison) { @@ -125575,12 +125575,8 @@ var ts; } } ts.findNextToken = findNextToken; - /** - * Finds the rightmost token satisfying `token.end <= position`, - * excluding `JsxText` tokens containing only whitespace. - */ function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) { - var result = find(startNode || sourceFile); + var result = find((startNode || sourceFile)); ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result))); return result; function find(n) { @@ -144672,6 +144668,7 @@ var ts; return formatting.getFormattingScanner(sourceFile.text, sourceFile.languageVariant, getScanStartPosition(enclosingNode, originalRange, sourceFile), originalRange.end, function (scanner) { return formatSpanWorker(originalRange, enclosingNode, formatting.SmartIndenter.getIndentationForNode(enclosingNode, originalRange, sourceFile, formatContext.options), getOwnOrInheritedDelta(enclosingNode, formatContext.options, sourceFile), scanner, formatContext, requestKind, prepareRangeContainsErrorFunction(sourceFile.parseDiagnostics, originalRange), sourceFile); }); } function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) { + var _b; var options = _a.options, getRules = _a.getRules, host = _a.host; // formatting context is used by rules provider var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options); @@ -144703,11 +144700,12 @@ var ts; } } if (previousRange && formattingScanner.getStartPos() >= originalRange.end) { - var token = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() : + var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() : formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token : undefined; - if (token) { - processPair(token, sourceFile.getLineAndCharacterOfPosition(token.pos).line, enclosingNode, previousRange, previousRangeStartLine, previousParent, enclosingNode, + if (tokenInfo) { + var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent; + processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent, /*dynamicIndentation*/ undefined); } } diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index 3db755cbfc790..715445fffe2bd 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -89,7 +89,7 @@ var ts; // The following is baselined as a literal template type without intervention /** The version of the TypeScript compiler release */ // eslint-disable-next-line @typescript-eslint/no-inferrable-types - ts.version = "4.6.3"; + ts.version = "4.6.4"; /* @internal */ var Comparison; (function (Comparison) { diff --git a/package.json b/package.json index 39326e0ed22b3..30243b6a35587 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "https://www.typescriptlang.org/", - "version": "4.6.3", + "version": "4.6.4", "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ diff --git a/src/compiler/corePublic.ts b/src/compiler/corePublic.ts index 8f47cfd4f1dd2..e170ec832229e 100644 --- a/src/compiler/corePublic.ts +++ b/src/compiler/corePublic.ts @@ -5,7 +5,7 @@ namespace ts { // The following is baselined as a literal template type without intervention /** The version of the TypeScript compiler release */ // eslint-disable-next-line @typescript-eslint/no-inferrable-types - export const version = "4.6.3" as string; + export const version = "4.6.4" as string; /** * Type of objects whose values are all of the same type.