Skip to content

Commit c242d4a

Browse files
typescript-bottypescript-bot
committed
Bump version to 4.6.4 and LKG
1 parent fbc2b67 commit c242d4a

8 files changed

+32
-40
lines changed

‎lib/tsc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
6969
var ts;
7070
(function (ts) {
7171
ts.versionMajorMinor = "4.6";
72-
ts.version = "4.6.3";
72+
ts.version = "4.6.4";
7373
var NativeCollections;
7474
(function (NativeCollections) {
7575
var globals = typeof globalThis !== "undefined" ? globalThis :

‎lib/tsserver.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ var ts;
100100
// The following is baselined as a literal template type without intervention
101101
/** The version of the TypeScript compiler release */
102102
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
103-
ts.version = "4.6.3";
103+
ts.version = "4.6.4";
104104
/* @internal */
105105
var Comparison;
106106
(function (Comparison) {
@@ -124964,12 +124964,8 @@ var ts;
124964124964
}
124965124965
}
124966124966
ts.findNextToken = findNextToken;
124967-
/**
124968-
* Finds the rightmost token satisfying `token.end <= position`,
124969-
* excluding `JsxText` tokens containing only whitespace.
124970-
*/
124971124967
function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) {
124972-
var result = find(startNode || sourceFile);
124968+
var result = find((startNode || sourceFile));
124973124969
ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result)));
124974124970
return result;
124975124971
function find(n) {
@@ -144061,6 +144057,7 @@ var ts;
144061144057
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); });
144062144058
}
144063144059
function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) {
144060+
var _b;
144064144061
var options = _a.options, getRules = _a.getRules, host = _a.host;
144065144062
// formatting context is used by rules provider
144066144063
var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options);
@@ -144092,11 +144089,12 @@ var ts;
144092144089
}
144093144090
}
144094144091
if (previousRange && formattingScanner.getStartPos() >= originalRange.end) {
144095-
var token = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
144092+
var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
144096144093
formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token :
144097144094
undefined;
144098-
if (token) {
144099-
processPair(token, sourceFile.getLineAndCharacterOfPosition(token.pos).line, enclosingNode, previousRange, previousRangeStartLine, previousParent, enclosingNode,
144095+
if (tokenInfo) {
144096+
var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent;
144097+
processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent,
144100144098
/*dynamicIndentation*/ undefined);
144101144099
}
144102144100
}

‎lib/tsserverlibrary.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ var ts;
294294
// The following is baselined as a literal template type without intervention
295295
/** The version of the TypeScript compiler release */
296296
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
297-
ts.version = "4.6.3";
297+
ts.version = "4.6.4";
298298
/* @internal */
299299
var Comparison;
300300
(function (Comparison) {
@@ -125575,12 +125575,8 @@ var ts;
125575125575
}
125576125576
}
125577125577
ts.findNextToken = findNextToken;
125578-
/**
125579-
* Finds the rightmost token satisfying `token.end <= position`,
125580-
* excluding `JsxText` tokens containing only whitespace.
125581-
*/
125582125578
function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) {
125583-
var result = find(startNode || sourceFile);
125579+
var result = find((startNode || sourceFile));
125584125580
ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result)));
125585125581
return result;
125586125582
function find(n) {
@@ -144672,6 +144668,7 @@ var ts;
144672144668
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); });
144673144669
}
144674144670
function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) {
144671+
var _b;
144675144672
var options = _a.options, getRules = _a.getRules, host = _a.host;
144676144673
// formatting context is used by rules provider
144677144674
var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options);
@@ -144703,11 +144700,12 @@ var ts;
144703144700
}
144704144701
}
144705144702
if (previousRange && formattingScanner.getStartPos() >= originalRange.end) {
144706-
var token = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
144703+
var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
144707144704
formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token :
144708144705
undefined;
144709-
if (token) {
144710-
processPair(token, sourceFile.getLineAndCharacterOfPosition(token.pos).line, enclosingNode, previousRange, previousRangeStartLine, previousParent, enclosingNode,
144706+
if (tokenInfo) {
144707+
var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent;
144708+
processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent,
144711144709
/*dynamicIndentation*/ undefined);
144712144710
}
144713144711
}

‎lib/typescript.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ var ts;
294294
// The following is baselined as a literal template type without intervention
295295
/** The version of the TypeScript compiler release */
296296
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
297-
ts.version = "4.6.3";
297+
ts.version = "4.6.4";
298298
/* @internal */
299299
var Comparison;
300300
(function (Comparison) {
@@ -125575,12 +125575,8 @@ var ts;
125575125575
}
125576125576
}
125577125577
ts.findNextToken = findNextToken;
125578-
/**
125579-
* Finds the rightmost token satisfying `token.end <= position`,
125580-
* excluding `JsxText` tokens containing only whitespace.
125581-
*/
125582125578
function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) {
125583-
var result = find(startNode || sourceFile);
125579+
var result = find((startNode || sourceFile));
125584125580
ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result)));
125585125581
return result;
125586125582
function find(n) {
@@ -144672,6 +144668,7 @@ var ts;
144672144668
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); });
144673144669
}
144674144670
function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) {
144671+
var _b;
144675144672
var options = _a.options, getRules = _a.getRules, host = _a.host;
144676144673
// formatting context is used by rules provider
144677144674
var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options);
@@ -144703,11 +144700,12 @@ var ts;
144703144700
}
144704144701
}
144705144702
if (previousRange && formattingScanner.getStartPos() >= originalRange.end) {
144706-
var token = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
144703+
var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
144707144704
formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token :
144708144705
undefined;
144709-
if (token) {
144710-
processPair(token, sourceFile.getLineAndCharacterOfPosition(token.pos).line, enclosingNode, previousRange, previousRangeStartLine, previousParent, enclosingNode,
144706+
if (tokenInfo) {
144707+
var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent;
144708+
processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent,
144711144709
/*dynamicIndentation*/ undefined);
144712144710
}
144713144711
}

‎lib/typescriptServices.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ var ts;
294294
// The following is baselined as a literal template type without intervention
295295
/** The version of the TypeScript compiler release */
296296
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
297-
ts.version = "4.6.3";
297+
ts.version = "4.6.4";
298298
/* @internal */
299299
var Comparison;
300300
(function (Comparison) {
@@ -125575,12 +125575,8 @@ var ts;
125575125575
}
125576125576
}
125577125577
ts.findNextToken = findNextToken;
125578-
/**
125579-
* Finds the rightmost token satisfying `token.end <= position`,
125580-
* excluding `JsxText` tokens containing only whitespace.
125581-
*/
125582125578
function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) {
125583-
var result = find(startNode || sourceFile);
125579+
var result = find((startNode || sourceFile));
125584125580
ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result)));
125585125581
return result;
125586125582
function find(n) {
@@ -144672,6 +144668,7 @@ var ts;
144672144668
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); });
144673144669
}
144674144670
function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) {
144671+
var _b;
144675144672
var options = _a.options, getRules = _a.getRules, host = _a.host;
144676144673
// formatting context is used by rules provider
144677144674
var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options);
@@ -144703,11 +144700,12 @@ var ts;
144703144700
}
144704144701
}
144705144702
if (previousRange && formattingScanner.getStartPos() >= originalRange.end) {
144706-
var token = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
144703+
var tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() :
144707144704
formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token :
144708144705
undefined;
144709-
if (token) {
144710-
processPair(token, sourceFile.getLineAndCharacterOfPosition(token.pos).line, enclosingNode, previousRange, previousRangeStartLine, previousParent, enclosingNode,
144706+
if (tokenInfo) {
144707+
var parent = ((_b = ts.findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) === null || _b === void 0 ? void 0 : _b.parent) || previousParent;
144708+
processPair(tokenInfo, sourceFile.getLineAndCharacterOfPosition(tokenInfo.pos).line, parent, previousRange, previousRangeStartLine, previousParent, parent,
144711144709
/*dynamicIndentation*/ undefined);
144712144710
}
144713144711
}

‎lib/typingsInstaller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ var ts;
8989
// The following is baselined as a literal template type without intervention
9090
/** The version of the TypeScript compiler release */
9191
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
92-
ts.version = "4.6.3";
92+
ts.version = "4.6.4";
9393
/* @internal */
9494
var Comparison;
9595
(function (Comparison) {

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "typescript",
33
"author": "Microsoft Corp.",
44
"homepage": "https://www.typescriptlang.org/",
5-
"version": "4.6.3",
5+
"version": "4.6.4",
66
"license": "Apache-2.0",
77
"description": "TypeScript is a language for application scale JavaScript development",
88
"keywords": [

‎src/compiler/corePublic.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace ts {
55
// The following is baselined as a literal template type without intervention
66
/** The version of the TypeScript compiler release */
77
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
8-
export const version = "4.6.3" as string;
8+
export const version = "4.6.4" as string;
99

1010
/**
1111
* Type of objects whose values are all of the same type.

0 commit comments

Comments
 (0)