@typescript-deploys/pr-build 5.0.0-pr-52632-9 → 5.0.0-pr-52667-13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/tsc.js +195 -224
- package/lib/tsserver.js +252 -317
- package/lib/tsserverlibrary.js +259 -324
- package/lib/typescript.js +259 -324
- package/lib/typingsInstaller.js +174 -185
- package/package.json +1 -1
package/lib/tsserverlibrary.js
CHANGED
|
@@ -35,7 +35,7 @@ var ts = (() => {
|
|
|
35
35
|
"src/compiler/corePublic.ts"() {
|
|
36
36
|
"use strict";
|
|
37
37
|
versionMajorMinor = "5.0";
|
|
38
|
-
version = `${versionMajorMinor}.0-insiders.
|
|
38
|
+
version = `${versionMajorMinor}.0-insiders.20230208`;
|
|
39
39
|
Comparison = /* @__PURE__ */ ((Comparison3) => {
|
|
40
40
|
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
|
|
41
41
|
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
|
|
@@ -5492,7 +5492,7 @@ ${lanes.join("\n")}
|
|
|
5492
5492
|
function createDirectoryWatcher(dirName, dirPath, fallbackOptions) {
|
|
5493
5493
|
const watcher = fsWatch(
|
|
5494
5494
|
dirName,
|
|
5495
|
-
|
|
5495
|
+
1 /* Directory */,
|
|
5496
5496
|
(_eventName, relativeFileName, modifiedTime) => {
|
|
5497
5497
|
if (!isString(relativeFileName))
|
|
5498
5498
|
return;
|
|
@@ -5690,7 +5690,7 @@ ${lanes.join("\n")}
|
|
|
5690
5690
|
}
|
|
5691
5691
|
function nonSyncUpdateChildWatches(dirName, dirPath, fileName, options) {
|
|
5692
5692
|
const parentWatcher = cache.get(dirPath);
|
|
5693
|
-
if (parentWatcher && fileSystemEntryExists(dirName,
|
|
5693
|
+
if (parentWatcher && fileSystemEntryExists(dirName, 1 /* Directory */)) {
|
|
5694
5694
|
scheduleUpdateChildWatches(dirName, dirPath, fileName, options);
|
|
5695
5695
|
return;
|
|
5696
5696
|
}
|
|
@@ -5755,7 +5755,7 @@ ${lanes.join("\n")}
|
|
|
5755
5755
|
return false;
|
|
5756
5756
|
let newChildWatches;
|
|
5757
5757
|
const hasChanges = enumerateInsertsAndDeletes(
|
|
5758
|
-
fileSystemEntryExists(parentDir,
|
|
5758
|
+
fileSystemEntryExists(parentDir, 1 /* Directory */) ? mapDefined(getAccessibleSortedChildDirectories(parentDir), (child) => {
|
|
5759
5759
|
const childFullName = getNormalizedAbsolutePath(child, parentDir);
|
|
5760
5760
|
return !isIgnoredPath(childFullName, options) && filePathComparer(childFullName, normalizePath(realpath(childFullName))) === 0 /* EqualTo */ ? childFullName : void 0;
|
|
5761
5761
|
}) : emptyArray,
|
|
@@ -17055,10 +17055,10 @@ ${lanes.join("\n")}
|
|
|
17055
17055
|
return symbol.exportSymbol ? symbol.exportSymbol.flags | symbol.flags : symbol.flags;
|
|
17056
17056
|
}
|
|
17057
17057
|
function isWriteOnlyAccess(node) {
|
|
17058
|
-
return accessKind(node) ===
|
|
17058
|
+
return accessKind(node) === 1 /* Write */;
|
|
17059
17059
|
}
|
|
17060
17060
|
function isWriteAccess(node) {
|
|
17061
|
-
return accessKind(node) !==
|
|
17061
|
+
return accessKind(node) !== 0 /* Read */;
|
|
17062
17062
|
}
|
|
17063
17063
|
function accessKind(node) {
|
|
17064
17064
|
const { parent: parent2 } = node;
|
|
@@ -18725,7 +18725,7 @@ ${lanes.join("\n")}
|
|
|
18725
18725
|
const tag = getJSDocSatisfiesTag(node);
|
|
18726
18726
|
return tag && tag.typeExpression && tag.typeExpression.type;
|
|
18727
18727
|
}
|
|
18728
|
-
var resolvingEmptyArray, externalHelpersModuleNameText, defaultMaximumTruncationLength, noTruncationMaximumTruncationLength, stringWriter, GetLiteralTextFlags, fullTripleSlashReferencePathRegEx, fullTripleSlashReferenceTypeReferenceDirectiveRegEx, fullTripleSlashAMDReferencePathRegEx, defaultLibReferenceRegEx, AssignmentKind, FunctionFlags, Associativity, OperatorPrecedence, templateSubstitutionRegExp, doubleQuoteEscapedCharsRegExp, singleQuoteEscapedCharsRegExp, backtickQuoteEscapedCharsRegExp, escapedCharsMap, nonAsciiCharacters, jsxDoubleQuoteEscapedCharsRegExp, jsxSingleQuoteEscapedCharsRegExp, jsxEscapedCharsMap, indentStrings, base64Digits, carriageReturnLineFeed, lineFeed,
|
|
18728
|
+
var resolvingEmptyArray, externalHelpersModuleNameText, defaultMaximumTruncationLength, noTruncationMaximumTruncationLength, stringWriter, GetLiteralTextFlags, fullTripleSlashReferencePathRegEx, fullTripleSlashReferenceTypeReferenceDirectiveRegEx, fullTripleSlashAMDReferencePathRegEx, defaultLibReferenceRegEx, AssignmentKind, FunctionFlags, Associativity, OperatorPrecedence, templateSubstitutionRegExp, doubleQuoteEscapedCharsRegExp, singleQuoteEscapedCharsRegExp, backtickQuoteEscapedCharsRegExp, escapedCharsMap, nonAsciiCharacters, jsxDoubleQuoteEscapedCharsRegExp, jsxSingleQuoteEscapedCharsRegExp, jsxEscapedCharsMap, indentStrings, base64Digits, carriageReturnLineFeed, lineFeed, objectAllocator, objectAllocatorPatchers, localizedDiagnosticMessages, reservedCharacterPattern, wildcardCharCodes, commonPackageFolders, implicitExcludePathRegexPattern, filesMatcher, directoriesMatcher, excludeMatcher, wildcardMatchers, supportedTSExtensions, supportedTSExtensionsFlat, supportedTSExtensionsWithJson, supportedTSExtensionsForExtractExtension, supportedJSExtensions, supportedJSExtensionsFlat, allSupportedExtensions, allSupportedExtensionsWithJson, supportedDeclarationExtensions, supportedTSImplementationExtensions, ModuleSpecifierEnding, extensionsToRemove, emptyFileSystemEntries;
|
|
18729
18729
|
var init_utilities = __esm({
|
|
18730
18730
|
"src/compiler/utilities.ts"() {
|
|
18731
18731
|
"use strict";
|
|
@@ -18829,12 +18829,6 @@ ${lanes.join("\n")}
|
|
|
18829
18829
|
base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
|
|
18830
18830
|
carriageReturnLineFeed = "\r\n";
|
|
18831
18831
|
lineFeed = "\n";
|
|
18832
|
-
AccessKind = /* @__PURE__ */ ((AccessKind2) => {
|
|
18833
|
-
AccessKind2[AccessKind2["Read"] = 0] = "Read";
|
|
18834
|
-
AccessKind2[AccessKind2["Write"] = 1] = "Write";
|
|
18835
|
-
AccessKind2[AccessKind2["ReadWrite"] = 2] = "ReadWrite";
|
|
18836
|
-
return AccessKind2;
|
|
18837
|
-
})(AccessKind || {});
|
|
18838
18832
|
objectAllocator = {
|
|
18839
18833
|
getNodeConstructor: () => Node4,
|
|
18840
18834
|
getTokenConstructor: () => Token,
|
|
@@ -28302,7 +28296,7 @@ ${lanes.join("\n")}
|
|
|
28302
28296
|
}
|
|
28303
28297
|
sourceFlags = contextFlags;
|
|
28304
28298
|
nextToken();
|
|
28305
|
-
const statements = parseList(
|
|
28299
|
+
const statements = parseList(0 /* SourceElements */, parseStatement);
|
|
28306
28300
|
Debug.assert(token() === 1 /* EndOfFileToken */);
|
|
28307
28301
|
const endOfFileToken = addJSDocComment(parseTokenNode());
|
|
28308
28302
|
const sourceFile = createSourceFile2(fileName, languageVersion2, scriptKind2, isDeclarationFile, statements, endOfFileToken, sourceFlags, setExternalModuleIndicator2);
|
|
@@ -28365,7 +28359,7 @@ ${lanes.join("\n")}
|
|
|
28365
28359
|
nextToken();
|
|
28366
28360
|
while (token() !== 1 /* EndOfFileToken */) {
|
|
28367
28361
|
const startPos = scanner2.getStartPos();
|
|
28368
|
-
const statement = parseListElement(
|
|
28362
|
+
const statement = parseListElement(0 /* SourceElements */, parseStatement);
|
|
28369
28363
|
statements.push(statement);
|
|
28370
28364
|
if (startPos === scanner2.getStartPos()) {
|
|
28371
28365
|
nextToken();
|
|
@@ -29052,19 +29046,19 @@ ${lanes.join("\n")}
|
|
|
29052
29046
|
return true;
|
|
29053
29047
|
}
|
|
29054
29048
|
switch (parsingContext2) {
|
|
29055
|
-
case
|
|
29056
|
-
case
|
|
29057
|
-
case
|
|
29049
|
+
case 0 /* SourceElements */:
|
|
29050
|
+
case 1 /* BlockStatements */:
|
|
29051
|
+
case 3 /* SwitchClauseStatements */:
|
|
29058
29052
|
return !(token() === 26 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement();
|
|
29059
|
-
case
|
|
29053
|
+
case 2 /* SwitchClauses */:
|
|
29060
29054
|
return token() === 82 /* CaseKeyword */ || token() === 88 /* DefaultKeyword */;
|
|
29061
|
-
case
|
|
29055
|
+
case 4 /* TypeMembers */:
|
|
29062
29056
|
return lookAhead(isTypeMemberStart);
|
|
29063
|
-
case
|
|
29057
|
+
case 5 /* ClassMembers */:
|
|
29064
29058
|
return lookAhead(isClassMemberStart) || token() === 26 /* SemicolonToken */ && !inErrorRecovery;
|
|
29065
|
-
case
|
|
29059
|
+
case 6 /* EnumMembers */:
|
|
29066
29060
|
return token() === 22 /* OpenBracketToken */ || isLiteralPropertyName();
|
|
29067
|
-
case
|
|
29061
|
+
case 12 /* ObjectLiteralMembers */:
|
|
29068
29062
|
switch (token()) {
|
|
29069
29063
|
case 22 /* OpenBracketToken */:
|
|
29070
29064
|
case 41 /* AsteriskToken */:
|
|
@@ -29074,13 +29068,13 @@ ${lanes.join("\n")}
|
|
|
29074
29068
|
default:
|
|
29075
29069
|
return isLiteralPropertyName();
|
|
29076
29070
|
}
|
|
29077
|
-
case
|
|
29071
|
+
case 18 /* RestProperties */:
|
|
29078
29072
|
return isLiteralPropertyName();
|
|
29079
|
-
case
|
|
29073
|
+
case 9 /* ObjectBindingElements */:
|
|
29080
29074
|
return token() === 22 /* OpenBracketToken */ || token() === 25 /* DotDotDotToken */ || isLiteralPropertyName();
|
|
29081
|
-
case
|
|
29075
|
+
case 24 /* AssertEntries */:
|
|
29082
29076
|
return isAssertionKey2();
|
|
29083
|
-
case
|
|
29077
|
+
case 7 /* HeritageClauseElement */:
|
|
29084
29078
|
if (token() === 18 /* OpenBraceToken */) {
|
|
29085
29079
|
return lookAhead(isValidHeritageClauseObjectLiteral);
|
|
29086
29080
|
}
|
|
@@ -29089,40 +29083,40 @@ ${lanes.join("\n")}
|
|
|
29089
29083
|
} else {
|
|
29090
29084
|
return isIdentifier2() && !isHeritageClauseExtendsOrImplementsKeyword();
|
|
29091
29085
|
}
|
|
29092
|
-
case
|
|
29086
|
+
case 8 /* VariableDeclarations */:
|
|
29093
29087
|
return isBindingIdentifierOrPrivateIdentifierOrPattern();
|
|
29094
|
-
case
|
|
29088
|
+
case 10 /* ArrayBindingElements */:
|
|
29095
29089
|
return token() === 27 /* CommaToken */ || token() === 25 /* DotDotDotToken */ || isBindingIdentifierOrPrivateIdentifierOrPattern();
|
|
29096
|
-
case
|
|
29090
|
+
case 19 /* TypeParameters */:
|
|
29097
29091
|
return token() === 101 /* InKeyword */ || token() === 85 /* ConstKeyword */ || isIdentifier2();
|
|
29098
|
-
case
|
|
29092
|
+
case 15 /* ArrayLiteralMembers */:
|
|
29099
29093
|
switch (token()) {
|
|
29100
29094
|
case 27 /* CommaToken */:
|
|
29101
29095
|
case 24 /* DotToken */:
|
|
29102
29096
|
return true;
|
|
29103
29097
|
}
|
|
29104
|
-
case
|
|
29098
|
+
case 11 /* ArgumentExpressions */:
|
|
29105
29099
|
return token() === 25 /* DotDotDotToken */ || isStartOfExpression();
|
|
29106
|
-
case
|
|
29100
|
+
case 16 /* Parameters */:
|
|
29107
29101
|
return isStartOfParameter(
|
|
29108
29102
|
/*isJSDocParameter*/
|
|
29109
29103
|
false
|
|
29110
29104
|
);
|
|
29111
|
-
case
|
|
29105
|
+
case 17 /* JSDocParameters */:
|
|
29112
29106
|
return isStartOfParameter(
|
|
29113
29107
|
/*isJSDocParameter*/
|
|
29114
29108
|
true
|
|
29115
29109
|
);
|
|
29116
|
-
case
|
|
29117
|
-
case
|
|
29110
|
+
case 20 /* TypeArguments */:
|
|
29111
|
+
case 21 /* TupleElementTypes */:
|
|
29118
29112
|
return token() === 27 /* CommaToken */ || isStartOfType();
|
|
29119
|
-
case
|
|
29113
|
+
case 22 /* HeritageClauses */:
|
|
29120
29114
|
return isHeritageClause2();
|
|
29121
|
-
case
|
|
29115
|
+
case 23 /* ImportOrExportSpecifiers */:
|
|
29122
29116
|
return tokenIsIdentifierOrKeyword(token());
|
|
29123
|
-
case
|
|
29117
|
+
case 13 /* JsxAttributes */:
|
|
29124
29118
|
return tokenIsIdentifierOrKeyword(token()) || token() === 18 /* OpenBraceToken */;
|
|
29125
|
-
case
|
|
29119
|
+
case 14 /* JsxChildren */:
|
|
29126
29120
|
return true;
|
|
29127
29121
|
}
|
|
29128
29122
|
return Debug.fail("Non-exhaustive case in 'isListElement'.");
|
|
@@ -29166,41 +29160,41 @@ ${lanes.join("\n")}
|
|
|
29166
29160
|
return true;
|
|
29167
29161
|
}
|
|
29168
29162
|
switch (kind) {
|
|
29169
|
-
case
|
|
29170
|
-
case
|
|
29171
|
-
case
|
|
29172
|
-
case
|
|
29173
|
-
case
|
|
29174
|
-
case
|
|
29175
|
-
case
|
|
29176
|
-
case
|
|
29177
|
-
case
|
|
29163
|
+
case 1 /* BlockStatements */:
|
|
29164
|
+
case 2 /* SwitchClauses */:
|
|
29165
|
+
case 4 /* TypeMembers */:
|
|
29166
|
+
case 5 /* ClassMembers */:
|
|
29167
|
+
case 6 /* EnumMembers */:
|
|
29168
|
+
case 12 /* ObjectLiteralMembers */:
|
|
29169
|
+
case 9 /* ObjectBindingElements */:
|
|
29170
|
+
case 23 /* ImportOrExportSpecifiers */:
|
|
29171
|
+
case 24 /* AssertEntries */:
|
|
29178
29172
|
return token() === 19 /* CloseBraceToken */;
|
|
29179
|
-
case
|
|
29173
|
+
case 3 /* SwitchClauseStatements */:
|
|
29180
29174
|
return token() === 19 /* CloseBraceToken */ || token() === 82 /* CaseKeyword */ || token() === 88 /* DefaultKeyword */;
|
|
29181
|
-
case
|
|
29175
|
+
case 7 /* HeritageClauseElement */:
|
|
29182
29176
|
return token() === 18 /* OpenBraceToken */ || token() === 94 /* ExtendsKeyword */ || token() === 117 /* ImplementsKeyword */;
|
|
29183
|
-
case
|
|
29177
|
+
case 8 /* VariableDeclarations */:
|
|
29184
29178
|
return isVariableDeclaratorListTerminator();
|
|
29185
|
-
case
|
|
29179
|
+
case 19 /* TypeParameters */:
|
|
29186
29180
|
return token() === 31 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 94 /* ExtendsKeyword */ || token() === 117 /* ImplementsKeyword */;
|
|
29187
|
-
case
|
|
29181
|
+
case 11 /* ArgumentExpressions */:
|
|
29188
29182
|
return token() === 21 /* CloseParenToken */ || token() === 26 /* SemicolonToken */;
|
|
29189
|
-
case
|
|
29190
|
-
case
|
|
29191
|
-
case
|
|
29183
|
+
case 15 /* ArrayLiteralMembers */:
|
|
29184
|
+
case 21 /* TupleElementTypes */:
|
|
29185
|
+
case 10 /* ArrayBindingElements */:
|
|
29192
29186
|
return token() === 23 /* CloseBracketToken */;
|
|
29193
|
-
case
|
|
29194
|
-
case
|
|
29195
|
-
case
|
|
29187
|
+
case 17 /* JSDocParameters */:
|
|
29188
|
+
case 16 /* Parameters */:
|
|
29189
|
+
case 18 /* RestProperties */:
|
|
29196
29190
|
return token() === 21 /* CloseParenToken */ || token() === 23 /* CloseBracketToken */;
|
|
29197
|
-
case
|
|
29191
|
+
case 20 /* TypeArguments */:
|
|
29198
29192
|
return token() !== 27 /* CommaToken */;
|
|
29199
|
-
case
|
|
29193
|
+
case 22 /* HeritageClauses */:
|
|
29200
29194
|
return token() === 18 /* OpenBraceToken */ || token() === 19 /* CloseBraceToken */;
|
|
29201
|
-
case
|
|
29195
|
+
case 13 /* JsxAttributes */:
|
|
29202
29196
|
return token() === 31 /* GreaterThanToken */ || token() === 43 /* SlashToken */;
|
|
29203
|
-
case
|
|
29197
|
+
case 14 /* JsxChildren */:
|
|
29204
29198
|
return token() === 29 /* LessThanToken */ && lookAhead(nextTokenIsSlash);
|
|
29205
29199
|
default:
|
|
29206
29200
|
return false;
|
|
@@ -29219,7 +29213,7 @@ ${lanes.join("\n")}
|
|
|
29219
29213
|
return false;
|
|
29220
29214
|
}
|
|
29221
29215
|
function isInSomeParsingContext() {
|
|
29222
|
-
for (let kind = 0; kind <
|
|
29216
|
+
for (let kind = 0; kind < 25 /* Count */; kind++) {
|
|
29223
29217
|
if (parsingContext & 1 << kind) {
|
|
29224
29218
|
if (isListElement2(
|
|
29225
29219
|
kind,
|
|
@@ -29288,38 +29282,38 @@ ${lanes.join("\n")}
|
|
|
29288
29282
|
}
|
|
29289
29283
|
function isReusableParsingContext(parsingContext2) {
|
|
29290
29284
|
switch (parsingContext2) {
|
|
29291
|
-
case
|
|
29292
|
-
case
|
|
29293
|
-
case
|
|
29294
|
-
case
|
|
29295
|
-
case
|
|
29296
|
-
case
|
|
29297
|
-
case
|
|
29298
|
-
case
|
|
29299
|
-
case
|
|
29300
|
-
case
|
|
29285
|
+
case 5 /* ClassMembers */:
|
|
29286
|
+
case 2 /* SwitchClauses */:
|
|
29287
|
+
case 0 /* SourceElements */:
|
|
29288
|
+
case 1 /* BlockStatements */:
|
|
29289
|
+
case 3 /* SwitchClauseStatements */:
|
|
29290
|
+
case 6 /* EnumMembers */:
|
|
29291
|
+
case 4 /* TypeMembers */:
|
|
29292
|
+
case 8 /* VariableDeclarations */:
|
|
29293
|
+
case 17 /* JSDocParameters */:
|
|
29294
|
+
case 16 /* Parameters */:
|
|
29301
29295
|
return true;
|
|
29302
29296
|
}
|
|
29303
29297
|
return false;
|
|
29304
29298
|
}
|
|
29305
29299
|
function canReuseNode(node, parsingContext2) {
|
|
29306
29300
|
switch (parsingContext2) {
|
|
29307
|
-
case
|
|
29301
|
+
case 5 /* ClassMembers */:
|
|
29308
29302
|
return isReusableClassMember(node);
|
|
29309
|
-
case
|
|
29303
|
+
case 2 /* SwitchClauses */:
|
|
29310
29304
|
return isReusableSwitchClause(node);
|
|
29311
|
-
case
|
|
29312
|
-
case
|
|
29313
|
-
case
|
|
29305
|
+
case 0 /* SourceElements */:
|
|
29306
|
+
case 1 /* BlockStatements */:
|
|
29307
|
+
case 3 /* SwitchClauseStatements */:
|
|
29314
29308
|
return isReusableStatement(node);
|
|
29315
|
-
case
|
|
29309
|
+
case 6 /* EnumMembers */:
|
|
29316
29310
|
return isReusableEnumMember(node);
|
|
29317
|
-
case
|
|
29311
|
+
case 4 /* TypeMembers */:
|
|
29318
29312
|
return isReusableTypeMember(node);
|
|
29319
|
-
case
|
|
29313
|
+
case 8 /* VariableDeclarations */:
|
|
29320
29314
|
return isReusableVariableDeclaration(node);
|
|
29321
|
-
case
|
|
29322
|
-
case
|
|
29315
|
+
case 17 /* JSDocParameters */:
|
|
29316
|
+
case 16 /* Parameters */:
|
|
29323
29317
|
return isReusableParameter(node);
|
|
29324
29318
|
}
|
|
29325
29319
|
return false;
|
|
@@ -29429,56 +29423,56 @@ ${lanes.join("\n")}
|
|
|
29429
29423
|
}
|
|
29430
29424
|
function parsingContextErrors(context) {
|
|
29431
29425
|
switch (context) {
|
|
29432
|
-
case
|
|
29426
|
+
case 0 /* SourceElements */:
|
|
29433
29427
|
return token() === 88 /* DefaultKeyword */ ? parseErrorAtCurrentToken(Diagnostics._0_expected, tokenToString(93 /* ExportKeyword */)) : parseErrorAtCurrentToken(Diagnostics.Declaration_or_statement_expected);
|
|
29434
|
-
case
|
|
29428
|
+
case 1 /* BlockStatements */:
|
|
29435
29429
|
return parseErrorAtCurrentToken(Diagnostics.Declaration_or_statement_expected);
|
|
29436
|
-
case
|
|
29430
|
+
case 2 /* SwitchClauses */:
|
|
29437
29431
|
return parseErrorAtCurrentToken(Diagnostics.case_or_default_expected);
|
|
29438
|
-
case
|
|
29432
|
+
case 3 /* SwitchClauseStatements */:
|
|
29439
29433
|
return parseErrorAtCurrentToken(Diagnostics.Statement_expected);
|
|
29440
|
-
case
|
|
29441
|
-
case
|
|
29434
|
+
case 18 /* RestProperties */:
|
|
29435
|
+
case 4 /* TypeMembers */:
|
|
29442
29436
|
return parseErrorAtCurrentToken(Diagnostics.Property_or_signature_expected);
|
|
29443
|
-
case
|
|
29437
|
+
case 5 /* ClassMembers */:
|
|
29444
29438
|
return parseErrorAtCurrentToken(Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected);
|
|
29445
|
-
case
|
|
29439
|
+
case 6 /* EnumMembers */:
|
|
29446
29440
|
return parseErrorAtCurrentToken(Diagnostics.Enum_member_expected);
|
|
29447
|
-
case
|
|
29441
|
+
case 7 /* HeritageClauseElement */:
|
|
29448
29442
|
return parseErrorAtCurrentToken(Diagnostics.Expression_expected);
|
|
29449
|
-
case
|
|
29443
|
+
case 8 /* VariableDeclarations */:
|
|
29450
29444
|
return isKeyword(token()) ? parseErrorAtCurrentToken(Diagnostics._0_is_not_allowed_as_a_variable_declaration_name, tokenToString(token())) : parseErrorAtCurrentToken(Diagnostics.Variable_declaration_expected);
|
|
29451
|
-
case
|
|
29445
|
+
case 9 /* ObjectBindingElements */:
|
|
29452
29446
|
return parseErrorAtCurrentToken(Diagnostics.Property_destructuring_pattern_expected);
|
|
29453
|
-
case
|
|
29447
|
+
case 10 /* ArrayBindingElements */:
|
|
29454
29448
|
return parseErrorAtCurrentToken(Diagnostics.Array_element_destructuring_pattern_expected);
|
|
29455
|
-
case
|
|
29449
|
+
case 11 /* ArgumentExpressions */:
|
|
29456
29450
|
return parseErrorAtCurrentToken(Diagnostics.Argument_expression_expected);
|
|
29457
|
-
case
|
|
29451
|
+
case 12 /* ObjectLiteralMembers */:
|
|
29458
29452
|
return parseErrorAtCurrentToken(Diagnostics.Property_assignment_expected);
|
|
29459
|
-
case
|
|
29453
|
+
case 15 /* ArrayLiteralMembers */:
|
|
29460
29454
|
return parseErrorAtCurrentToken(Diagnostics.Expression_or_comma_expected);
|
|
29461
|
-
case
|
|
29455
|
+
case 17 /* JSDocParameters */:
|
|
29462
29456
|
return parseErrorAtCurrentToken(Diagnostics.Parameter_declaration_expected);
|
|
29463
|
-
case
|
|
29457
|
+
case 16 /* Parameters */:
|
|
29464
29458
|
return isKeyword(token()) ? parseErrorAtCurrentToken(Diagnostics._0_is_not_allowed_as_a_parameter_name, tokenToString(token())) : parseErrorAtCurrentToken(Diagnostics.Parameter_declaration_expected);
|
|
29465
|
-
case
|
|
29459
|
+
case 19 /* TypeParameters */:
|
|
29466
29460
|
return parseErrorAtCurrentToken(Diagnostics.Type_parameter_declaration_expected);
|
|
29467
|
-
case
|
|
29461
|
+
case 20 /* TypeArguments */:
|
|
29468
29462
|
return parseErrorAtCurrentToken(Diagnostics.Type_argument_expected);
|
|
29469
|
-
case
|
|
29463
|
+
case 21 /* TupleElementTypes */:
|
|
29470
29464
|
return parseErrorAtCurrentToken(Diagnostics.Type_expected);
|
|
29471
|
-
case
|
|
29465
|
+
case 22 /* HeritageClauses */:
|
|
29472
29466
|
return parseErrorAtCurrentToken(Diagnostics.Unexpected_token_expected);
|
|
29473
|
-
case
|
|
29467
|
+
case 23 /* ImportOrExportSpecifiers */:
|
|
29474
29468
|
return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
|
|
29475
|
-
case
|
|
29469
|
+
case 13 /* JsxAttributes */:
|
|
29476
29470
|
return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
|
|
29477
|
-
case
|
|
29471
|
+
case 14 /* JsxChildren */:
|
|
29478
29472
|
return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
|
|
29479
|
-
case
|
|
29473
|
+
case 24 /* AssertEntries */:
|
|
29480
29474
|
return parseErrorAtCurrentToken(Diagnostics.Identifier_or_string_literal_expected);
|
|
29481
|
-
case
|
|
29475
|
+
case 25 /* Count */:
|
|
29482
29476
|
return Debug.fail("ParsingContext.Count used as a context");
|
|
29483
29477
|
default:
|
|
29484
29478
|
Debug.assertNever(context);
|
|
@@ -29537,7 +29531,7 @@ ${lanes.join("\n")}
|
|
|
29537
29531
|
);
|
|
29538
29532
|
}
|
|
29539
29533
|
function getExpectedCommaDiagnostic(kind) {
|
|
29540
|
-
return kind ===
|
|
29534
|
+
return kind === 6 /* EnumMembers */ ? Diagnostics.An_enum_member_name_must_be_followed_by_a_or : void 0;
|
|
29541
29535
|
}
|
|
29542
29536
|
function createMissingList() {
|
|
29543
29537
|
const list = createNodeArray([], getNodePos());
|
|
@@ -29731,7 +29725,7 @@ ${lanes.join("\n")}
|
|
|
29731
29725
|
}
|
|
29732
29726
|
function parseTypeArgumentsOfTypeReference() {
|
|
29733
29727
|
if (!scanner2.hasPrecedingLineBreak() && reScanLessThanToken() === 29 /* LessThanToken */) {
|
|
29734
|
-
return parseBracketedList(
|
|
29728
|
+
return parseBracketedList(20 /* TypeArguments */, parseType, 29 /* LessThanToken */, 31 /* GreaterThanToken */);
|
|
29735
29729
|
}
|
|
29736
29730
|
}
|
|
29737
29731
|
function parseTypeReference() {
|
|
@@ -29913,7 +29907,7 @@ ${lanes.join("\n")}
|
|
|
29913
29907
|
}
|
|
29914
29908
|
function parseTypeParameters() {
|
|
29915
29909
|
if (token() === 29 /* LessThanToken */) {
|
|
29916
|
-
return parseBracketedList(
|
|
29910
|
+
return parseBracketedList(19 /* TypeParameters */, parseTypeParameter, 29 /* LessThanToken */, 31 /* GreaterThanToken */);
|
|
29917
29911
|
}
|
|
29918
29912
|
}
|
|
29919
29913
|
function isStartOfParameter(isJSDocParameter) {
|
|
@@ -30019,7 +30013,7 @@ ${lanes.join("\n")}
|
|
|
30019
30013
|
const savedAwaitContext = inAwaitContext();
|
|
30020
30014
|
setYieldContext(!!(flags & 1 /* Yield */));
|
|
30021
30015
|
setAwaitContext(!!(flags & 2 /* Await */));
|
|
30022
|
-
const parameters = flags & 32 /* JSDoc */ ? parseDelimitedList(
|
|
30016
|
+
const parameters = flags & 32 /* JSDoc */ ? parseDelimitedList(17 /* JSDocParameters */, parseJSDocParameter) : parseDelimitedList(16 /* Parameters */, () => allowAmbiguity ? parseParameter(savedAwaitContext) : parseParameterForSpeculation(savedAwaitContext));
|
|
30023
30017
|
setYieldContext(savedYieldContext);
|
|
30024
30018
|
setAwaitContext(savedAwaitContext);
|
|
30025
30019
|
return parameters;
|
|
@@ -30087,7 +30081,7 @@ ${lanes.join("\n")}
|
|
|
30087
30081
|
return token() === 58 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
|
|
30088
30082
|
}
|
|
30089
30083
|
function parseIndexSignatureDeclaration(pos, hasJSDoc, modifiers) {
|
|
30090
|
-
const parameters = parseBracketedList(
|
|
30084
|
+
const parameters = parseBracketedList(16 /* Parameters */, () => parseParameter(
|
|
30091
30085
|
/*inOuterAwaitContext*/
|
|
30092
30086
|
false
|
|
30093
30087
|
), 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
|
|
@@ -30186,7 +30180,7 @@ ${lanes.join("\n")}
|
|
|
30186
30180
|
function parseObjectTypeMembers() {
|
|
30187
30181
|
let members;
|
|
30188
30182
|
if (parseExpected(18 /* OpenBraceToken */)) {
|
|
30189
|
-
members = parseList(
|
|
30183
|
+
members = parseList(4 /* TypeMembers */, parseTypeMember);
|
|
30190
30184
|
parseExpected(19 /* CloseBraceToken */);
|
|
30191
30185
|
} else {
|
|
30192
30186
|
members = createMissingList();
|
|
@@ -30240,7 +30234,7 @@ ${lanes.join("\n")}
|
|
|
30240
30234
|
}
|
|
30241
30235
|
const type = parseTypeAnnotation();
|
|
30242
30236
|
parseSemicolon();
|
|
30243
|
-
const members = parseList(
|
|
30237
|
+
const members = parseList(4 /* TypeMembers */, parseTypeMember);
|
|
30244
30238
|
parseExpected(19 /* CloseBraceToken */);
|
|
30245
30239
|
return finishNode(factory2.createMappedTypeNode(readonlyToken, typeParameter, nameType, questionToken, type, members), pos);
|
|
30246
30240
|
}
|
|
@@ -30285,7 +30279,7 @@ ${lanes.join("\n")}
|
|
|
30285
30279
|
const pos = getNodePos();
|
|
30286
30280
|
return finishNode(
|
|
30287
30281
|
factory2.createTupleTypeNode(
|
|
30288
|
-
parseBracketedList(
|
|
30282
|
+
parseBracketedList(21 /* TupleElementTypes */, parseTupleElementNameOrTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */)
|
|
30289
30283
|
),
|
|
30290
30284
|
pos
|
|
30291
30285
|
);
|
|
@@ -30913,10 +30907,10 @@ ${lanes.join("\n")}
|
|
|
30913
30907
|
}
|
|
30914
30908
|
function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
|
|
30915
30909
|
const triState = isParenthesizedArrowFunctionExpression();
|
|
30916
|
-
if (triState ===
|
|
30910
|
+
if (triState === 0 /* False */) {
|
|
30917
30911
|
return void 0;
|
|
30918
30912
|
}
|
|
30919
|
-
return triState ===
|
|
30913
|
+
return triState === 1 /* True */ ? parseParenthesizedArrowFunctionExpression(
|
|
30920
30914
|
/*allowAmbiguity*/
|
|
30921
30915
|
true,
|
|
30922
30916
|
/*allowReturnTypeInArrowFunction*/
|
|
@@ -30928,18 +30922,18 @@ ${lanes.join("\n")}
|
|
|
30928
30922
|
return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
|
|
30929
30923
|
}
|
|
30930
30924
|
if (token() === 38 /* EqualsGreaterThanToken */) {
|
|
30931
|
-
return
|
|
30925
|
+
return 1 /* True */;
|
|
30932
30926
|
}
|
|
30933
|
-
return
|
|
30927
|
+
return 0 /* False */;
|
|
30934
30928
|
}
|
|
30935
30929
|
function isParenthesizedArrowFunctionExpressionWorker() {
|
|
30936
30930
|
if (token() === 132 /* AsyncKeyword */) {
|
|
30937
30931
|
nextToken();
|
|
30938
30932
|
if (scanner2.hasPrecedingLineBreak()) {
|
|
30939
|
-
return
|
|
30933
|
+
return 0 /* False */;
|
|
30940
30934
|
}
|
|
30941
30935
|
if (token() !== 20 /* OpenParenToken */ && token() !== 29 /* LessThanToken */) {
|
|
30942
|
-
return
|
|
30936
|
+
return 0 /* False */;
|
|
30943
30937
|
}
|
|
30944
30938
|
}
|
|
30945
30939
|
const first2 = token();
|
|
@@ -30951,45 +30945,45 @@ ${lanes.join("\n")}
|
|
|
30951
30945
|
case 38 /* EqualsGreaterThanToken */:
|
|
30952
30946
|
case 58 /* ColonToken */:
|
|
30953
30947
|
case 18 /* OpenBraceToken */:
|
|
30954
|
-
return
|
|
30948
|
+
return 1 /* True */;
|
|
30955
30949
|
default:
|
|
30956
|
-
return
|
|
30950
|
+
return 0 /* False */;
|
|
30957
30951
|
}
|
|
30958
30952
|
}
|
|
30959
30953
|
if (second === 22 /* OpenBracketToken */ || second === 18 /* OpenBraceToken */) {
|
|
30960
|
-
return
|
|
30954
|
+
return 2 /* Unknown */;
|
|
30961
30955
|
}
|
|
30962
30956
|
if (second === 25 /* DotDotDotToken */) {
|
|
30963
|
-
return
|
|
30957
|
+
return 1 /* True */;
|
|
30964
30958
|
}
|
|
30965
30959
|
if (isModifierKind(second) && second !== 132 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
|
|
30966
30960
|
if (nextToken() === 128 /* AsKeyword */) {
|
|
30967
|
-
return
|
|
30961
|
+
return 0 /* False */;
|
|
30968
30962
|
}
|
|
30969
|
-
return
|
|
30963
|
+
return 1 /* True */;
|
|
30970
30964
|
}
|
|
30971
30965
|
if (!isIdentifier2() && second !== 108 /* ThisKeyword */) {
|
|
30972
|
-
return
|
|
30966
|
+
return 0 /* False */;
|
|
30973
30967
|
}
|
|
30974
30968
|
switch (nextToken()) {
|
|
30975
30969
|
case 58 /* ColonToken */:
|
|
30976
|
-
return
|
|
30970
|
+
return 1 /* True */;
|
|
30977
30971
|
case 57 /* QuestionToken */:
|
|
30978
30972
|
nextToken();
|
|
30979
30973
|
if (token() === 58 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 63 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
|
|
30980
|
-
return
|
|
30974
|
+
return 1 /* True */;
|
|
30981
30975
|
}
|
|
30982
|
-
return
|
|
30976
|
+
return 0 /* False */;
|
|
30983
30977
|
case 27 /* CommaToken */:
|
|
30984
30978
|
case 63 /* EqualsToken */:
|
|
30985
30979
|
case 21 /* CloseParenToken */:
|
|
30986
|
-
return
|
|
30980
|
+
return 2 /* Unknown */;
|
|
30987
30981
|
}
|
|
30988
|
-
return
|
|
30982
|
+
return 0 /* False */;
|
|
30989
30983
|
} else {
|
|
30990
30984
|
Debug.assert(first2 === 29 /* LessThanToken */);
|
|
30991
30985
|
if (!isIdentifier2() && token() !== 85 /* ConstKeyword */) {
|
|
30992
|
-
return
|
|
30986
|
+
return 0 /* False */;
|
|
30993
30987
|
}
|
|
30994
30988
|
if (languageVariant === 1 /* JSX */) {
|
|
30995
30989
|
const isArrowFunctionInJsx = lookAhead(() => {
|
|
@@ -31011,11 +31005,11 @@ ${lanes.join("\n")}
|
|
|
31011
31005
|
return false;
|
|
31012
31006
|
});
|
|
31013
31007
|
if (isArrowFunctionInJsx) {
|
|
31014
|
-
return
|
|
31008
|
+
return 1 /* True */;
|
|
31015
31009
|
}
|
|
31016
|
-
return
|
|
31010
|
+
return 0 /* False */;
|
|
31017
31011
|
}
|
|
31018
|
-
return
|
|
31012
|
+
return 2 /* Unknown */;
|
|
31019
31013
|
}
|
|
31020
31014
|
}
|
|
31021
31015
|
function parsePossibleParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
|
|
@@ -31035,7 +31029,7 @@ ${lanes.join("\n")}
|
|
|
31035
31029
|
}
|
|
31036
31030
|
function tryParseAsyncSimpleArrowFunctionExpression(allowReturnTypeInArrowFunction) {
|
|
31037
31031
|
if (token() === 132 /* AsyncKeyword */) {
|
|
31038
|
-
if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) ===
|
|
31032
|
+
if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
|
|
31039
31033
|
const pos = getNodePos();
|
|
31040
31034
|
const asyncModifier = parseModifiersForArrowFunction();
|
|
31041
31035
|
const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
|
|
@@ -31048,14 +31042,14 @@ ${lanes.join("\n")}
|
|
|
31048
31042
|
if (token() === 132 /* AsyncKeyword */) {
|
|
31049
31043
|
nextToken();
|
|
31050
31044
|
if (scanner2.hasPrecedingLineBreak() || token() === 38 /* EqualsGreaterThanToken */) {
|
|
31051
|
-
return
|
|
31045
|
+
return 0 /* False */;
|
|
31052
31046
|
}
|
|
31053
31047
|
const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
|
|
31054
31048
|
if (!scanner2.hasPrecedingLineBreak() && expr.kind === 79 /* Identifier */ && token() === 38 /* EqualsGreaterThanToken */) {
|
|
31055
|
-
return
|
|
31049
|
+
return 1 /* True */;
|
|
31056
31050
|
}
|
|
31057
31051
|
}
|
|
31058
|
-
return
|
|
31052
|
+
return 0 /* False */;
|
|
31059
31053
|
}
|
|
31060
31054
|
function parseParenthesizedArrowFunctionExpression(allowAmbiguity, allowReturnTypeInArrowFunction) {
|
|
31061
31055
|
const pos = getNodePos();
|
|
@@ -31260,6 +31254,12 @@ ${lanes.join("\n")}
|
|
|
31260
31254
|
case 114 /* VoidKeyword */:
|
|
31261
31255
|
return parseVoidExpression();
|
|
31262
31256
|
case 29 /* LessThanToken */:
|
|
31257
|
+
if (languageVariant === 1 /* JSX */ && token() === 29 /* LessThanToken */ && lookAhead(nextTokenIsIdentifierOrKeywordOrGreaterThan)) {
|
|
31258
|
+
return parseJsxElementOrSelfClosingElementOrFragment(
|
|
31259
|
+
/*inExpressionContext*/
|
|
31260
|
+
true
|
|
31261
|
+
);
|
|
31262
|
+
}
|
|
31263
31263
|
return parseTypeAssertion();
|
|
31264
31264
|
case 133 /* AwaitKeyword */:
|
|
31265
31265
|
if (isAwaitExpression2()) {
|
|
@@ -31463,7 +31463,7 @@ ${lanes.join("\n")}
|
|
|
31463
31463
|
const list = [];
|
|
31464
31464
|
const listPos = getNodePos();
|
|
31465
31465
|
const saveParsingContext = parsingContext;
|
|
31466
|
-
parsingContext |= 1 <<
|
|
31466
|
+
parsingContext |= 1 << 14 /* JsxChildren */;
|
|
31467
31467
|
while (true) {
|
|
31468
31468
|
const child = parseJsxChild(openingTag, currentToken = scanner2.reScanJsxToken());
|
|
31469
31469
|
if (!child)
|
|
@@ -31478,7 +31478,7 @@ ${lanes.join("\n")}
|
|
|
31478
31478
|
}
|
|
31479
31479
|
function parseJsxAttributes() {
|
|
31480
31480
|
const pos = getNodePos();
|
|
31481
|
-
return finishNode(factory2.createJsxAttributes(parseList(
|
|
31481
|
+
return finishNode(factory2.createJsxAttributes(parseList(13 /* JsxAttributes */, parseJsxAttribute)), pos);
|
|
31482
31482
|
}
|
|
31483
31483
|
function parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext) {
|
|
31484
31484
|
const pos = getNodePos();
|
|
@@ -31631,6 +31631,7 @@ ${lanes.join("\n")}
|
|
|
31631
31631
|
return finishNode(factory2.createJsxJsxClosingFragment(), pos);
|
|
31632
31632
|
}
|
|
31633
31633
|
function parseTypeAssertion() {
|
|
31634
|
+
Debug.assert(scriptKind === 3 /* TS */ || scriptKind === 4 /* TSX */, "Type assertions should never be parsed outside of TS/TSX; they should either be comparisons or JSX.");
|
|
31634
31635
|
const pos = getNodePos();
|
|
31635
31636
|
parseExpected(29 /* LessThanToken */);
|
|
31636
31637
|
const type = parseType();
|
|
@@ -31806,7 +31807,7 @@ ${lanes.join("\n")}
|
|
|
31806
31807
|
}
|
|
31807
31808
|
function parseArgumentList() {
|
|
31808
31809
|
parseExpected(20 /* OpenParenToken */);
|
|
31809
|
-
const result = parseDelimitedList(
|
|
31810
|
+
const result = parseDelimitedList(11 /* ArgumentExpressions */, parseArgumentExpression);
|
|
31810
31811
|
parseExpected(21 /* CloseParenToken */);
|
|
31811
31812
|
return result;
|
|
31812
31813
|
}
|
|
@@ -31818,7 +31819,7 @@ ${lanes.join("\n")}
|
|
|
31818
31819
|
return void 0;
|
|
31819
31820
|
}
|
|
31820
31821
|
nextToken();
|
|
31821
|
-
const typeArguments = parseDelimitedList(
|
|
31822
|
+
const typeArguments = parseDelimitedList(20 /* TypeArguments */, parseType);
|
|
31822
31823
|
if (reScanGreaterToken() !== 31 /* GreaterThanToken */) {
|
|
31823
31824
|
return void 0;
|
|
31824
31825
|
}
|
|
@@ -31918,7 +31919,7 @@ ${lanes.join("\n")}
|
|
|
31918
31919
|
const openBracketPosition = scanner2.getTokenPos();
|
|
31919
31920
|
const openBracketParsed = parseExpected(22 /* OpenBracketToken */);
|
|
31920
31921
|
const multiLine = scanner2.hasPrecedingLineBreak();
|
|
31921
|
-
const elements = parseDelimitedList(
|
|
31922
|
+
const elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
|
|
31922
31923
|
parseExpectedMatchingBrackets(22 /* OpenBracketToken */, 23 /* CloseBracketToken */, openBracketParsed, openBracketPosition);
|
|
31923
31924
|
return finishNode(factory2.createArrayLiteralExpression(elements, multiLine), pos);
|
|
31924
31925
|
}
|
|
@@ -31979,7 +31980,7 @@ ${lanes.join("\n")}
|
|
|
31979
31980
|
const openBraceParsed = parseExpected(18 /* OpenBraceToken */);
|
|
31980
31981
|
const multiLine = scanner2.hasPrecedingLineBreak();
|
|
31981
31982
|
const properties = parseDelimitedList(
|
|
31982
|
-
|
|
31983
|
+
12 /* ObjectLiteralMembers */,
|
|
31983
31984
|
parseObjectLiteralElement,
|
|
31984
31985
|
/*considerSemicolonAsDelimiter*/
|
|
31985
31986
|
true
|
|
@@ -32051,7 +32052,7 @@ ${lanes.join("\n")}
|
|
|
32051
32052
|
const openBraceParsed = parseExpected(18 /* OpenBraceToken */, diagnosticMessage);
|
|
32052
32053
|
if (openBraceParsed || ignoreMissingOpenBrace) {
|
|
32053
32054
|
const multiLine = scanner2.hasPrecedingLineBreak();
|
|
32054
|
-
const statements = parseList(
|
|
32055
|
+
const statements = parseList(1 /* BlockStatements */, parseStatement);
|
|
32055
32056
|
parseExpectedMatchingBrackets(18 /* OpenBraceToken */, 19 /* CloseBraceToken */, openBraceParsed, openBracePosition);
|
|
32056
32057
|
const result = withJSDoc(finishNode(factory2.createBlock(statements, multiLine), pos), hasJSDoc);
|
|
32057
32058
|
if (token() === 63 /* EqualsToken */) {
|
|
@@ -32209,14 +32210,14 @@ ${lanes.join("\n")}
|
|
|
32209
32210
|
parseExpected(82 /* CaseKeyword */);
|
|
32210
32211
|
const expression = allowInAnd(parseExpression);
|
|
32211
32212
|
parseExpected(58 /* ColonToken */);
|
|
32212
|
-
const statements = parseList(
|
|
32213
|
+
const statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
|
|
32213
32214
|
return withJSDoc(finishNode(factory2.createCaseClause(expression, statements), pos), hasJSDoc);
|
|
32214
32215
|
}
|
|
32215
32216
|
function parseDefaultClause() {
|
|
32216
32217
|
const pos = getNodePos();
|
|
32217
32218
|
parseExpected(88 /* DefaultKeyword */);
|
|
32218
32219
|
parseExpected(58 /* ColonToken */);
|
|
32219
|
-
const statements = parseList(
|
|
32220
|
+
const statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
|
|
32220
32221
|
return finishNode(factory2.createDefaultClause(statements), pos);
|
|
32221
32222
|
}
|
|
32222
32223
|
function parseCaseOrDefaultClause() {
|
|
@@ -32225,7 +32226,7 @@ ${lanes.join("\n")}
|
|
|
32225
32226
|
function parseCaseBlock() {
|
|
32226
32227
|
const pos = getNodePos();
|
|
32227
32228
|
parseExpected(18 /* OpenBraceToken */);
|
|
32228
|
-
const clauses = parseList(
|
|
32229
|
+
const clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
|
|
32229
32230
|
parseExpected(19 /* CloseBraceToken */);
|
|
32230
32231
|
return finishNode(factory2.createCaseBlock(clauses), pos);
|
|
32231
32232
|
}
|
|
@@ -32666,14 +32667,14 @@ ${lanes.join("\n")}
|
|
|
32666
32667
|
function parseObjectBindingPattern() {
|
|
32667
32668
|
const pos = getNodePos();
|
|
32668
32669
|
parseExpected(18 /* OpenBraceToken */);
|
|
32669
|
-
const elements = parseDelimitedList(
|
|
32670
|
+
const elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
|
|
32670
32671
|
parseExpected(19 /* CloseBraceToken */);
|
|
32671
32672
|
return finishNode(factory2.createObjectBindingPattern(elements), pos);
|
|
32672
32673
|
}
|
|
32673
32674
|
function parseArrayBindingPattern() {
|
|
32674
32675
|
const pos = getNodePos();
|
|
32675
32676
|
parseExpected(22 /* OpenBracketToken */);
|
|
32676
|
-
const elements = parseDelimitedList(
|
|
32677
|
+
const elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
|
|
32677
32678
|
parseExpected(23 /* CloseBracketToken */);
|
|
32678
32679
|
return finishNode(factory2.createArrayBindingPattern(elements), pos);
|
|
32679
32680
|
}
|
|
@@ -32731,7 +32732,7 @@ ${lanes.join("\n")}
|
|
|
32731
32732
|
const savedDisallowIn = inDisallowInContext();
|
|
32732
32733
|
setDisallowInContext(inForStatementInitializer);
|
|
32733
32734
|
declarations = parseDelimitedList(
|
|
32734
|
-
|
|
32735
|
+
8 /* VariableDeclarations */,
|
|
32735
32736
|
inForStatementInitializer ? parseVariableDeclaration : parseVariableDeclarationAllowExclamation
|
|
32736
32737
|
);
|
|
32737
32738
|
setDisallowInContext(savedDisallowIn);
|
|
@@ -33134,7 +33135,7 @@ ${lanes.join("\n")}
|
|
|
33134
33135
|
}
|
|
33135
33136
|
function parseHeritageClauses() {
|
|
33136
33137
|
if (isHeritageClause2()) {
|
|
33137
|
-
return parseList(
|
|
33138
|
+
return parseList(22 /* HeritageClauses */, parseHeritageClause);
|
|
33138
33139
|
}
|
|
33139
33140
|
return void 0;
|
|
33140
33141
|
}
|
|
@@ -33143,7 +33144,7 @@ ${lanes.join("\n")}
|
|
|
33143
33144
|
const tok = token();
|
|
33144
33145
|
Debug.assert(tok === 94 /* ExtendsKeyword */ || tok === 117 /* ImplementsKeyword */);
|
|
33145
33146
|
nextToken();
|
|
33146
|
-
const types = parseDelimitedList(
|
|
33147
|
+
const types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
|
|
33147
33148
|
return finishNode(factory2.createHeritageClause(tok, types), pos);
|
|
33148
33149
|
}
|
|
33149
33150
|
function parseExpressionWithTypeArguments() {
|
|
@@ -33156,13 +33157,13 @@ ${lanes.join("\n")}
|
|
|
33156
33157
|
return finishNode(factory2.createExpressionWithTypeArguments(expression, typeArguments), pos);
|
|
33157
33158
|
}
|
|
33158
33159
|
function tryParseTypeArguments() {
|
|
33159
|
-
return token() === 29 /* LessThanToken */ ? parseBracketedList(
|
|
33160
|
+
return token() === 29 /* LessThanToken */ ? parseBracketedList(20 /* TypeArguments */, parseType, 29 /* LessThanToken */, 31 /* GreaterThanToken */) : void 0;
|
|
33160
33161
|
}
|
|
33161
33162
|
function isHeritageClause2() {
|
|
33162
33163
|
return token() === 94 /* ExtendsKeyword */ || token() === 117 /* ImplementsKeyword */;
|
|
33163
33164
|
}
|
|
33164
33165
|
function parseClassMembers() {
|
|
33165
|
-
return parseList(
|
|
33166
|
+
return parseList(5 /* ClassMembers */, parseClassElement);
|
|
33166
33167
|
}
|
|
33167
33168
|
function parseInterfaceDeclaration(pos, hasJSDoc, modifiers) {
|
|
33168
33169
|
parseExpected(118 /* InterfaceKeyword */);
|
|
@@ -33195,7 +33196,7 @@ ${lanes.join("\n")}
|
|
|
33195
33196
|
const name = parseIdentifier();
|
|
33196
33197
|
let members;
|
|
33197
33198
|
if (parseExpected(18 /* OpenBraceToken */)) {
|
|
33198
|
-
members = doOutsideOfYieldAndAwaitContext(() => parseDelimitedList(
|
|
33199
|
+
members = doOutsideOfYieldAndAwaitContext(() => parseDelimitedList(6 /* EnumMembers */, parseEnumMember));
|
|
33199
33200
|
parseExpected(19 /* CloseBraceToken */);
|
|
33200
33201
|
} else {
|
|
33201
33202
|
members = createMissingList();
|
|
@@ -33207,7 +33208,7 @@ ${lanes.join("\n")}
|
|
|
33207
33208
|
const pos = getNodePos();
|
|
33208
33209
|
let statements;
|
|
33209
33210
|
if (parseExpected(18 /* OpenBraceToken */)) {
|
|
33210
|
-
statements = parseList(
|
|
33211
|
+
statements = parseList(1 /* BlockStatements */, parseStatement);
|
|
33211
33212
|
parseExpected(19 /* CloseBraceToken */);
|
|
33212
33213
|
} else {
|
|
33213
33214
|
statements = createMissingList();
|
|
@@ -33332,7 +33333,7 @@ ${lanes.join("\n")}
|
|
|
33332
33333
|
if (parseExpected(18 /* OpenBraceToken */)) {
|
|
33333
33334
|
const multiLine = scanner2.hasPrecedingLineBreak();
|
|
33334
33335
|
const elements = parseDelimitedList(
|
|
33335
|
-
|
|
33336
|
+
24 /* AssertEntries */,
|
|
33336
33337
|
parseAssertEntry,
|
|
33337
33338
|
/*considerSemicolonAsDelimiter*/
|
|
33338
33339
|
true
|
|
@@ -33416,7 +33417,7 @@ ${lanes.join("\n")}
|
|
|
33416
33417
|
}
|
|
33417
33418
|
function parseNamedImportsOrExports(kind) {
|
|
33418
33419
|
const pos = getNodePos();
|
|
33419
|
-
const node = kind === 272 /* NamedImports */ ? factory2.createNamedImports(parseBracketedList(
|
|
33420
|
+
const node = kind === 272 /* NamedImports */ ? factory2.createNamedImports(parseBracketedList(23 /* ImportOrExportSpecifiers */, parseImportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */)) : factory2.createNamedExports(parseBracketedList(23 /* ImportOrExportSpecifiers */, parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */));
|
|
33420
33421
|
return finishNode(node, pos);
|
|
33421
33422
|
}
|
|
33422
33423
|
function parseExportSpecifier() {
|
|
@@ -34865,7 +34866,7 @@ ${lanes.join("\n")}
|
|
|
34865
34866
|
let currentArrayIndex = 0;
|
|
34866
34867
|
Debug.assert(currentArrayIndex < currentArray.length);
|
|
34867
34868
|
let current = currentArray[currentArrayIndex];
|
|
34868
|
-
let lastQueriedPosition =
|
|
34869
|
+
let lastQueriedPosition = -1 /* Value */;
|
|
34869
34870
|
return {
|
|
34870
34871
|
currentNode(position) {
|
|
34871
34872
|
if (position !== lastQueriedPosition) {
|
|
@@ -34884,7 +34885,7 @@ ${lanes.join("\n")}
|
|
|
34884
34885
|
};
|
|
34885
34886
|
function findHighestListElementThatStartsAtPosition(position) {
|
|
34886
34887
|
currentArray = void 0;
|
|
34887
|
-
currentArrayIndex =
|
|
34888
|
+
currentArrayIndex = -1 /* Value */;
|
|
34888
34889
|
current = void 0;
|
|
34889
34890
|
forEachChild(sourceFile, visitNode3, visitArray2);
|
|
34890
34891
|
return;
|
|
@@ -38471,9 +38472,9 @@ ${lanes.join("\n")}
|
|
|
38471
38472
|
const affectingLocations = [];
|
|
38472
38473
|
let features = getNodeResolutionFeatures(options);
|
|
38473
38474
|
if (resolutionMode === 99 /* ESNext */ && (getEmitModuleResolutionKind(options) === 3 /* Node16 */ || getEmitModuleResolutionKind(options) === 99 /* NodeNext */)) {
|
|
38474
|
-
features |=
|
|
38475
|
+
features |= 32 /* EsmMode */;
|
|
38475
38476
|
}
|
|
38476
|
-
const conditions = features &
|
|
38477
|
+
const conditions = features & 8 /* Exports */ ? getConditions(options, !!(features & 32 /* EsmMode */)) : [];
|
|
38477
38478
|
const diagnostics = [];
|
|
38478
38479
|
const moduleResolutionState = {
|
|
38479
38480
|
compilerOptions: options,
|
|
@@ -38606,27 +38607,27 @@ ${lanes.join("\n")}
|
|
|
38606
38607
|
}
|
|
38607
38608
|
}
|
|
38608
38609
|
function getNodeResolutionFeatures(options) {
|
|
38609
|
-
let features =
|
|
38610
|
+
let features = 0 /* None */;
|
|
38610
38611
|
switch (getEmitModuleResolutionKind(options)) {
|
|
38611
38612
|
case 3 /* Node16 */:
|
|
38612
|
-
features =
|
|
38613
|
+
features = 30 /* Node16Default */;
|
|
38613
38614
|
break;
|
|
38614
38615
|
case 99 /* NodeNext */:
|
|
38615
|
-
features =
|
|
38616
|
+
features = 30 /* NodeNextDefault */;
|
|
38616
38617
|
break;
|
|
38617
38618
|
case 100 /* Bundler */:
|
|
38618
|
-
features =
|
|
38619
|
+
features = 30 /* BundlerDefault */;
|
|
38619
38620
|
break;
|
|
38620
38621
|
}
|
|
38621
38622
|
if (options.resolvePackageJsonExports) {
|
|
38622
|
-
features |=
|
|
38623
|
+
features |= 8 /* Exports */;
|
|
38623
38624
|
} else if (options.resolvePackageJsonExports === false) {
|
|
38624
|
-
features &= ~
|
|
38625
|
+
features &= ~8 /* Exports */;
|
|
38625
38626
|
}
|
|
38626
38627
|
if (options.resolvePackageJsonImports) {
|
|
38627
|
-
features |=
|
|
38628
|
+
features |= 2 /* Imports */;
|
|
38628
38629
|
} else if (options.resolvePackageJsonImports === false) {
|
|
38629
|
-
features &= ~
|
|
38630
|
+
features &= ~2 /* Imports */;
|
|
38630
38631
|
}
|
|
38631
38632
|
return features;
|
|
38632
38633
|
}
|
|
@@ -64913,13 +64914,7 @@ ${lanes.join("\n")}
|
|
|
64913
64914
|
return true;
|
|
64914
64915
|
}
|
|
64915
64916
|
if (constraintType.flags & 262144 /* TypeParameter */) {
|
|
64916
|
-
inferWithPriority(getIndexType(
|
|
64917
|
-
source,
|
|
64918
|
-
/*stringsOnly*/
|
|
64919
|
-
void 0,
|
|
64920
|
-
/*noIndexSignatures*/
|
|
64921
|
-
!!source.pattern
|
|
64922
|
-
), constraintType, 32 /* MappedTypeConstraint */);
|
|
64917
|
+
inferWithPriority(getIndexType(source), constraintType, 32 /* MappedTypeConstraint */);
|
|
64923
64918
|
const extendedConstraint = getConstraintOfType(constraintType);
|
|
64924
64919
|
if (extendedConstraint && inferToMappedType(source, target, extendedConstraint)) {
|
|
64925
64920
|
return true;
|
|
@@ -109559,9 +109554,9 @@ ${lanes.join("\n")}
|
|
|
109559
109554
|
formattedNameTempFlagsStack = [];
|
|
109560
109555
|
formattedNameTempFlags = /* @__PURE__ */ new Map();
|
|
109561
109556
|
privateNameTempFlagsStack = [];
|
|
109562
|
-
privateNameTempFlags =
|
|
109557
|
+
privateNameTempFlags = 0 /* Auto */;
|
|
109563
109558
|
tempFlagsStack = [];
|
|
109564
|
-
tempFlags =
|
|
109559
|
+
tempFlags = 0 /* Auto */;
|
|
109565
109560
|
reservedNamesStack = [];
|
|
109566
109561
|
reservedNames = void 0;
|
|
109567
109562
|
reservedPrivateNamesStack = [];
|
|
@@ -110530,7 +110525,7 @@ ${lanes.join("\n")}
|
|
|
110530
110525
|
}
|
|
110531
110526
|
function emitTypeLiteral(node) {
|
|
110532
110527
|
pushPrivateNameGenerationScope(
|
|
110533
|
-
|
|
110528
|
+
0 /* Auto */,
|
|
110534
110529
|
/*newReservedMemberNames*/
|
|
110535
110530
|
void 0
|
|
110536
110531
|
);
|
|
@@ -110719,7 +110714,7 @@ ${lanes.join("\n")}
|
|
|
110719
110714
|
}
|
|
110720
110715
|
function emitObjectLiteralExpression(node) {
|
|
110721
110716
|
pushPrivateNameGenerationScope(
|
|
110722
|
-
|
|
110717
|
+
0 /* Auto */,
|
|
110723
110718
|
/*newReservedMemberNames*/
|
|
110724
110719
|
void 0
|
|
110725
110720
|
);
|
|
@@ -111485,7 +111480,7 @@ ${lanes.join("\n")}
|
|
|
111485
111480
|
}
|
|
111486
111481
|
function emitClassDeclarationOrExpression(node) {
|
|
111487
111482
|
pushPrivateNameGenerationScope(
|
|
111488
|
-
|
|
111483
|
+
0 /* Auto */,
|
|
111489
111484
|
/*newReservedMemberNames*/
|
|
111490
111485
|
void 0
|
|
111491
111486
|
);
|
|
@@ -111518,7 +111513,7 @@ ${lanes.join("\n")}
|
|
|
111518
111513
|
}
|
|
111519
111514
|
function emitInterfaceDeclaration(node) {
|
|
111520
111515
|
pushPrivateNameGenerationScope(
|
|
111521
|
-
|
|
111516
|
+
0 /* Auto */,
|
|
111522
111517
|
/*newReservedMemberNames*/
|
|
111523
111518
|
void 0
|
|
111524
111519
|
);
|
|
@@ -112961,7 +112956,7 @@ ${lanes.join("\n")}
|
|
|
112961
112956
|
return;
|
|
112962
112957
|
}
|
|
112963
112958
|
tempFlagsStack.push(tempFlags);
|
|
112964
|
-
tempFlags =
|
|
112959
|
+
tempFlags = 0 /* Auto */;
|
|
112965
112960
|
formattedNameTempFlagsStack.push(formattedNameTempFlags);
|
|
112966
112961
|
formattedNameTempFlags = void 0;
|
|
112967
112962
|
reservedNamesStack.push(reservedNames);
|
|
@@ -113147,7 +113142,7 @@ ${lanes.join("\n")}
|
|
|
113147
113142
|
case "#":
|
|
113148
113143
|
return privateNameTempFlags;
|
|
113149
113144
|
default:
|
|
113150
|
-
return (_a2 = formattedNameTempFlags == null ? void 0 : formattedNameTempFlags.get(formattedNameKey)) != null ? _a2 :
|
|
113145
|
+
return (_a2 = formattedNameTempFlags == null ? void 0 : formattedNameTempFlags.get(formattedNameKey)) != null ? _a2 : 0 /* Auto */;
|
|
113151
113146
|
}
|
|
113152
113147
|
}
|
|
113153
113148
|
function setTempFlags(formattedNameKey, flags) {
|
|
@@ -113171,7 +113166,7 @@ ${lanes.join("\n")}
|
|
|
113171
113166
|
const key = formatGeneratedName(privateName, prefix, "", suffix);
|
|
113172
113167
|
let tempFlags2 = getTempFlags(key);
|
|
113173
113168
|
if (flags && !(tempFlags2 & flags)) {
|
|
113174
|
-
const name = flags ===
|
|
113169
|
+
const name = flags === 268435456 /* _i */ ? "_i" : "_n";
|
|
113175
113170
|
const fullName = formatGeneratedName(privateName, prefix, name, suffix);
|
|
113176
113171
|
if (isUniqueName(fullName, privateName)) {
|
|
113177
113172
|
tempFlags2 |= flags;
|
|
@@ -113185,7 +113180,7 @@ ${lanes.join("\n")}
|
|
|
113185
113180
|
}
|
|
113186
113181
|
}
|
|
113187
113182
|
while (true) {
|
|
113188
|
-
const count = tempFlags2 &
|
|
113183
|
+
const count = tempFlags2 & 268435455 /* CountMask */;
|
|
113189
113184
|
tempFlags2++;
|
|
113190
113185
|
if (count !== 8 && count !== 13) {
|
|
113191
113186
|
const name = count < 26 ? "_" + String.fromCharCode(97 /* a */ + count) : "_" + (count - 26);
|
|
@@ -113329,7 +113324,7 @@ ${lanes.join("\n")}
|
|
|
113329
113324
|
return generateNameCached(node.name, privateName);
|
|
113330
113325
|
}
|
|
113331
113326
|
return makeTempVariableName(
|
|
113332
|
-
|
|
113327
|
+
0 /* Auto */,
|
|
113333
113328
|
/*reservedInNestedScopes*/
|
|
113334
113329
|
false,
|
|
113335
113330
|
privateName,
|
|
@@ -113386,7 +113381,7 @@ ${lanes.join("\n")}
|
|
|
113386
113381
|
return generateNameForMethodOrAccessor(node, privateName, prefix, suffix);
|
|
113387
113382
|
case 164 /* ComputedPropertyName */:
|
|
113388
113383
|
return makeTempVariableName(
|
|
113389
|
-
|
|
113384
|
+
0 /* Auto */,
|
|
113390
113385
|
/*reserveInNestedScopes*/
|
|
113391
113386
|
true,
|
|
113392
113387
|
privateName,
|
|
@@ -113395,7 +113390,7 @@ ${lanes.join("\n")}
|
|
|
113395
113390
|
);
|
|
113396
113391
|
default:
|
|
113397
113392
|
return makeTempVariableName(
|
|
113398
|
-
|
|
113393
|
+
0 /* Auto */,
|
|
113399
113394
|
/*reserveInNestedScopes*/
|
|
113400
113395
|
false,
|
|
113401
113396
|
privateName,
|
|
@@ -113410,11 +113405,11 @@ ${lanes.join("\n")}
|
|
|
113410
113405
|
const suffix = formatGeneratedNamePart(autoGenerate.suffix);
|
|
113411
113406
|
switch (autoGenerate.flags & 7 /* KindMask */) {
|
|
113412
113407
|
case 1 /* Auto */:
|
|
113413
|
-
return makeTempVariableName(
|
|
113408
|
+
return makeTempVariableName(0 /* Auto */, !!(autoGenerate.flags & 8 /* ReservedInNestedScopes */), isPrivateIdentifier(name), prefix, suffix);
|
|
113414
113409
|
case 2 /* Loop */:
|
|
113415
113410
|
Debug.assertNode(name, isIdentifier);
|
|
113416
113411
|
return makeTempVariableName(
|
|
113417
|
-
|
|
113412
|
+
268435456 /* _i */,
|
|
113418
113413
|
!!(autoGenerate.flags & 8 /* ReservedInNestedScopes */),
|
|
113419
113414
|
/*privateName*/
|
|
113420
113415
|
false,
|
|
@@ -113896,7 +113891,7 @@ ${lanes.join("\n")}
|
|
|
113896
113891
|
function getEmitListItem(emit, parenthesizerRule) {
|
|
113897
113892
|
return emit.length === 1 ? emitListItemNoParenthesizer : typeof parenthesizerRule === "object" ? emitListItemWithParenthesizerRuleSelector : emitListItemWithParenthesizerRule;
|
|
113898
113893
|
}
|
|
113899
|
-
var brackets, notImplementedResolver, createPrinterWithDefaults, createPrinterWithRemoveComments, createPrinterWithRemoveCommentsNeverAsciiEscape, createPrinterWithRemoveCommentsOmitTrailingSemicolon
|
|
113894
|
+
var brackets, notImplementedResolver, createPrinterWithDefaults, createPrinterWithRemoveComments, createPrinterWithRemoveCommentsNeverAsciiEscape, createPrinterWithRemoveCommentsOmitTrailingSemicolon;
|
|
113900
113895
|
var init_emitter = __esm({
|
|
113901
113896
|
"src/compiler/emitter.ts"() {
|
|
113902
113897
|
"use strict";
|
|
@@ -113951,12 +113946,6 @@ ${lanes.join("\n")}
|
|
|
113951
113946
|
createPrinterWithRemoveComments = /* @__PURE__ */ memoize(() => createPrinter({ removeComments: true }));
|
|
113952
113947
|
createPrinterWithRemoveCommentsNeverAsciiEscape = /* @__PURE__ */ memoize(() => createPrinter({ removeComments: true, neverAsciiEscape: true }));
|
|
113953
113948
|
createPrinterWithRemoveCommentsOmitTrailingSemicolon = /* @__PURE__ */ memoize(() => createPrinter({ removeComments: true, omitTrailingSemicolon: true }));
|
|
113954
|
-
TempFlags = /* @__PURE__ */ ((TempFlags2) => {
|
|
113955
|
-
TempFlags2[TempFlags2["Auto"] = 0] = "Auto";
|
|
113956
|
-
TempFlags2[TempFlags2["CountMask"] = 268435455] = "CountMask";
|
|
113957
|
-
TempFlags2[TempFlags2["_i"] = 268435456] = "_i";
|
|
113958
|
-
return TempFlags2;
|
|
113959
|
-
})(TempFlags || {});
|
|
113960
113949
|
}
|
|
113961
113950
|
});
|
|
113962
113951
|
|
|
@@ -126628,7 +126617,7 @@ ${lanes.join("\n")}
|
|
|
126628
126617
|
);
|
|
126629
126618
|
}
|
|
126630
126619
|
function makeStringLiteral(text, quotePreference) {
|
|
126631
|
-
return factory.createStringLiteral(text, quotePreference ===
|
|
126620
|
+
return factory.createStringLiteral(text, quotePreference === 0 /* Single */);
|
|
126632
126621
|
}
|
|
126633
126622
|
function quotePreferenceFromString(str, sourceFile) {
|
|
126634
126623
|
return isStringDoubleQuoted(str, sourceFile) ? 1 /* Double */ : 0 /* Single */;
|
|
@@ -139379,13 +139368,13 @@ ${lanes.join("\n")}
|
|
|
139379
139368
|
var _a2, _b;
|
|
139380
139369
|
const { fix, symbolName: symbolName2 } = info;
|
|
139381
139370
|
switch (fix.kind) {
|
|
139382
|
-
case
|
|
139371
|
+
case 0 /* UseNamespace */:
|
|
139383
139372
|
addToNamespace.push(fix);
|
|
139384
139373
|
break;
|
|
139385
|
-
case
|
|
139374
|
+
case 1 /* JsdocTypeImport */:
|
|
139386
139375
|
importType.push(fix);
|
|
139387
139376
|
break;
|
|
139388
|
-
case
|
|
139377
|
+
case 2 /* AddToExisting */: {
|
|
139389
139378
|
const { importClauseOrBindingPattern, importKind, addAsTypeOnly } = fix;
|
|
139390
139379
|
const key = String(getNodeId(importClauseOrBindingPattern));
|
|
139391
139380
|
let entry = addToExisting.get(key);
|
|
@@ -139404,7 +139393,7 @@ ${lanes.join("\n")}
|
|
|
139404
139393
|
}
|
|
139405
139394
|
break;
|
|
139406
139395
|
}
|
|
139407
|
-
case
|
|
139396
|
+
case 3 /* AddNew */: {
|
|
139408
139397
|
const { moduleSpecifier, importKind, useRequire, addAsTypeOnly } = fix;
|
|
139409
139398
|
const entry = getNewImportEntry(moduleSpecifier, importKind, useRequire, addAsTypeOnly);
|
|
139410
139399
|
Debug.assert(entry.useRequire === useRequire, "(Add new) Tried to add an `import` and a `require` for the same module");
|
|
@@ -139425,7 +139414,7 @@ ${lanes.join("\n")}
|
|
|
139425
139414
|
}
|
|
139426
139415
|
break;
|
|
139427
139416
|
}
|
|
139428
|
-
case
|
|
139417
|
+
case 4 /* PromoteTypeOnly */:
|
|
139429
139418
|
break;
|
|
139430
139419
|
default:
|
|
139431
139420
|
Debug.assertNever(fix, `fix wasn't never - got kind ${fix.kind}`);
|
|
@@ -139452,13 +139441,13 @@ ${lanes.join("\n")}
|
|
|
139452
139441
|
namespaceLikeImport: void 0,
|
|
139453
139442
|
useRequire
|
|
139454
139443
|
};
|
|
139455
|
-
if (importKind === 1 /* Default */ && addAsTypeOnly ===
|
|
139444
|
+
if (importKind === 1 /* Default */ && addAsTypeOnly === 2 /* Required */) {
|
|
139456
139445
|
if (typeOnlyEntry)
|
|
139457
139446
|
return typeOnlyEntry;
|
|
139458
139447
|
newImports.set(typeOnlyKey, newEntry);
|
|
139459
139448
|
return newEntry;
|
|
139460
139449
|
}
|
|
139461
|
-
if (addAsTypeOnly ===
|
|
139450
|
+
if (addAsTypeOnly === 1 /* Allowed */ && (typeOnlyEntry || nonTypeOnlyEntry)) {
|
|
139462
139451
|
return typeOnlyEntry || nonTypeOnlyEntry;
|
|
139463
139452
|
}
|
|
139464
139453
|
if (nonTypeOnlyEntry) {
|
|
@@ -140465,7 +140454,7 @@ ${lanes.join("\n")}
|
|
|
140465
140454
|
}
|
|
140466
140455
|
return !isStringANonContextualKeyword(res) ? res || "_" : `_${res}`;
|
|
140467
140456
|
}
|
|
140468
|
-
var importFixName, importFixId, errorCodes17
|
|
140457
|
+
var importFixName, importFixId, errorCodes17;
|
|
140469
140458
|
var init_importFixes = __esm({
|
|
140470
140459
|
"src/services/codefixes/importFixes.ts"() {
|
|
140471
140460
|
"use strict";
|
|
@@ -140524,20 +140513,6 @@ ${lanes.join("\n")}
|
|
|
140524
140513
|
return createCombinedCodeActions(ts_textChanges_exports.ChangeTracker.with(context, importAdder.writeFixes));
|
|
140525
140514
|
}
|
|
140526
140515
|
});
|
|
140527
|
-
ImportFixKind = /* @__PURE__ */ ((ImportFixKind2) => {
|
|
140528
|
-
ImportFixKind2[ImportFixKind2["UseNamespace"] = 0] = "UseNamespace";
|
|
140529
|
-
ImportFixKind2[ImportFixKind2["JsdocTypeImport"] = 1] = "JsdocTypeImport";
|
|
140530
|
-
ImportFixKind2[ImportFixKind2["AddToExisting"] = 2] = "AddToExisting";
|
|
140531
|
-
ImportFixKind2[ImportFixKind2["AddNew"] = 3] = "AddNew";
|
|
140532
|
-
ImportFixKind2[ImportFixKind2["PromoteTypeOnly"] = 4] = "PromoteTypeOnly";
|
|
140533
|
-
return ImportFixKind2;
|
|
140534
|
-
})(ImportFixKind || {});
|
|
140535
|
-
AddAsTypeOnly = /* @__PURE__ */ ((AddAsTypeOnly2) => {
|
|
140536
|
-
AddAsTypeOnly2[AddAsTypeOnly2["Allowed"] = 1] = "Allowed";
|
|
140537
|
-
AddAsTypeOnly2[AddAsTypeOnly2["Required"] = 2] = "Required";
|
|
140538
|
-
AddAsTypeOnly2[AddAsTypeOnly2["NotAllowed"] = 4] = "NotAllowed";
|
|
140539
|
-
return AddAsTypeOnly2;
|
|
140540
|
-
})(AddAsTypeOnly || {});
|
|
140541
140516
|
}
|
|
140542
140517
|
});
|
|
140543
140518
|
|
|
@@ -146841,19 +146816,19 @@ ${lanes.join("\n")}
|
|
|
146841
146816
|
return void 0;
|
|
146842
146817
|
}
|
|
146843
146818
|
switch (completionData.kind) {
|
|
146844
|
-
case
|
|
146819
|
+
case 0 /* Data */:
|
|
146845
146820
|
const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position);
|
|
146846
146821
|
if (response == null ? void 0 : response.isIncomplete) {
|
|
146847
146822
|
incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.set(response);
|
|
146848
146823
|
}
|
|
146849
146824
|
return response;
|
|
146850
|
-
case
|
|
146825
|
+
case 1 /* JsDocTagName */:
|
|
146851
146826
|
return jsdocCompletionInfo(ts_JsDoc_exports.getJSDocTagNameCompletions());
|
|
146852
|
-
case
|
|
146827
|
+
case 2 /* JsDocTag */:
|
|
146853
146828
|
return jsdocCompletionInfo(ts_JsDoc_exports.getJSDocTagCompletions());
|
|
146854
|
-
case
|
|
146829
|
+
case 3 /* JsDocParameterName */:
|
|
146855
146830
|
return jsdocCompletionInfo(ts_JsDoc_exports.getJSDocParameterNameCompletions(completionData.tag));
|
|
146856
|
-
case
|
|
146831
|
+
case 4 /* Keywords */:
|
|
146857
146832
|
return specificKeywordCompletionInfo(completionData.keywordCompletions, completionData.isNewIdentifierLocation);
|
|
146858
146833
|
default:
|
|
146859
146834
|
return Debug.assertNever(completionData);
|
|
@@ -146956,7 +146931,7 @@ ${lanes.join("\n")}
|
|
|
146956
146931
|
}
|
|
146957
146932
|
function keywordCompletionData(keywordFilters, filterOutTsOnlyKeywords, isNewIdentifierLocation) {
|
|
146958
146933
|
return {
|
|
146959
|
-
kind:
|
|
146934
|
+
kind: 4 /* Keywords */,
|
|
146960
146935
|
keywordCompletions: getKeywordCompletions(keywordFilters, filterOutTsOnlyKeywords),
|
|
146961
146936
|
isNewIdentifierLocation
|
|
146962
146937
|
};
|
|
@@ -147233,9 +147208,9 @@ ${lanes.join("\n")}
|
|
|
147233
147208
|
}
|
|
147234
147209
|
function isMemberCompletionKind(kind) {
|
|
147235
147210
|
switch (kind) {
|
|
147236
|
-
case
|
|
147237
|
-
case
|
|
147238
|
-
case
|
|
147211
|
+
case 0 /* ObjectPropertyDeclaration */:
|
|
147212
|
+
case 3 /* MemberLike */:
|
|
147213
|
+
case 2 /* PropertyAccess */:
|
|
147239
147214
|
return true;
|
|
147240
147215
|
default:
|
|
147241
147216
|
return false;
|
|
@@ -147351,7 +147326,7 @@ ${lanes.join("\n")}
|
|
|
147351
147326
|
if ((origin == null ? void 0 : origin.kind) === 64 /* TypeOnlyAlias */) {
|
|
147352
147327
|
hasAction = true;
|
|
147353
147328
|
}
|
|
147354
|
-
if (preferences.includeCompletionsWithClassMemberSnippets && preferences.includeCompletionsWithInsertText && completionKind ===
|
|
147329
|
+
if (preferences.includeCompletionsWithClassMemberSnippets && preferences.includeCompletionsWithInsertText && completionKind === 3 /* MemberLike */ && isClassLikeMemberCompletion(symbol, location, sourceFile)) {
|
|
147355
147330
|
let importAdder;
|
|
147356
147331
|
({ insertText, isSnippet, importAdder, replacementSpan } = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, position, contextToken, formatContext));
|
|
147357
147332
|
sortText = SortText.ClassMemberSnippets;
|
|
@@ -147886,7 +147861,7 @@ ${lanes.join("\n")}
|
|
|
147886
147861
|
const symbol = symbols[i];
|
|
147887
147862
|
const origin = symbolToOriginInfoMap == null ? void 0 : symbolToOriginInfoMap[i];
|
|
147888
147863
|
const info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind, !!jsxIdentifierExpected);
|
|
147889
|
-
if (!info || uniques.get(info.name) && (!origin || !originIsObjectLiteralMethod(origin)) || kind ===
|
|
147864
|
+
if (!info || uniques.get(info.name) && (!origin || !originIsObjectLiteralMethod(origin)) || kind === 1 /* Global */ && symbolToSortTextMap && !shouldIncludeSymbol(symbol, symbolToSortTextMap)) {
|
|
147890
147865
|
continue;
|
|
147891
147866
|
}
|
|
147892
147867
|
const { name, needsConvertPropertyAccess } = info;
|
|
@@ -148025,7 +148000,7 @@ ${lanes.join("\n")}
|
|
|
148025
148000
|
if (!completionData) {
|
|
148026
148001
|
return { type: "none" };
|
|
148027
148002
|
}
|
|
148028
|
-
if (completionData.kind !==
|
|
148003
|
+
if (completionData.kind !== 0 /* Data */) {
|
|
148029
148004
|
return { type: "request", request: completionData };
|
|
148030
148005
|
}
|
|
148031
148006
|
const { symbols, literals, location, completionKind, symbolToOriginInfoMap, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } = completionData;
|
|
@@ -148051,13 +148026,13 @@ ${lanes.join("\n")}
|
|
|
148051
148026
|
case "request": {
|
|
148052
148027
|
const { request } = symbolCompletion;
|
|
148053
148028
|
switch (request.kind) {
|
|
148054
|
-
case
|
|
148029
|
+
case 1 /* JsDocTagName */:
|
|
148055
148030
|
return ts_JsDoc_exports.getJSDocTagNameCompletionDetails(name);
|
|
148056
|
-
case
|
|
148031
|
+
case 2 /* JsDocTag */:
|
|
148057
148032
|
return ts_JsDoc_exports.getJSDocTagCompletionDetails(name);
|
|
148058
|
-
case
|
|
148033
|
+
case 3 /* JsDocParameterName */:
|
|
148059
148034
|
return ts_JsDoc_exports.getJSDocParameterNameCompletionDetails(name);
|
|
148060
|
-
case
|
|
148035
|
+
case 4 /* Keywords */:
|
|
148061
148036
|
return some(request.keywordCompletions, (c) => c.name === name) ? createSimpleDetails(name, "keyword" /* keyword */, 5 /* keyword */) : void 0;
|
|
148062
148037
|
default:
|
|
148063
148038
|
return Debug.assertNever(request);
|
|
@@ -150063,7 +150038,7 @@ ${lanes.join("\n")}
|
|
|
150063
150038
|
}
|
|
150064
150039
|
return charCode;
|
|
150065
150040
|
}
|
|
150066
|
-
var moduleSpecifierResolutionLimit, moduleSpecifierResolutionCacheAttemptLimit, SortText, CompletionSource, SymbolOriginInfoKind,
|
|
150041
|
+
var moduleSpecifierResolutionLimit, moduleSpecifierResolutionCacheAttemptLimit, SortText, CompletionSource, SymbolOriginInfoKind, CompletionKind, _keywordCompletions, allKeywordsCompletions;
|
|
150067
150042
|
var init_completions = __esm({
|
|
150068
150043
|
"src/services/completions.ts"() {
|
|
150069
150044
|
"use strict";
|
|
@@ -150115,14 +150090,6 @@ ${lanes.join("\n")}
|
|
|
150115
150090
|
SymbolOriginInfoKind2[SymbolOriginInfoKind2["SymbolMemberExport"] = 6] = "SymbolMemberExport";
|
|
150116
150091
|
return SymbolOriginInfoKind2;
|
|
150117
150092
|
})(SymbolOriginInfoKind || {});
|
|
150118
|
-
CompletionDataKind = /* @__PURE__ */ ((CompletionDataKind2) => {
|
|
150119
|
-
CompletionDataKind2[CompletionDataKind2["Data"] = 0] = "Data";
|
|
150120
|
-
CompletionDataKind2[CompletionDataKind2["JsDocTagName"] = 1] = "JsDocTagName";
|
|
150121
|
-
CompletionDataKind2[CompletionDataKind2["JsDocTag"] = 2] = "JsDocTag";
|
|
150122
|
-
CompletionDataKind2[CompletionDataKind2["JsDocParameterName"] = 3] = "JsDocParameterName";
|
|
150123
|
-
CompletionDataKind2[CompletionDataKind2["Keywords"] = 4] = "Keywords";
|
|
150124
|
-
return CompletionDataKind2;
|
|
150125
|
-
})(CompletionDataKind || {});
|
|
150126
150093
|
CompletionKind = /* @__PURE__ */ ((CompletionKind2) => {
|
|
150127
150094
|
CompletionKind2[CompletionKind2["ObjectPropertyDeclaration"] = 0] = "ObjectPropertyDeclaration";
|
|
150128
150095
|
CompletionKind2[CompletionKind2["Global"] = 1] = "Global";
|
|
@@ -150181,9 +150148,9 @@ ${lanes.join("\n")}
|
|
|
150181
150148
|
}
|
|
150182
150149
|
const optionalReplacementSpan = createTextSpanFromStringLiteralLikeContent(contextToken);
|
|
150183
150150
|
switch (completion.kind) {
|
|
150184
|
-
case
|
|
150151
|
+
case 0 /* Paths */:
|
|
150185
150152
|
return convertPathCompletions(completion.paths);
|
|
150186
|
-
case
|
|
150153
|
+
case 1 /* Properties */: {
|
|
150187
150154
|
const entries = createSortedArray();
|
|
150188
150155
|
getCompletionEntriesFromSymbols(
|
|
150189
150156
|
completion.symbols,
|
|
@@ -150205,7 +150172,7 @@ ${lanes.join("\n")}
|
|
|
150205
150172
|
);
|
|
150206
150173
|
return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan, entries };
|
|
150207
150174
|
}
|
|
150208
|
-
case
|
|
150175
|
+
case 2 /* Types */: {
|
|
150209
150176
|
const entries = completion.types.map((type) => ({
|
|
150210
150177
|
name: type.value,
|
|
150211
150178
|
kindModifiers: "" /* none */,
|
|
@@ -150227,15 +150194,15 @@ ${lanes.join("\n")}
|
|
|
150227
150194
|
}
|
|
150228
150195
|
function stringLiteralCompletionDetails(name, location, completion, sourceFile, checker, cancellationToken) {
|
|
150229
150196
|
switch (completion.kind) {
|
|
150230
|
-
case
|
|
150197
|
+
case 0 /* Paths */: {
|
|
150231
150198
|
const match = find(completion.paths, (p) => p.name === name);
|
|
150232
150199
|
return match && createCompletionDetails(name, kindModifiersFromExtension(match.extension), match.kind, [textPart(name)]);
|
|
150233
150200
|
}
|
|
150234
|
-
case
|
|
150201
|
+
case 1 /* Properties */: {
|
|
150235
150202
|
const match = find(completion.symbols, (s) => s.name === name);
|
|
150236
150203
|
return match && createCompletionDetailsForSymbol(match, checker, sourceFile, location, cancellationToken);
|
|
150237
150204
|
}
|
|
150238
|
-
case
|
|
150205
|
+
case 2 /* Types */:
|
|
150239
150206
|
return find(completion.types, (t) => t.value === name) ? createCompletionDetails(name, "" /* none */, "string" /* string */, [textPart(name)]) : void 0;
|
|
150240
150207
|
default:
|
|
150241
150208
|
return Debug.assertNever(completion);
|
|
@@ -150437,7 +150404,7 @@ ${lanes.join("\n")}
|
|
|
150437
150404
|
const mode = isStringLiteralLike(node) ? getModeForUsageLocation(sourceFile, node) : void 0;
|
|
150438
150405
|
const scriptPath = sourceFile.path;
|
|
150439
150406
|
const scriptDirectory = getDirectoryPath(scriptPath);
|
|
150440
|
-
const extensionOptions = getExtensionOptions(compilerOptions,
|
|
150407
|
+
const extensionOptions = getExtensionOptions(compilerOptions, 1 /* ModuleSpecifier */, sourceFile, typeChecker, preferences, mode);
|
|
150441
150408
|
return isPathRelativeToScript(literalValue) || !compilerOptions.baseUrl && (isRootedDiskPath(literalValue) || isUrl(literalValue)) ? getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath, extensionOptions) : getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, mode, compilerOptions, host, extensionOptions, typeChecker);
|
|
150442
150409
|
}
|
|
150443
150410
|
function getExtensionOptions(compilerOptions, referenceKind, importingSourceFile, typeChecker, preferences, resolutionMode) {
|
|
@@ -150953,7 +150920,7 @@ ${lanes.join("\n")}
|
|
|
150953
150920
|
function isRequireCallArgument(node) {
|
|
150954
150921
|
return isCallExpression(node.parent) && firstOrUndefined(node.parent.arguments) === node && isIdentifier(node.parent.expression) && node.parent.expression.escapedText === "require";
|
|
150955
150922
|
}
|
|
150956
|
-
var kindPrecedence,
|
|
150923
|
+
var kindPrecedence, tripleSlashDirectiveFragmentRegex, nodeModulesDependencyKeys;
|
|
150957
150924
|
var init_stringCompletions = __esm({
|
|
150958
150925
|
"src/services/stringCompletions.ts"() {
|
|
150959
150926
|
"use strict";
|
|
@@ -150964,17 +150931,6 @@ ${lanes.join("\n")}
|
|
|
150964
150931
|
["script" /* scriptElement */]: 1,
|
|
150965
150932
|
["external module name" /* externalModuleName */]: 2
|
|
150966
150933
|
};
|
|
150967
|
-
StringLiteralCompletionKind = /* @__PURE__ */ ((StringLiteralCompletionKind2) => {
|
|
150968
|
-
StringLiteralCompletionKind2[StringLiteralCompletionKind2["Paths"] = 0] = "Paths";
|
|
150969
|
-
StringLiteralCompletionKind2[StringLiteralCompletionKind2["Properties"] = 1] = "Properties";
|
|
150970
|
-
StringLiteralCompletionKind2[StringLiteralCompletionKind2["Types"] = 2] = "Types";
|
|
150971
|
-
return StringLiteralCompletionKind2;
|
|
150972
|
-
})(StringLiteralCompletionKind || {});
|
|
150973
|
-
ReferenceKind = /* @__PURE__ */ ((ReferenceKind2) => {
|
|
150974
|
-
ReferenceKind2[ReferenceKind2["Filename"] = 0] = "Filename";
|
|
150975
|
-
ReferenceKind2[ReferenceKind2["ModuleSpecifier"] = 1] = "ModuleSpecifier";
|
|
150976
|
-
return ReferenceKind2;
|
|
150977
|
-
})(ReferenceKind || {});
|
|
150978
150934
|
tripleSlashDirectiveFragmentRegex = /^(\/\/\/\s*<reference\s+(path|types)\s*=\s*(?:'|"))([^\3"]*)$/;
|
|
150979
150935
|
nodeModulesDependencyKeys = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
|
|
150980
150936
|
}
|
|
@@ -152325,7 +152281,7 @@ ${lanes.join("\n")}
|
|
|
152325
152281
|
) || originalSymbol;
|
|
152326
152282
|
const searchMeaning = node ? getIntersectingMeaningFromDeclarations(node, symbol) : 7 /* All */;
|
|
152327
152283
|
const result = [];
|
|
152328
|
-
const state = new State(sourceFiles, sourceFilesSet, node ? getSpecialSearchKind(node) :
|
|
152284
|
+
const state = new State(sourceFiles, sourceFilesSet, node ? getSpecialSearchKind(node) : 0 /* None */, checker, cancellationToken, searchMeaning, options, result);
|
|
152329
152285
|
const exportSpecifier = !isForRenameWithPrefixAndSuffixText(options) || !symbol.declarations ? void 0 : find(symbol.declarations, isExportSpecifier);
|
|
152330
152286
|
if (exportSpecifier) {
|
|
152331
152287
|
getReferencesAtExportSpecifier(
|
|
@@ -152381,14 +152337,14 @@ ${lanes.join("\n")}
|
|
|
152381
152337
|
switch (node.kind) {
|
|
152382
152338
|
case 173 /* Constructor */:
|
|
152383
152339
|
case 135 /* ConstructorKeyword */:
|
|
152384
|
-
return
|
|
152340
|
+
return 1 /* Constructor */;
|
|
152385
152341
|
case 79 /* Identifier */:
|
|
152386
152342
|
if (isClassLike(node.parent)) {
|
|
152387
152343
|
Debug.assert(node.parent.name === node);
|
|
152388
|
-
return
|
|
152344
|
+
return 2 /* Class */;
|
|
152389
152345
|
}
|
|
152390
152346
|
default:
|
|
152391
|
-
return
|
|
152347
|
+
return 0 /* None */;
|
|
152392
152348
|
}
|
|
152393
152349
|
}
|
|
152394
152350
|
function skipPastExportOrImportSpecifierOrUnion(symbol, node, checker, useLocalSymbolForExportSpecifier) {
|
|
@@ -159454,10 +159410,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
159454
159410
|
const scopeDescription = isFunctionLikeDeclaration(scope) ? getDescriptionForFunctionLikeDeclaration(scope) : isClassLike(scope) ? getDescriptionForClassLikeDeclaration(scope) : getDescriptionForModuleLikeDeclaration(scope);
|
|
159455
159411
|
let functionDescription;
|
|
159456
159412
|
let constantDescription;
|
|
159457
|
-
if (scopeDescription ===
|
|
159413
|
+
if (scopeDescription === 1 /* Global */) {
|
|
159458
159414
|
functionDescription = formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Extract_to_0_in_1_scope), [functionDescriptionPart, "global"]);
|
|
159459
159415
|
constantDescription = formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Extract_to_0_in_1_scope), [constantDescriptionPart, "global"]);
|
|
159460
|
-
} else if (scopeDescription ===
|
|
159416
|
+
} else if (scopeDescription === 0 /* Module */) {
|
|
159461
159417
|
functionDescription = formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Extract_to_0_in_1_scope), [functionDescriptionPart, "module"]);
|
|
159462
159418
|
constantDescription = formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Extract_to_0_in_1_scope), [constantDescriptionPart, "module"]);
|
|
159463
159419
|
} else {
|
|
@@ -159523,7 +159479,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
159523
159479
|
return scope.kind === 260 /* ClassDeclaration */ ? scope.name ? `class '${scope.name.text}'` : "anonymous class declaration" : scope.name ? `class expression '${scope.name.text}'` : "anonymous class expression";
|
|
159524
159480
|
}
|
|
159525
159481
|
function getDescriptionForModuleLikeDeclaration(scope) {
|
|
159526
|
-
return scope.kind === 265 /* ModuleBlock */ ? `namespace '${scope.parent.name.getText()}'` : scope.externalModuleIndicator ?
|
|
159482
|
+
return scope.kind === 265 /* ModuleBlock */ ? `namespace '${scope.parent.name.getText()}'` : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
|
|
159527
159483
|
}
|
|
159528
159484
|
function extractFunctionInScope(node, scope, { usages: usagesInScope, typeParameterUsages, substitutions }, exposedVariableDeclarations, range, context) {
|
|
159529
159485
|
const checker = context.program.getTypeChecker();
|
|
@@ -159556,7 +159512,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
159556
159512
|
typeNode
|
|
159557
159513
|
);
|
|
159558
159514
|
parameters.push(paramDecl);
|
|
159559
|
-
if (usage.usage ===
|
|
159515
|
+
if (usage.usage === 2 /* Write */) {
|
|
159560
159516
|
(writes || (writes = [])).push(usage);
|
|
159561
159517
|
}
|
|
159562
159518
|
callArguments.push(factory.createIdentifier(name));
|
|
@@ -160514,7 +160470,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
160514
160470
|
function isStringLiteralJsxAttribute(node) {
|
|
160515
160471
|
return isStringLiteral(node) && node.parent && isJsxAttribute(node.parent);
|
|
160516
160472
|
}
|
|
160517
|
-
var refactorName11, extractConstantAction, extractFunctionAction, Messages, RangeFacts
|
|
160473
|
+
var refactorName11, extractConstantAction, extractFunctionAction, Messages, RangeFacts;
|
|
160518
160474
|
var init_extractSymbol = __esm({
|
|
160519
160475
|
"src/services/refactors/extractSymbol.ts"() {
|
|
160520
160476
|
"use strict";
|
|
@@ -160577,16 +160533,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
160577
160533
|
RangeFacts2[RangeFacts2["InStaticRegion"] = 32] = "InStaticRegion";
|
|
160578
160534
|
return RangeFacts2;
|
|
160579
160535
|
})(RangeFacts || {});
|
|
160580
|
-
SpecialScope = /* @__PURE__ */ ((SpecialScope2) => {
|
|
160581
|
-
SpecialScope2[SpecialScope2["Module"] = 0] = "Module";
|
|
160582
|
-
SpecialScope2[SpecialScope2["Global"] = 1] = "Global";
|
|
160583
|
-
return SpecialScope2;
|
|
160584
|
-
})(SpecialScope || {});
|
|
160585
|
-
Usage = /* @__PURE__ */ ((Usage2) => {
|
|
160586
|
-
Usage2[Usage2["Read"] = 1] = "Read";
|
|
160587
|
-
Usage2[Usage2["Write"] = 2] = "Write";
|
|
160588
|
-
return Usage2;
|
|
160589
|
-
})(Usage || {});
|
|
160590
160536
|
}
|
|
160591
160537
|
});
|
|
160592
160538
|
|
|
@@ -161018,7 +160964,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
161018
160964
|
if (!candidateInfo) {
|
|
161019
160965
|
return isSourceFileJS(sourceFile) ? createJSSignatureHelpItems(argumentInfo, program, cancellationToken) : void 0;
|
|
161020
160966
|
}
|
|
161021
|
-
return typeChecker.runWithCancellationToken(cancellationToken, (typeChecker2) => candidateInfo.kind ===
|
|
160967
|
+
return typeChecker.runWithCancellationToken(cancellationToken, (typeChecker2) => candidateInfo.kind === 0 /* Candidate */ ? createSignatureHelpItems(candidateInfo.candidates, candidateInfo.resolvedSignature, argumentInfo, sourceFile, typeChecker2) : createTypeHelpItems(candidateInfo.symbol, argumentInfo, sourceFile, typeChecker2));
|
|
161022
160968
|
}
|
|
161023
160969
|
function getCandidateOrTypeInfo({ invocation, argumentCount }, checker, sourceFile, startingToken, onlyUseSyntacticOwners) {
|
|
161024
160970
|
switch (invocation.kind) {
|
|
@@ -161490,16 +161436,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
161490
161436
|
});
|
|
161491
161437
|
return { name: typeParameter.symbol.name, documentation: typeParameter.symbol.getDocumentationComment(checker), displayParts, isOptional: false, isRest: false };
|
|
161492
161438
|
}
|
|
161493
|
-
var
|
|
161439
|
+
var signatureHelpNodeBuilderFlags, separatorDisplayParts;
|
|
161494
161440
|
var init_signatureHelp = __esm({
|
|
161495
161441
|
"src/services/signatureHelp.ts"() {
|
|
161496
161442
|
"use strict";
|
|
161497
161443
|
init_ts4();
|
|
161498
|
-
CandidateOrTypeKind = /* @__PURE__ */ ((CandidateOrTypeKind2) => {
|
|
161499
|
-
CandidateOrTypeKind2[CandidateOrTypeKind2["Candidate"] = 0] = "Candidate";
|
|
161500
|
-
CandidateOrTypeKind2[CandidateOrTypeKind2["Type"] = 1] = "Type";
|
|
161501
|
-
return CandidateOrTypeKind2;
|
|
161502
|
-
})(CandidateOrTypeKind || {});
|
|
161503
161444
|
signatureHelpNodeBuilderFlags = 8192 /* OmitParameterModifiers */ | 70221824 /* IgnoreErrors */ | 16384 /* UseAliasDefinedOutsideCurrentScope */;
|
|
161504
161445
|
separatorDisplayParts = [punctuationPart(27 /* CommaToken */), spacePart()];
|
|
161505
161446
|
}
|
|
@@ -165504,7 +165445,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165504
165445
|
if (currentTokenInfo.leadingTrivia) {
|
|
165505
165446
|
processTrivia(currentTokenInfo.leadingTrivia, parent2, childContextNode, dynamicIndentation);
|
|
165506
165447
|
}
|
|
165507
|
-
let lineAction =
|
|
165448
|
+
let lineAction = 0 /* None */;
|
|
165508
165449
|
const isTokenInRange = rangeContainsRange(originalRange, currentTokenInfo.token);
|
|
165509
165450
|
const tokenStart = sourceFile.getLineAndCharacterOfPosition(currentTokenInfo.token.pos);
|
|
165510
165451
|
if (isTokenInRange) {
|
|
@@ -165512,11 +165453,11 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165512
165453
|
const savePreviousRange = previousRange;
|
|
165513
165454
|
lineAction = processRange(currentTokenInfo.token, tokenStart, parent2, childContextNode, dynamicIndentation);
|
|
165514
165455
|
if (!rangeHasError) {
|
|
165515
|
-
if (lineAction ===
|
|
165456
|
+
if (lineAction === 0 /* None */) {
|
|
165516
165457
|
const prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
|
|
165517
165458
|
indentToken = lastTriviaWasNewLine && tokenStart.line !== prevEndLine;
|
|
165518
165459
|
} else {
|
|
165519
|
-
indentToken = lineAction ===
|
|
165460
|
+
indentToken = lineAction === 1 /* LineAdded */;
|
|
165520
165461
|
}
|
|
165521
165462
|
}
|
|
165522
165463
|
}
|
|
@@ -165542,7 +165483,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165542
165483
|
);
|
|
165543
165484
|
}
|
|
165544
165485
|
if (tokenIndentation !== -1 /* Unknown */ && indentNextTokenOrTrivia) {
|
|
165545
|
-
insertIndentation(currentTokenInfo.token.pos, tokenIndentation, lineAction ===
|
|
165486
|
+
insertIndentation(currentTokenInfo.token.pos, tokenIndentation, lineAction === 1 /* LineAdded */);
|
|
165546
165487
|
lastIndentedLine = tokenStart.line;
|
|
165547
165488
|
indentationOnLastIndentedLine = tokenIndentation;
|
|
165548
165489
|
}
|
|
@@ -165589,7 +165530,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165589
165530
|
}
|
|
165590
165531
|
function processRange(range, rangeStart, parent2, contextNode, dynamicIndentation) {
|
|
165591
165532
|
const rangeHasError = rangeContainsError(range);
|
|
165592
|
-
let lineAction =
|
|
165533
|
+
let lineAction = 0 /* None */;
|
|
165593
165534
|
if (!rangeHasError) {
|
|
165594
165535
|
if (!previousRange) {
|
|
165595
165536
|
const originalStart = sourceFile.getLineAndCharacterOfPosition(originalRange.pos);
|
|
@@ -165608,13 +165549,13 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165608
165549
|
formattingContext.updateContext(previousItem, previousParent2, currentItem, currentParent, contextNode);
|
|
165609
165550
|
const rules = getRules(formattingContext);
|
|
165610
165551
|
let trimTrailingWhitespaces = formattingContext.options.trimTrailingWhitespace !== false;
|
|
165611
|
-
let lineAction =
|
|
165552
|
+
let lineAction = 0 /* None */;
|
|
165612
165553
|
if (rules) {
|
|
165613
165554
|
forEachRight(rules, (rule2) => {
|
|
165614
165555
|
lineAction = applyRuleEdits(rule2, previousItem, previousStartLine, currentItem, currentStartLine);
|
|
165615
165556
|
if (dynamicIndentation) {
|
|
165616
165557
|
switch (lineAction) {
|
|
165617
|
-
case
|
|
165558
|
+
case 2 /* LineRemoved */:
|
|
165618
165559
|
if (currentParent.getStart(sourceFile) === currentItem.pos) {
|
|
165619
165560
|
dynamicIndentation.recomputeIndentation(
|
|
165620
165561
|
/*lineAddedByFormatting*/
|
|
@@ -165623,7 +165564,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165623
165564
|
);
|
|
165624
165565
|
}
|
|
165625
165566
|
break;
|
|
165626
|
-
case
|
|
165567
|
+
case 1 /* LineAdded */:
|
|
165627
165568
|
if (currentParent.getStart(sourceFile) === currentItem.pos) {
|
|
165628
165569
|
dynamicIndentation.recomputeIndentation(
|
|
165629
165570
|
/*lineAddedByFormatting*/
|
|
@@ -165633,7 +165574,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165633
165574
|
}
|
|
165634
165575
|
break;
|
|
165635
165576
|
default:
|
|
165636
|
-
Debug.assert(lineAction ===
|
|
165577
|
+
Debug.assert(lineAction === 0 /* None */);
|
|
165637
165578
|
}
|
|
165638
165579
|
}
|
|
165639
165580
|
trimTrailingWhitespaces = trimTrailingWhitespaces && !(rule2.action & 16 /* DeleteSpace */) && rule2.flags !== 1 /* CanDeleteNewLines */;
|
|
@@ -165780,11 +165721,11 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165780
165721
|
const onLaterLine = currentStartLine !== previousStartLine;
|
|
165781
165722
|
switch (rule2.action) {
|
|
165782
165723
|
case 1 /* StopProcessingSpaceActions */:
|
|
165783
|
-
return
|
|
165724
|
+
return 0 /* None */;
|
|
165784
165725
|
case 16 /* DeleteSpace */:
|
|
165785
165726
|
if (previousRange2.end !== currentRange.pos) {
|
|
165786
165727
|
recordDelete(previousRange2.end, currentRange.pos - previousRange2.end);
|
|
165787
|
-
return onLaterLine ?
|
|
165728
|
+
return onLaterLine ? 2 /* LineRemoved */ : 0 /* None */;
|
|
165788
165729
|
}
|
|
165789
165730
|
break;
|
|
165790
165731
|
case 32 /* DeleteToken */:
|
|
@@ -165792,28 +165733,28 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165792
165733
|
break;
|
|
165793
165734
|
case 8 /* InsertNewLine */:
|
|
165794
165735
|
if (rule2.flags !== 1 /* CanDeleteNewLines */ && previousStartLine !== currentStartLine) {
|
|
165795
|
-
return
|
|
165736
|
+
return 0 /* None */;
|
|
165796
165737
|
}
|
|
165797
165738
|
const lineDelta = currentStartLine - previousStartLine;
|
|
165798
165739
|
if (lineDelta !== 1) {
|
|
165799
165740
|
recordReplace(previousRange2.end, currentRange.pos - previousRange2.end, getNewLineOrDefaultFromHost(host, options));
|
|
165800
|
-
return onLaterLine ?
|
|
165741
|
+
return onLaterLine ? 0 /* None */ : 1 /* LineAdded */;
|
|
165801
165742
|
}
|
|
165802
165743
|
break;
|
|
165803
165744
|
case 4 /* InsertSpace */:
|
|
165804
165745
|
if (rule2.flags !== 1 /* CanDeleteNewLines */ && previousStartLine !== currentStartLine) {
|
|
165805
|
-
return
|
|
165746
|
+
return 0 /* None */;
|
|
165806
165747
|
}
|
|
165807
165748
|
const posDelta = currentRange.pos - previousRange2.end;
|
|
165808
165749
|
if (posDelta !== 1 || sourceFile.text.charCodeAt(previousRange2.end) !== 32 /* space */) {
|
|
165809
165750
|
recordReplace(previousRange2.end, currentRange.pos - previousRange2.end, " ");
|
|
165810
|
-
return onLaterLine ?
|
|
165751
|
+
return onLaterLine ? 2 /* LineRemoved */ : 0 /* None */;
|
|
165811
165752
|
}
|
|
165812
165753
|
break;
|
|
165813
165754
|
case 64 /* InsertTrailingSemicolon */:
|
|
165814
165755
|
recordInsert(previousRange2.end, ";");
|
|
165815
165756
|
}
|
|
165816
|
-
return
|
|
165757
|
+
return 0 /* None */;
|
|
165817
165758
|
}
|
|
165818
165759
|
}
|
|
165819
165760
|
function getRangeOfEnclosingComment(sourceFile, position, precedingToken, tokenAtPosition = getTokenAtPosition(sourceFile, position)) {
|
|
@@ -165939,18 +165880,12 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
165939
165880
|
return remainder ? spacesString + repeatString(" ", remainder) : spacesString;
|
|
165940
165881
|
}
|
|
165941
165882
|
}
|
|
165942
|
-
var
|
|
165883
|
+
var internedSizes, internedTabsIndentation, internedSpacesIndentation;
|
|
165943
165884
|
var init_formatting = __esm({
|
|
165944
165885
|
"src/services/formatting/formatting.ts"() {
|
|
165945
165886
|
"use strict";
|
|
165946
165887
|
init_ts4();
|
|
165947
165888
|
init_ts_formatting();
|
|
165948
|
-
LineAction = /* @__PURE__ */ ((LineAction2) => {
|
|
165949
|
-
LineAction2[LineAction2["None"] = 0] = "None";
|
|
165950
|
-
LineAction2[LineAction2["LineAdded"] = 1] = "LineAdded";
|
|
165951
|
-
LineAction2[LineAction2["LineRemoved"] = 2] = "LineRemoved";
|
|
165952
|
-
return LineAction2;
|
|
165953
|
-
})(LineAction || {});
|
|
165954
165889
|
}
|
|
165955
165890
|
});
|
|
165956
165891
|
|
|
@@ -166054,7 +165989,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
166054
165989
|
)) {
|
|
166055
165990
|
const currentStart = getStartLineAndCharacterForNode(current, sourceFile);
|
|
166056
165991
|
const nextTokenKind = nextTokenIsCurlyBraceOnSameLineAsCursor(precedingToken, current, lineAtPosition, sourceFile);
|
|
166057
|
-
const indentationDelta = nextTokenKind !==
|
|
165992
|
+
const indentationDelta = nextTokenKind !== 0 /* Unknown */ ? assumeNewLineBeforeCloseBrace && nextTokenKind === 2 /* CloseBrace */ ? options.indentSize : 0 : lineAtPosition !== currentStart.line ? options.indentSize : 0;
|
|
166058
165993
|
return getIndentationForNodeWorker(
|
|
166059
165994
|
current,
|
|
166060
165995
|
currentStart,
|