Skip to content

Commit

Permalink
Bump version to 4.6.4 and LKG
Browse files Browse the repository at this point in the history
  • Loading branch information
typescript-bot committed Mar 29, 2022
1 parent fbc2b67 commit c242d4a
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 40 deletions.
2 changes: 1 addition & 1 deletion lib/tsc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
Expand Down
16 changes: 7 additions & 9 deletions lib/tsserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}
Expand Down
16 changes: 7 additions & 9 deletions lib/tsserverlibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}
Expand Down
16 changes: 7 additions & 9 deletions lib/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}
Expand Down
16 changes: 7 additions & 9 deletions lib/typescriptServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/typingsInstaller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/corePublic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit c242d4a

Please sign in to comment.