@typescript-deploys/pr-build 5.1.0-pr-52226-2 → 5.1.0-pr-52845-10

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230306`;
+      version = `${versionMajorMinor}.0-insiders.20230308`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3545,7 +3545,7 @@ ${lanes.join("\n")}
     const name = DiagnosticCategory[d.category];
     return lowerCase ? name.toLowerCase() : name;
   }
-  var SyntaxKind, NodeFlags, ModifierFlags, JsxFlags, RelationComparisonResult, GeneratedIdentifierFlags, TokenFlags, FlowFlags, CommentDirectiveType, OperationCanceledException, FileIncludeKind, FilePreprocessingDiagnosticsKind, EmitOnly, StructureIsReused, ExitStatus, MemberOverrideStatus, UnionReduction, ContextFlags, NodeBuilderFlags, TypeFormatFlags, SymbolFormatFlags, SymbolAccessibility, SyntheticSymbolKind, TypePredicateKind, TypeReferenceSerializationKind, SymbolFlags, EnumKind, CheckFlags, InternalSymbolName, NodeCheckFlags, TypeFlags, ObjectFlags, VarianceFlags, ElementFlags, AccessFlags, JsxReferenceKind, SignatureKind, SignatureFlags, IndexKind, TypeMapKind, InferencePriority, InferenceFlags, Ternary, AssignmentDeclarationKind, DiagnosticCategory, ModuleResolutionKind, ModuleDetectionKind, WatchFileKind, WatchDirectoryKind, PollingWatchKind, ModuleKind, JsxEmit, ImportsNotUsedAsValues, NewLineKind, ScriptKind, ScriptTarget, LanguageVariant, WatchDirectoryFlags, CharacterCodes, Extension, TransformFlags, SnippetKind, EmitFlags, InternalEmitFlags, ExternalEmitHelpers, EmitHint, OuterExpressionKinds, LexicalEnvironmentFlags, BundleFileSectionKind, ListFormat, PragmaKindFlags, commentPragmas, DeprecationVersion;
+  var SyntaxKind, NodeFlags, ModifierFlags, JsxFlags, RelationComparisonResult, GeneratedIdentifierFlags, TokenFlags, FlowFlags, CommentDirectiveType, OperationCanceledException, FileIncludeKind, FilePreprocessingDiagnosticsKind, EmitOnly, StructureIsReused, ExitStatus, MemberOverrideStatus, UnionReduction, ContextFlags, NodeBuilderFlags, TypeFormatFlags, SymbolFormatFlags, SymbolAccessibility, SyntheticSymbolKind, TypePredicateKind, TypeReferenceSerializationKind, SymbolFlags, EnumKind, CheckFlags, InternalSymbolName, NodeCheckFlags, TypeFlags, ObjectFlags, VarianceFlags, ElementFlags, AccessFlags, JsxReferenceKind, SignatureKind, SignatureFlags, IndexKind, TypeMapKind, InferencePriority, InferenceFlags, Ternary, AssignmentDeclarationKind, DiagnosticCategory, ModuleResolutionKind, ModuleDetectionKind, WatchFileKind, WatchDirectoryKind, PollingWatchKind, ModuleKind, JsxEmit, ImportsNotUsedAsValues, NewLineKind, ScriptKind, ScriptTarget, LanguageVariant, WatchDirectoryFlags, CharacterCodes, Extension, TransformFlags, SnippetKind, EmitFlags, InternalEmitFlags, ExternalEmitHelpers, EmitHint, OuterExpressionKinds, LexicalEnvironmentFlags, BundleFileSectionKind, ListFormat, PragmaKindFlags, commentPragmas;
   var init_types = __esm({
     "src/compiler/types.ts"() {
       "use strict";
@@ -4646,6 +4646,7 @@ ${lanes.join("\n")}
       })(DiagnosticCategory || {});
       ModuleResolutionKind = /* @__PURE__ */ ((ModuleResolutionKind3) => {
         ModuleResolutionKind3[ModuleResolutionKind3["Classic"] = 1] = "Classic";
+        ModuleResolutionKind3[ModuleResolutionKind3["NodeJs"] = 2] = "NodeJs";
         ModuleResolutionKind3[ModuleResolutionKind3["Node10"] = 2] = "Node10";
         ModuleResolutionKind3[ModuleResolutionKind3["Node16"] = 3] = "Node16";
         ModuleResolutionKind3[ModuleResolutionKind3["NodeNext"] = 99] = "NodeNext";
@@ -5210,12 +5211,6 @@ ${lanes.join("\n")}
           kind: 4 /* MultiLine */
         }
       };
-      DeprecationVersion = /* @__PURE__ */ ((DeprecationVersion2) => {
-        DeprecationVersion2["v5_0"] = "5.0";
-        DeprecationVersion2["v5_5"] = "5.5";
-        DeprecationVersion2["v6_0"] = "6.0";
-        return DeprecationVersion2;
-      })(DeprecationVersion || {});
     }
   });
 
@@ -8140,12 +8135,14 @@ ${lanes.join("\n")}
         Option_allowImportingTsExtensions_can_only_be_used_when_either_noEmit_or_emitDeclarationOnly_is_set: diag(5096, 1 /* Error */, "Option_allowImportingTsExtensions_can_only_be_used_when_either_noEmit_or_emitDeclarationOnly_is_set_5096", "Option 'allowImportingTsExtensions' can only be used when either 'noEmit' or 'emitDeclarationOnly' is set."),
         An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled: diag(5097, 1 /* Error */, "An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled_5097", "An import path can only end with a '{0}' extension when 'allowImportingTsExtensions' is enabled."),
         Option_0_can_only_be_used_when_moduleResolution_is_set_to_node16_nodenext_or_bundler: diag(5098, 1 /* Error */, "Option_0_can_only_be_used_when_moduleResolution_is_set_to_node16_nodenext_or_bundler_5098", "Option '{0}' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'."),
-        Flag_0_is_deprecated_and_will_stop_functioning_in_TypeScript_1_Specify_compilerOption_ignoreDeprecations_Colon_2_to_silence_this_error: diag(5101, 1 /* Error */, "Flag_0_is_deprecated_and_will_stop_functioning_in_TypeScript_1_Specify_compilerOption_ignoreDeprecat_5101", `Flag '{0}' is deprecated and will stop functioning in TypeScript {1}. Specify compilerOption '"ignoreDeprecations": "{2}"' to silence this error.`),
-        Flag_0_is_deprecated_Please_remove_it_from_your_configuration: diag(5102, 1 /* Error */, "Flag_0_is_deprecated_Please_remove_it_from_your_configuration_5102", "Flag '{0}' is deprecated. Please remove it from your configuration."),
+        Option_0_is_deprecated_and_will_stop_functioning_in_TypeScript_1_Specify_compilerOption_ignoreDeprecations_Colon_2_to_silence_this_error: diag(5101, 1 /* Error */, "Option_0_is_deprecated_and_will_stop_functioning_in_TypeScript_1_Specify_compilerOption_ignoreDeprec_5101", `Option '{0}' is deprecated and will stop functioning in TypeScript {1}. Specify compilerOption '"ignoreDeprecations": "{2}"' to silence this error.`),
+        Option_0_has_been_removed_Please_remove_it_from_your_configuration: diag(5102, 1 /* Error */, "Option_0_has_been_removed_Please_remove_it_from_your_configuration_5102", "Option '{0}' has been removed. Please remove it from your configuration."),
         Invalid_value_for_ignoreDeprecations: diag(5103, 1 /* Error */, "Invalid_value_for_ignoreDeprecations_5103", "Invalid value for '--ignoreDeprecations'."),
         Option_0_is_redundant_and_cannot_be_specified_with_option_1: diag(5104, 1 /* Error */, "Option_0_is_redundant_and_cannot_be_specified_with_option_1_5104", "Option '{0}' is redundant and cannot be specified with option '{1}'."),
         Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System: diag(5105, 1 /* Error */, "Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System_5105", "Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'."),
         Use_0_instead: diag(5106, 3 /* Message */, "Use_0_instead_5106", "Use '{0}' instead."),
+        Option_0_1_is_deprecated_and_will_stop_functioning_in_TypeScript_2_Specify_compilerOption_ignoreDeprecations_Colon_3_to_silence_this_error: diag(5107, 1 /* Error */, "Option_0_1_is_deprecated_and_will_stop_functioning_in_TypeScript_2_Specify_compilerOption_ignoreDepr_5107", `Option '{0}={1}' is deprecated and will stop functioning in TypeScript {2}. Specify compilerOption '"ignoreDeprecations": "{3}"' to silence this error.`),
+        Option_0_1_has_been_removed_Please_remove_it_from_your_configuration: diag(5108, 1 /* Error */, "Option_0_1_has_been_removed_Please_remove_it_from_your_configuration_5108", "Option '{0}={1}' has been removed. Please remove it from your configuration."),
         Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6e3, 3 /* Message */, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
         Concatenate_and_emit_output_to_single_file: diag(6001, 3 /* Message */, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
         Generates_corresponding_d_ts_file: diag(6002, 3 /* Message */, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
@@ -9582,8 +9579,8 @@ ${lanes.join("\n")}
     var text = textInitial;
     var pos;
     var end;
-    var startPos;
-    var tokenPos;
+    var fullStartPos;
+    var tokenStart;
     var token;
     var tokenValue;
     var tokenFlags;
@@ -9591,11 +9588,14 @@ ${lanes.join("\n")}
     var inJSDocType = 0;
     setText(text, start, length2);
     var scanner2 = {
-      getStartPos: () => startPos,
+      getTokenFullStart: () => fullStartPos,
+      getStartPos: () => fullStartPos,
+      getTokenEnd: () => pos,
       getTextPos: () => pos,
       getToken: () => token,
-      getTokenPos: () => tokenPos,
-      getTokenText: () => text.substring(tokenPos, pos),
+      getTokenStart: () => tokenStart,
+      getTokenPos: () => tokenStart,
+      getTokenText: () => text.substring(tokenStart, pos),
       getTokenValue: () => tokenValue,
       hasUnicodeEscape: () => (tokenFlags & 1024 /* UnicodeEscape */) !== 0,
       hasExtendedUnicodeEscape: () => (tokenFlags & 8 /* ExtendedUnicodeEscape */) !== 0,
@@ -9629,7 +9629,8 @@ ${lanes.join("\n")}
       setScriptTarget,
       setLanguageVariant,
       setOnError,
-      setTextPos,
+      resetTokenState,
+      setTextPos: resetTokenState,
       setInJSDocType,
       tryScan,
       lookAhead,
@@ -9639,7 +9640,7 @@ ${lanes.join("\n")}
       Object.defineProperty(scanner2, "__debugShowCurrentPositionInText", {
         get: () => {
           const text2 = scanner2.getText();
-          return text2.slice(0, scanner2.getStartPos()) + "\u2551" + text2.slice(scanner2.getStartPos());
+          return text2.slice(0, scanner2.getTokenFullStart()) + "\u2551" + text2.slice(scanner2.getTokenFullStart());
         }
       });
     }
@@ -10162,11 +10163,11 @@ ${lanes.join("\n")}
       }
     }
     function scan() {
-      startPos = pos;
+      fullStartPos = pos;
       tokenFlags = 0 /* None */;
       let asteriskSeen = false;
       while (true) {
-        tokenPos = pos;
+        tokenStart = pos;
         if (pos >= end) {
           return token = 1 /* EndOfFileToken */;
         }
@@ -10325,9 +10326,9 @@ ${lanes.join("\n")}
               }
               commentDirectives = appendIfCommentDirective(
                 commentDirectives,
-                text.slice(tokenPos, pos),
+                text.slice(tokenStart, pos),
                 commentDirectiveRegExSingleLine,
-                tokenPos
+                tokenStart
               );
               if (skipTrivia2) {
                 continue;
@@ -10341,7 +10342,7 @@ ${lanes.join("\n")}
                 tokenFlags |= 2 /* PrecedingJSDocComment */;
               }
               let commentClosed = false;
-              let lastLineStart = tokenPos;
+              let lastLineStart = tokenStart;
               while (pos < end) {
                 const ch2 = text.charCodeAt(pos);
                 if (ch2 === 42 /* asterisk */ && text.charCodeAt(pos + 1) === 47 /* slash */) {
@@ -10619,7 +10620,7 @@ ${lanes.join("\n")}
     }
     function reScanInvalidIdentifier() {
       Debug.assert(token === 0 /* Unknown */, "'reScanInvalidIdentifier' should only be called when the current token is 'SyntaxKind.Unknown'.");
-      pos = tokenPos = startPos;
+      pos = tokenStart = fullStartPos;
       tokenFlags = 0;
       const ch = codePointAt(text, pos);
       const identifierKind = scanIdentifier(ch, 99 /* ESNext */);
@@ -10635,7 +10636,7 @@ ${lanes.join("\n")}
         pos += charSize(ch);
         while (pos < end && isIdentifierPart(ch = codePointAt(text, pos), languageVersion2))
           pos += charSize(ch);
-        tokenValue = text.substring(tokenPos, pos);
+        tokenValue = text.substring(tokenStart, pos);
         if (ch === 92 /* backslash */) {
           tokenValue += scanIdentifierParts();
         }
@@ -10666,12 +10667,12 @@ ${lanes.join("\n")}
     }
     function reScanAsteriskEqualsToken() {
       Debug.assert(token === 66 /* AsteriskEqualsToken */, "'reScanAsteriskEqualsToken' should only be called on a '*='");
-      pos = tokenPos + 1;
+      pos = tokenStart + 1;
       return token = 63 /* EqualsToken */;
     }
     function reScanSlashToken() {
       if (token === 43 /* SlashToken */ || token === 68 /* SlashEqualsToken */) {
-        let p = tokenPos + 1;
+        let p = tokenStart + 1;
         let inEscape = false;
         let inCharacterClass = false;
         while (true) {
@@ -10704,7 +10705,7 @@ ${lanes.join("\n")}
           p++;
         }
         pos = p;
-        tokenValue = text.substring(tokenPos, pos);
+        tokenValue = text.substring(tokenStart, pos);
         token = 13 /* RegularExpressionLiteral */;
       }
       return token;
@@ -10737,41 +10738,41 @@ ${lanes.join("\n")}
     }
     function reScanTemplateToken(isTaggedTemplate) {
       Debug.assert(token === 19 /* CloseBraceToken */, "'reScanTemplateToken' should only be called on a '}'");
-      pos = tokenPos;
+      pos = tokenStart;
       return token = scanTemplateAndSetTokenValue(isTaggedTemplate);
     }
     function reScanTemplateHeadOrNoSubstitutionTemplate() {
-      pos = tokenPos;
+      pos = tokenStart;
       return token = scanTemplateAndSetTokenValue(
         /* isTaggedTemplate */
         true
       );
     }
     function reScanJsxToken(allowMultilineJsxText = true) {
-      pos = tokenPos = startPos;
+      pos = tokenStart = fullStartPos;
       return token = scanJsxToken(allowMultilineJsxText);
     }
     function reScanLessThanToken() {
       if (token === 47 /* LessThanLessThanToken */) {
-        pos = tokenPos + 1;
+        pos = tokenStart + 1;
         return token = 29 /* LessThanToken */;
       }
       return token;
     }
     function reScanHashToken() {
       if (token === 80 /* PrivateIdentifier */) {
-        pos = tokenPos + 1;
+        pos = tokenStart + 1;
         return token = 62 /* HashToken */;
       }
       return token;
     }
     function reScanQuestionToken() {
       Debug.assert(token === 60 /* QuestionQuestionToken */, "'reScanQuestionToken' should only be called on a '??'");
-      pos = tokenPos + 1;
+      pos = tokenStart + 1;
       return token = 57 /* QuestionToken */;
     }
     function scanJsxToken(allowMultilineJsxText = true) {
-      startPos = tokenPos = pos;
+      fullStartPos = tokenStart = pos;
       if (pos >= end) {
         return token = 1 /* EndOfFileToken */;
       }
@@ -10816,7 +10817,7 @@ ${lanes.join("\n")}
         }
         pos++;
       }
-      tokenValue = text.substring(startPos, pos);
+      tokenValue = text.substring(fullStartPos, pos);
       return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
     }
     function scanJsxIdentifier() {
@@ -10850,7 +10851,7 @@ ${lanes.join("\n")}
       return token;
     }
     function scanJsxAttributeValue() {
-      startPos = pos;
+      fullStartPos = pos;
       switch (text.charCodeAt(pos)) {
         case 34 /* doubleQuote */:
         case 39 /* singleQuote */:
@@ -10864,11 +10865,11 @@ ${lanes.join("\n")}
       }
     }
     function reScanJsxAttributeValue() {
-      pos = tokenPos = startPos;
+      pos = tokenStart = fullStartPos;
       return scanJsxAttributeValue();
     }
     function scanJsDocToken() {
-      startPos = tokenPos = pos;
+      fullStartPos = tokenStart = pos;
       tokenFlags = 0 /* None */;
       if (pos >= end) {
         return token = 1 /* EndOfFileToken */;
@@ -10940,7 +10941,7 @@ ${lanes.join("\n")}
         let char = ch;
         while (pos < end && isIdentifierPart(char = codePointAt(text, pos), languageVersion) || text.charCodeAt(pos) === 45 /* minus */)
           pos += charSize(char);
-        tokenValue = text.substring(tokenPos, pos);
+        tokenValue = text.substring(tokenStart, pos);
         if (char === 92 /* backslash */) {
           tokenValue += scanIdentifierParts();
         }
@@ -10951,16 +10952,16 @@ ${lanes.join("\n")}
     }
     function speculationHelper(callback, isLookahead) {
       const savePos = pos;
-      const saveStartPos = startPos;
-      const saveTokenPos = tokenPos;
+      const saveStartPos = fullStartPos;
+      const saveTokenPos = tokenStart;
       const saveToken = token;
       const saveTokenValue = tokenValue;
       const saveTokenFlags = tokenFlags;
       const result = callback();
       if (!result || isLookahead) {
         pos = savePos;
-        startPos = saveStartPos;
-        tokenPos = saveTokenPos;
+        fullStartPos = saveStartPos;
+        tokenStart = saveTokenPos;
         token = saveToken;
         tokenValue = saveTokenValue;
         tokenFlags = saveTokenFlags;
@@ -10970,8 +10971,8 @@ ${lanes.join("\n")}
     function scanRange(start2, length3, callback) {
       const saveEnd = end;
       const savePos = pos;
-      const saveStartPos = startPos;
-      const saveTokenPos = tokenPos;
+      const saveStartPos = fullStartPos;
+      const saveTokenPos = tokenStart;
       const saveToken = token;
       const saveTokenValue = tokenValue;
       const saveTokenFlags = tokenFlags;
@@ -10980,8 +10981,8 @@ ${lanes.join("\n")}
       const result = callback();
       end = saveEnd;
       pos = savePos;
-      startPos = saveStartPos;
-      tokenPos = saveTokenPos;
+      fullStartPos = saveStartPos;
+      tokenStart = saveTokenPos;
       token = saveToken;
       tokenValue = saveTokenValue;
       tokenFlags = saveTokenFlags;
@@ -11011,7 +11012,7 @@ ${lanes.join("\n")}
     function setText(newText, start2, length3) {
       text = newText || "";
       end = length3 === void 0 ? text.length : start2 + length3;
-      setTextPos(start2 || 0);
+      resetTokenState(start2 || 0);
     }
     function setOnError(errorCallback) {
       onError = errorCallback;
@@ -11022,11 +11023,11 @@ ${lanes.join("\n")}
     function setLanguageVariant(variant) {
       languageVariant = variant;
     }
-    function setTextPos(textPos) {
-      Debug.assert(textPos >= 0);
-      pos = textPos;
-      startPos = textPos;
-      tokenPos = textPos;
+    function resetTokenState(position) {
+      Debug.assert(position >= 0);
+      pos = position;
+      fullStartPos = position;
+      tokenStart = position;
       token = 0 /* Unknown */;
       tokenValue = void 0;
       tokenFlags = 0 /* None */;
@@ -13939,8 +13940,8 @@ ${lanes.join("\n")}
       pos
     );
     scanner2.scan();
-    const start = scanner2.getTokenPos();
-    return createTextSpanFromBounds(start, scanner2.getTextPos());
+    const start = scanner2.getTokenStart();
+    return createTextSpanFromBounds(start, scanner2.getTokenEnd());
   }
   function scanTokenAtPosition(sourceFile, pos) {
     const scanner2 = createScanner(
@@ -13970,7 +13971,7 @@ ${lanes.join("\n")}
   function getErrorSpanForNode(sourceFile, node) {
     let errorNode = node;
     switch (node.kind) {
-      case 308 /* SourceFile */:
+      case 308 /* SourceFile */: {
         const pos2 = skipTrivia(
           sourceFile.text,
           0,
@@ -13981,6 +13982,7 @@ ${lanes.join("\n")}
           return createTextSpan(0, 0);
         }
         return getSpanOfTokenAtPosition(sourceFile, pos2);
+      }
       case 257 /* VariableDeclaration */:
       case 205 /* BindingElement */:
       case 260 /* ClassDeclaration */:
@@ -14003,10 +14005,16 @@ ${lanes.join("\n")}
       case 216 /* ArrowFunction */:
         return getErrorSpanForArrowFunction(sourceFile, node);
       case 292 /* CaseClause */:
-      case 293 /* DefaultClause */:
+      case 293 /* DefaultClause */: {
         const start = skipTrivia(sourceFile.text, node.pos);
         const end = node.statements.length > 0 ? node.statements[0].pos : node.end;
         return createTextSpanFromBounds(start, end);
+      }
+      case 250 /* ReturnStatement */:
+      case 226 /* YieldExpression */: {
+        const pos2 = skipTrivia(sourceFile.text, node.pos);
+        return getSpanOfTokenAtPosition(sourceFile, pos2);
+      }
     }
     if (errorNode === void 0) {
       return getSpanOfTokenAtPosition(sourceFile, node.pos);
@@ -14089,6 +14097,7 @@ ${lanes.join("\n")}
       case 153 /* SymbolKeyword */:
       case 149 /* ObjectKeyword */:
       case 155 /* UndefinedKeyword */:
+      case 104 /* NullKeyword */:
       case 144 /* NeverKeyword */:
         return true;
       case 114 /* VoidKeyword */:
@@ -18645,7 +18654,7 @@ ${lanes.join("\n")}
       result = scanner2.scan();
     }
     const flags = scanner2.getTokenFlags();
-    return success && result === 9 /* BigIntLiteral */ && scanner2.getTextPos() === s.length + 1 && !(flags & 512 /* ContainsSeparator */) && (!roundTripOnly || s === pseudoBigIntToString({ negative, base10Value: parsePseudoBigInt(scanner2.getTokenValue()) }));
+    return success && result === 9 /* BigIntLiteral */ && scanner2.getTokenEnd() === s.length + 1 && !(flags & 512 /* ContainsSeparator */) && (!roundTripOnly || s === pseudoBigIntToString({ negative, base10Value: parsePseudoBigInt(scanner2.getTokenValue()) }));
   }
   function isValidTypeOnlyAliasUseSite(useSite) {
     return !!(useSite.flags & 16777216 /* Ambient */) || isPartOfTypeQuery(useSite) || isIdentifierInNonEmittingHeritageClause(useSite) || isPartOfPossiblyValidTypeOrAbstractComputedPropertyName(useSite) || !(isExpressionNode(useSite) || isShorthandPropertyNameUseSite(useSite));
@@ -28776,13 +28785,13 @@ ${lanes.join("\n")}
             speculationHelper(() => {
               const savedContextFlags = contextFlags;
               contextFlags |= 32768 /* AwaitContext */;
-              scanner2.setTextPos(nextStatement.pos);
+              scanner2.resetTokenState(nextStatement.pos);
               nextToken();
               while (token() !== 1 /* EndOfFileToken */) {
-                const startPos = scanner2.getStartPos();
+                const startPos = scanner2.getTokenFullStart();
                 const statement = parseListElement(0 /* SourceElements */, parseStatement);
                 statements.push(statement);
-                if (startPos === scanner2.getStartPos()) {
+                if (startPos === scanner2.getTokenFullStart()) {
                   nextToken();
                 }
                 if (pos >= 0) {
@@ -28970,7 +28979,7 @@ ${lanes.join("\n")}
           return inContext(32768 /* AwaitContext */);
         }
         function parseErrorAtCurrentToken(message, arg0) {
-          return parseErrorAt(scanner2.getTokenPos(), scanner2.getTextPos(), message, arg0);
+          return parseErrorAt(scanner2.getTokenStart(), scanner2.getTokenEnd(), message, arg0);
         }
         function parseErrorAtPosition(start, length2, message, arg0) {
           const lastError = lastOrUndefined(parseDiagnostics);
@@ -28989,10 +28998,10 @@ ${lanes.join("\n")}
           parseErrorAt(range.pos, range.end, message, arg0);
         }
         function scanError(message, length2) {
-          parseErrorAtPosition(scanner2.getTextPos(), length2, message);
+          parseErrorAtPosition(scanner2.getTokenEnd(), length2, message);
         }
         function getNodePos() {
-          return scanner2.getStartPos();
+          return scanner2.getTokenFullStart();
         }
         function hasPrecedingJSDocComment() {
           return scanner2.hasPrecedingJSDocComment();
@@ -29009,7 +29018,7 @@ ${lanes.join("\n")}
         }
         function nextToken() {
           if (isKeyword(currentToken) && (scanner2.hasUnicodeEscape() || scanner2.hasExtendedUnicodeEscape())) {
-            parseErrorAt(scanner2.getTokenPos(), scanner2.getTextPos(), Diagnostics.Keywords_cannot_contain_escape_characters);
+            parseErrorAt(scanner2.getTokenStart(), scanner2.getTokenEnd(), Diagnostics.Keywords_cannot_contain_escape_characters);
           }
           return nextTokenWithoutCheck();
         }
@@ -29122,7 +29131,7 @@ ${lanes.join("\n")}
               parseErrorForInvalidName(Diagnostics.Interface_name_cannot_be_0, Diagnostics.Interface_must_be_given_a_name, 18 /* OpenBraceToken */);
               return;
             case "is":
-              parseErrorAt(pos, scanner2.getTextPos(), Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
+              parseErrorAt(pos, scanner2.getTokenStart(), Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
               return;
             case "module":
             case "namespace":
@@ -29277,11 +29286,11 @@ ${lanes.join("\n")}
         }
         function createNodeArray(elements, pos, end, hasTrailingComma) {
           const array = factoryCreateNodeArray(elements, hasTrailingComma);
-          setTextRangePosEnd(array, pos, end != null ? end : scanner2.getStartPos());
+          setTextRangePosEnd(array, pos, end != null ? end : scanner2.getTokenFullStart());
           return array;
         }
         function finishNode(node, pos, end) {
-          setTextRangePosEnd(node, pos, end != null ? end : scanner2.getStartPos());
+          setTextRangePosEnd(node, pos, end != null ? end : scanner2.getTokenFullStart());
           if (contextFlags) {
             node.flags |= contextFlags;
           }
@@ -29293,7 +29302,7 @@ ${lanes.join("\n")}
         }
         function createMissingNode(kind, reportAtCurrentPosition, diagnosticMessage, arg0) {
           if (reportAtCurrentPosition) {
-            parseErrorAtPosition(scanner2.getStartPos(), 0, diagnosticMessage, arg0);
+            parseErrorAtPosition(scanner2.getTokenFullStart(), 0, diagnosticMessage, arg0);
           } else if (diagnosticMessage) {
             parseErrorAtCurrentToken(diagnosticMessage, arg0);
           }
@@ -29679,7 +29688,7 @@ ${lanes.join("\n")}
           if (!syntaxCursor || !isReusableParsingContext(parsingContext2) || parseErrorBeforeNextFinishedNode) {
             return void 0;
           }
-          const node = syntaxCursor.currentNode(pos != null ? pos : scanner2.getStartPos());
+          const node = syntaxCursor.currentNode(pos != null ? pos : scanner2.getTokenFullStart());
           if (nodeIsMissing(node) || node.intersectsChange || containsParseError(node)) {
             return void 0;
           }
@@ -29696,7 +29705,7 @@ ${lanes.join("\n")}
           return node;
         }
         function consumeNode(node) {
-          scanner2.setTextPos(node.end);
+          scanner2.resetTokenState(node.end);
           nextToken();
           return node;
         }
@@ -29910,14 +29919,14 @@ ${lanes.join("\n")}
               /*inErrorRecovery*/
               false
             )) {
-              const startPos = scanner2.getStartPos();
+              const startPos = scanner2.getTokenFullStart();
               const result = parseListElement(kind, parseElement);
               if (!result) {
                 parsingContext = saveParsingContext;
                 return void 0;
               }
               list.push(result);
-              commaStart = scanner2.getTokenPos();
+              commaStart = scanner2.getTokenStart();
               if (parseOptional(27 /* CommaToken */)) {
                 continue;
               }
@@ -29929,7 +29938,7 @@ ${lanes.join("\n")}
               if (considerSemicolonAsDelimiter && token() === 26 /* SemicolonToken */ && !scanner2.hasPrecedingLineBreak()) {
                 nextToken();
               }
-              if (startPos === scanner2.getStartPos()) {
+              if (startPos === scanner2.getTokenFullStart()) {
                 nextToken();
               }
               continue;
@@ -30758,7 +30767,7 @@ ${lanes.join("\n")}
         }
         function parseImportTypeAssertions() {
           const pos = getNodePos();
-          const openBracePosition = scanner2.getTokenPos();
+          const openBracePosition = scanner2.getTokenStart();
           parseExpected(18 /* OpenBraceToken */);
           const multiLine = scanner2.hasPrecedingLineBreak();
           parseExpected(130 /* AssertKeyword */);
@@ -31432,7 +31441,7 @@ ${lanes.join("\n")}
           }
         }
         function parsePossibleParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
-          const tokenPos = scanner2.getTokenPos();
+          const tokenPos = scanner2.getTokenStart();
           if (notParenthesizedArrow == null ? void 0 : notParenthesizedArrow.has(tokenPos)) {
             return void 0;
           }
@@ -32331,7 +32340,7 @@ ${lanes.join("\n")}
         }
         function parseArrayLiteralExpression() {
           const pos = getNodePos();
-          const openBracketPosition = scanner2.getTokenPos();
+          const openBracketPosition = scanner2.getTokenStart();
           const openBracketParsed = parseExpected(22 /* OpenBracketToken */);
           const multiLine = scanner2.hasPrecedingLineBreak();
           const elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
@@ -32391,7 +32400,7 @@ ${lanes.join("\n")}
         }
         function parseObjectLiteralExpression() {
           const pos = getNodePos();
-          const openBracePosition = scanner2.getTokenPos();
+          const openBracePosition = scanner2.getTokenStart();
           const openBraceParsed = parseExpected(18 /* OpenBraceToken */);
           const multiLine = scanner2.hasPrecedingLineBreak();
           const properties = parseDelimitedList(
@@ -32463,7 +32472,7 @@ ${lanes.join("\n")}
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
           const pos = getNodePos();
           const hasJSDoc = hasPrecedingJSDocComment();
-          const openBracePosition = scanner2.getTokenPos();
+          const openBracePosition = scanner2.getTokenStart();
           const openBraceParsed = parseExpected(18 /* OpenBraceToken */, diagnosticMessage);
           if (openBraceParsed || ignoreMissingOpenBrace) {
             const multiLine = scanner2.hasPrecedingLineBreak();
@@ -32520,7 +32529,7 @@ ${lanes.join("\n")}
           const pos = getNodePos();
           const hasJSDoc = hasPrecedingJSDocComment();
           parseExpected(99 /* IfKeyword */);
-          const openParenPosition = scanner2.getTokenPos();
+          const openParenPosition = scanner2.getTokenStart();
           const openParenParsed = parseExpected(20 /* OpenParenToken */);
           const expression = allowInAnd(parseExpression);
           parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenParsed, openParenPosition);
@@ -32534,7 +32543,7 @@ ${lanes.join("\n")}
           parseExpected(90 /* DoKeyword */);
           const statement = parseStatement();
           parseExpected(115 /* WhileKeyword */);
-          const openParenPosition = scanner2.getTokenPos();
+          const openParenPosition = scanner2.getTokenStart();
           const openParenParsed = parseExpected(20 /* OpenParenToken */);
           const expression = allowInAnd(parseExpression);
           parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenParsed, openParenPosition);
@@ -32545,7 +32554,7 @@ ${lanes.join("\n")}
           const pos = getNodePos();
           const hasJSDoc = hasPrecedingJSDocComment();
           parseExpected(115 /* WhileKeyword */);
-          const openParenPosition = scanner2.getTokenPos();
+          const openParenPosition = scanner2.getTokenStart();
           const openParenParsed = parseExpected(20 /* OpenParenToken */);
           const expression = allowInAnd(parseExpression);
           parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenParsed, openParenPosition);
@@ -32612,7 +32621,7 @@ ${lanes.join("\n")}
           const pos = getNodePos();
           const hasJSDoc = hasPrecedingJSDocComment();
           parseExpected(116 /* WithKeyword */);
-          const openParenPosition = scanner2.getTokenPos();
+          const openParenPosition = scanner2.getTokenStart();
           const openParenParsed = parseExpected(20 /* OpenParenToken */);
           const expression = allowInAnd(parseExpression);
           parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenParsed, openParenPosition);
@@ -33708,7 +33717,7 @@ ${lanes.join("\n")}
         }
         function parseImportDeclarationOrImportEqualsDeclaration(pos, hasJSDoc, modifiers) {
           parseExpected(100 /* ImportKeyword */);
-          const afterImportPos = scanner2.getStartPos();
+          const afterImportPos = scanner2.getTokenFullStart();
           let identifier;
           if (isIdentifier2()) {
             identifier = parseIdentifier();
@@ -33752,7 +33761,7 @@ ${lanes.join("\n")}
           if (!skipAssertKeyword) {
             parseExpected(130 /* AssertKeyword */);
           }
-          const openBracePosition = scanner2.getTokenPos();
+          const openBracePosition = scanner2.getTokenStart();
           if (parseExpected(18 /* OpenBraceToken */)) {
             const multiLine = scanner2.hasPrecedingLineBreak();
             const elements = parseDelimitedList(
@@ -33853,8 +33862,8 @@ ${lanes.join("\n")}
         function parseImportOrExportSpecifier(kind) {
           const pos = getNodePos();
           let checkIdentifierIsKeyword = isKeyword(token()) && !isIdentifier2();
-          let checkIdentifierStart = scanner2.getTokenPos();
-          let checkIdentifierEnd = scanner2.getTextPos();
+          let checkIdentifierStart = scanner2.getTokenStart();
+          let checkIdentifierEnd = scanner2.getTokenEnd();
           let isTypeOnly = false;
           let propertyName;
           let canParseAsKeyword = true;
@@ -33899,8 +33908,8 @@ ${lanes.join("\n")}
           return finishNode(node, pos);
           function parseNameWithKeywordCheck() {
             checkIdentifierIsKeyword = isKeyword(token()) && !isIdentifier2();
-            checkIdentifierStart = scanner2.getTokenPos();
-            checkIdentifierEnd = scanner2.getTextPos();
+            checkIdentifierStart = scanner2.getTokenStart();
+            checkIdentifierEnd = scanner2.getTokenEnd();
             return parseIdentifierName();
           }
         }
@@ -34186,8 +34195,8 @@ ${lanes.join("\n")}
                       break loop;
                     case 18 /* OpenBraceToken */:
                       state = 2 /* SavingComments */;
-                      const commentEnd = scanner2.getStartPos();
-                      const linkStart = scanner2.getTextPos() - 1;
+                      const commentEnd = scanner2.getTokenFullStart();
+                      const linkStart = scanner2.getTokenEnd() - 1;
                       const link = parseJSDocLink(linkStart);
                       if (link) {
                         if (!linkEnd) {
@@ -34196,7 +34205,7 @@ ${lanes.join("\n")}
                         parts.push(finishNode(factory2.createJSDocText(comments.join("")), linkEnd != null ? linkEnd : start, commentEnd));
                         parts.push(link);
                         comments = [];
-                        linkEnd = scanner2.getTextPos();
+                        linkEnd = scanner2.getTokenEnd();
                         break;
                       }
                     default:
@@ -34270,7 +34279,7 @@ ${lanes.join("\n")}
             }
             function parseTag(margin) {
               Debug.assert(token() === 59 /* AtToken */);
-              const start2 = scanner2.getTokenPos();
+              const start2 = scanner2.getTokenStart();
               nextTokenJSDoc();
               const tagName = parseJSDocIdentifierName(
                 /*message*/
@@ -34398,7 +34407,7 @@ ${lanes.join("\n")}
                         comments2.push(scanner2.getTokenText());
                         break;
                       }
-                      scanner2.setTextPos(scanner2.getTextPos() - 1);
+                      scanner2.resetTokenState(scanner2.getTokenEnd() - 1);
                     case 1 /* EndOfFileToken */:
                       break loop;
                     case 5 /* WhitespaceTrivia */:
@@ -34414,14 +34423,14 @@ ${lanes.join("\n")}
                       break;
                     case 18 /* OpenBraceToken */:
                       state = 2 /* SavingComments */;
-                      const commentEnd = scanner2.getStartPos();
-                      const linkStart = scanner2.getTextPos() - 1;
+                      const commentEnd = scanner2.getTokenFullStart();
+                      const linkStart = scanner2.getTokenEnd() - 1;
                       const link = parseJSDocLink(linkStart);
                       if (link) {
                         parts2.push(finishNode(factory2.createJSDocText(comments2.join("")), linkEnd2 != null ? linkEnd2 : commentsPos2, commentEnd));
                         parts2.push(link);
                         comments2 = [];
-                        linkEnd2 = scanner2.getTextPos();
+                        linkEnd2 = scanner2.getTokenEnd();
                       } else {
                         pushComment(scanner2.getTokenText());
                       }
@@ -34456,7 +34465,7 @@ ${lanes.join("\n")}
                 if (comments2.length) {
                   parts2.push(finishNode(factory2.createJSDocText(comments2.join("")), linkEnd2 != null ? linkEnd2 : commentsPos2));
                 }
-                return createNodeArray(parts2, commentsPos2, scanner2.getTextPos());
+                return createNodeArray(parts2, commentsPos2, scanner2.getTokenEnd());
               } else if (comments2.length) {
                 return comments2.join("");
               }
@@ -34490,7 +34499,7 @@ ${lanes.join("\n")}
                 nextTokenJSDoc();
               }
               const create = linkType === "link" ? factory2.createJSDocLink : linkType === "linkcode" ? factory2.createJSDocLinkCode : factory2.createJSDocLinkPlain;
-              return finishNode(create(name, text.join("")), start2, scanner2.getTextPos());
+              return finishNode(create(name, text.join("")), start2, scanner2.getTokenEnd());
             }
             function parseJSDocLinkPrefix() {
               skipWhitespaceOrAsterisk();
@@ -34587,14 +34596,14 @@ ${lanes.join("\n")}
             }
             function parseReturnTag(start2, tagName, indent3, indentText) {
               if (some(tags, isJSDocReturnTag)) {
-                parseErrorAt(tagName.pos, scanner2.getTokenPos(), Diagnostics._0_tag_already_specified, tagName.escapedText);
+                parseErrorAt(tagName.pos, scanner2.getTokenStart(), Diagnostics._0_tag_already_specified, tagName.escapedText);
               }
               const typeExpression = tryParseTypeExpression();
               return finishNode(factory2.createJSDocReturnTag(tagName, typeExpression, parseTrailingTagComments(start2, getNodePos(), indent3, indentText)), start2);
             }
             function parseTypeTag(start2, tagName, indent3, indentText) {
               if (some(tags, isJSDocTypeTag)) {
-                parseErrorAt(tagName.pos, scanner2.getTokenPos(), Diagnostics._0_tag_already_specified, tagName.escapedText);
+                parseErrorAt(tagName.pos, scanner2.getTokenStart(), Diagnostics._0_tag_already_specified, tagName.escapedText);
               }
               const typeExpression = parseJSDocTypeExpression(
                 /*mayOmitBraces*/
@@ -34617,10 +34626,10 @@ ${lanes.join("\n")}
             function parseAuthorTag(start2, tagName, indent3, indentText) {
               const commentStart = getNodePos();
               const textOnly = parseAuthorNameAndEmail();
-              let commentEnd = scanner2.getStartPos();
+              let commentEnd = scanner2.getTokenFullStart();
               const comments2 = parseTrailingTagComments(start2, commentEnd, indent3, indentText);
               if (!comments2) {
-                commentEnd = scanner2.getStartPos();
+                commentEnd = scanner2.getTokenFullStart();
               }
               const allParts = typeof comments2 !== "string" ? createNodeArray(concatenate([finishNode(textOnly, commentStart, commentEnd)], comments2), commentStart) : textOnly.text + comments2;
               return finishNode(factory2.createJSDocAuthorTag(tagName, allParts), start2);
@@ -34636,7 +34645,7 @@ ${lanes.join("\n")}
                   break;
                 } else if (token2 === 31 /* GreaterThanToken */ && inEmail) {
                   comments2.push(scanner2.getTokenText());
-                  scanner2.setTextPos(scanner2.getTokenPos() + 1);
+                  scanner2.resetTokenState(scanner2.getTokenEnd());
                   break;
                 }
                 comments2.push(scanner2.getTokenText());
@@ -34744,7 +34753,7 @@ ${lanes.join("\n")}
               return finishNode(typedefTag, start2, end2);
             }
             function parseJSDocTypeNameWithNamespace(nested) {
-              const pos = scanner2.getTokenPos();
+              const start2 = scanner2.getTokenStart();
               if (!tokenIsIdentifierOrKeyword(token())) {
                 return void 0;
               }
@@ -34761,7 +34770,7 @@ ${lanes.join("\n")}
                   body,
                   nested ? 4 /* NestedNamespace */ : void 0
                 );
-                return finishNode(jsDocNamespaceNode, pos);
+                return finishNode(jsDocNamespaceNode, start2);
               }
               if (nested) {
                 typeNameOrNamespaceName.flags |= 2048 /* IdentifierIsInJSDocNamespace */;
@@ -34864,7 +34873,7 @@ ${lanes.join("\n")}
             }
             function tryParseChildTag(target, indent3) {
               Debug.assert(token() === 59 /* AtToken */);
-              const start2 = scanner2.getStartPos();
+              const start2 = scanner2.getTokenFullStart();
               nextTokenJSDoc();
               const tagName = parseJSDocIdentifierName();
               skipWhitespace();
@@ -34964,11 +34973,11 @@ ${lanes.join("\n")}
                 );
               }
               identifierCount++;
-              const pos = scanner2.getTokenPos();
-              const end2 = scanner2.getTextPos();
+              const start2 = scanner2.getTokenStart();
+              const end2 = scanner2.getTokenEnd();
               const originalKeywordKind = token();
               const text = internIdentifier(scanner2.getTokenValue());
-              const result = finishNode(factoryCreateIdentifier(text, originalKeywordKind), pos, end2);
+              const result = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start2, end2);
               nextTokenJSDoc();
               return result;
             }
@@ -44053,7 +44062,7 @@ ${lanes.join("\n")}
         ModuleInstanceState2[ModuleInstanceState2["ConstEnumOnly"] = 2] = "ConstEnumOnly";
         return ModuleInstanceState2;
       })(ModuleInstanceState || {});
-      binder = createBinder();
+      binder = /* @__PURE__ */ createBinder();
     }
   });
 
@@ -45317,7 +45326,10 @@ ${lanes.join("\n")}
       createIndexInfo,
       getAnyType: () => anyType,
       getStringType: () => stringType,
+      getStringLiteralType,
       getNumberType: () => numberType,
+      getNumberLiteralType,
+      getBigIntType: () => bigintType,
       createPromiseType,
       createArrayType,
       getElementTypeOfArrayType,
@@ -54724,9 +54736,14 @@ ${lanes.join("\n")}
       return result;
     }
     function addInheritedMembers(symbols, baseSymbols) {
-      for (const s of baseSymbols) {
-        if (!symbols.has(s.escapedName) && !isStaticPrivateIdentifierProperty(s)) {
-          symbols.set(s.escapedName, s);
+      for (const base of baseSymbols) {
+        if (isStaticPrivateIdentifierProperty(base)) {
+          continue;
+        }
+        const derived = symbols.get(base.escapedName);
+        if (!derived || derived.valueDeclaration && isBinaryExpression(derived.valueDeclaration) && !isConstructorDeclaredProperty(derived) && !getContainingClassStaticBlock(derived.valueDeclaration)) {
+          symbols.set(base.escapedName, base);
+          symbols.set(base.escapedName, base);
         }
       }
     }
@@ -58649,12 +58666,15 @@ ${lanes.join("\n")}
     function getConstituentCountOfTypes(types) {
       return reduceLeft(types, (n, t) => n + getConstituentCount(t), 0);
     }
+    function areIntersectedTypesAvoidingPrimitiveReduction(t1, t2) {
+      return !!(t1.flags & (4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) && t2 === emptyTypeLiteralType;
+    }
     function getTypeFromIntersectionTypeNode(node) {
       const links = getNodeLinks(node);
       if (!links.resolvedType) {
         const aliasSymbol = getAliasSymbolForTypeNode(node);
         const types = map(node.types, getTypeFromTypeNode);
-        const noSupertypeReduction = types.length === 2 && !!(types[0].flags & (4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) && types[1] === emptyTypeLiteralType;
+        const noSupertypeReduction = types.length === 2 && (areIntersectedTypesAvoidingPrimitiveReduction(types[0], types[1]) || areIntersectedTypesAvoidingPrimitiveReduction(types[1], types[0]));
         links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction);
       }
       return links.resolvedType;
@@ -62027,8 +62047,8 @@ ${lanes.join("\n")}
                   if (prop.valueDeclaration && findAncestor(prop.valueDeclaration, (d) => d === objectLiteralDeclaration) && getSourceFileOfNode(objectLiteralDeclaration) === getSourceFileOfNode(errorNode)) {
                     const propDeclaration = prop.valueDeclaration;
                     Debug.assertNode(propDeclaration, isObjectLiteralElementLike);
-                    errorNode = propDeclaration;
                     const name = propDeclaration.name;
+                    errorNode = name;
                     if (isIdentifier(name)) {
                       suggestion = getSuggestionForNonexistentProperty(name, errorTarget);
                     }
@@ -69614,13 +69634,14 @@ ${lanes.join("\n")}
       const elementFlags = [];
       pushCachedContextualType(node);
       const inDestructuringPattern = isAssignmentTarget(node);
-      const inConstContext = isConstContext(node);
+      const isSpreadIntoCallOrNew = isSpreadElement(node.parent) && isCallOrNewExpression(node.parent.parent);
+      const inConstContext = isSpreadIntoCallOrNew || isConstContext(node);
       const contextualType = getApparentTypeOfContextualType(
         node,
         /*contextFlags*/
         void 0
       );
-      const inTupleContext = !!contextualType && someType(contextualType, isTupleLikeType);
+      const inTupleContext = isSpreadIntoCallOrNew || !!contextualType && someType(contextualType, isTupleLikeType);
       let hasOmittedExpression = false;
       for (let i = 0; i < elementCount; i++) {
         const e = elements[i];
@@ -76791,7 +76812,7 @@ ${lanes.join("\n")}
       return !!forEachChild(node, nodeImmediatelyReferencesSuperOrThis);
     }
     function checkAccessorDeclaration(node) {
-      if (isIdentifier(node.name) && idText(node.name) === "constructor") {
+      if (isIdentifier(node.name) && idText(node.name) === "constructor" && isClassLike(node.parent)) {
         error(node.name, Diagnostics.Class_constructor_may_not_be_an_accessor);
       }
       addLazyDiagnostic(checkAccessorDeclarationDiagnostics);
@@ -115806,6 +115827,7 @@ ${lanes.join("\n")}
     const createProgramOptions = isArray(rootNamesOrOptions) ? createCreateProgramOptions(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) : rootNamesOrOptions;
     const { rootNames, options, configFileParsingDiagnostics, projectReferences, typeScriptVersion: typeScriptVersion3 } = createProgramOptions;
     let { oldProgram } = createProgramOptions;
+    const reportInvalidIgnoreDeprecations = memoize(() => createOptionValueDiagnostic("ignoreDeprecations", Diagnostics.Invalid_value_for_ignoreDeprecations));
     let processingDefaultLibFiles;
     let processingOtherFiles;
     let files;
@@ -118232,127 +118254,131 @@ ${lanes.join("\n")}
         }
       }
     }
-    function getVersionForDeprecationDiagnostics(reportInvalidIgnoreDeprecations) {
-      const version2 = typeScriptVersion3 || versionMajorMinor;
+    function getIgnoreDeprecationsVersion() {
       const ignoreDeprecations = options.ignoreDeprecations;
       if (ignoreDeprecations) {
-        if (ignoreDeprecations === "5.0" /* v5_0 */ && version2.startsWith("5.")) {
-          return;
-        } else if (reportInvalidIgnoreDeprecations) {
-          createOptionValueDiagnostic("ignoreDeprecations", Diagnostics.Invalid_value_for_ignoreDeprecations);
-        }
+        if (ignoreDeprecations === "5.0") {
+          return new Version(ignoreDeprecations);
+        }
+        reportInvalidIgnoreDeprecations();
+      }
+      return Version.zero;
+    }
+    function checkDeprecations(deprecatedIn, removedIn, createDiagnostic, fn) {
+      const deprecatedInVersion = new Version(deprecatedIn);
+      const removedInVersion = new Version(removedIn);
+      const typescriptVersion = new Version(typeScriptVersion3 || versionMajorMinor);
+      const ignoreDeprecationsVersion = getIgnoreDeprecationsVersion();
+      const mustBeRemoved = !(removedInVersion.compareTo(typescriptVersion) === 1 /* GreaterThan */);
+      const canBeSilenced = !mustBeRemoved && ignoreDeprecationsVersion.compareTo(deprecatedInVersion) === -1 /* LessThan */;
+      if (mustBeRemoved || canBeSilenced) {
+        fn((name, value, useInstead) => {
+          if (mustBeRemoved) {
+            if (value === void 0) {
+              createDiagnostic(name, value, useInstead, Diagnostics.Option_0_has_been_removed_Please_remove_it_from_your_configuration, name);
+            } else {
+              createDiagnostic(name, value, useInstead, Diagnostics.Option_0_1_has_been_removed_Please_remove_it_from_your_configuration, name, value);
+            }
+          } else {
+            if (value === void 0) {
+              createDiagnostic(name, value, useInstead, Diagnostics.Option_0_is_deprecated_and_will_stop_functioning_in_TypeScript_1_Specify_compilerOption_ignoreDeprecations_Colon_2_to_silence_this_error, name, removedIn, deprecatedIn);
+            } else {
+              createDiagnostic(name, value, useInstead, Diagnostics.Option_0_1_is_deprecated_and_will_stop_functioning_in_TypeScript_2_Specify_compilerOption_ignoreDeprecations_Colon_3_to_silence_this_error, name, value, removedIn, deprecatedIn);
+            }
+          }
+        });
       }
-      return version2;
     }
     function verifyDeprecatedCompilerOptions() {
-      const version2 = getVersionForDeprecationDiagnostics(
-        /*reportInvalidIgnoreDeprecations*/
-        true
-      );
-      if (!version2)
-        return;
-      if (options.target === 0 /* ES3 */) {
-        createDeprecatedDiagnosticForOption(version2, "target", "ES3");
-      }
-      if (options.noImplicitUseStrict) {
-        createDeprecatedDiagnosticForOption(version2, "noImplicitUseStrict");
-      }
-      if (options.keyofStringsOnly) {
-        createDeprecatedDiagnosticForOption(version2, "keyofStringsOnly");
-      }
-      if (options.suppressExcessPropertyErrors) {
-        createDeprecatedDiagnosticForOption(version2, "suppressExcessPropertyErrors");
-      }
-      if (options.suppressImplicitAnyIndexErrors) {
-        createDeprecatedDiagnosticForOption(version2, "suppressImplicitAnyIndexErrors");
-      }
-      if (options.noStrictGenericChecks) {
-        createDeprecatedDiagnosticForOption(version2, "noStrictGenericChecks");
-      }
-      if (options.charset) {
-        createDeprecatedDiagnosticForOption(version2, "charset");
-      }
-      if (options.out) {
-        createDeprecatedDiagnosticForOption(version2, "out");
-      }
-      if (options.importsNotUsedAsValues) {
-        createDeprecatedDiagnosticForOption(
-          version2,
-          "importsNotUsedAsValues",
-          /*value*/
-          void 0,
-          "verbatimModuleSyntax"
-        );
-      }
-      if (options.preserveValueImports) {
-        createDeprecatedDiagnosticForOption(
-          version2,
-          "preserveValueImports",
-          /*value*/
-          void 0,
-          "verbatimModuleSyntax"
-        );
-      }
-    }
-    function verifyDeprecatedProjectReference(ref, parentFile, index) {
-      if (ref.prepend) {
-        const version2 = getVersionForDeprecationDiagnostics(
-          /*reportInvalidIgnoreDeprecations*/
-          false
-        );
-        if (version2) {
-          createDeprecatedOptionForVersionDiagnostic(
-            version2,
-            (message, arg0, arg1, arg2) => createDiagnosticForReference(parentFile, index, message, arg0, arg1, arg2),
-            "prepend"
+      function createDiagnostic(name, value, useInstead, message, arg0, arg1, arg2, arg3) {
+        if (useInstead) {
+          const details = chainDiagnosticMessages(
+            /*details*/
+            void 0,
+            Diagnostics.Use_0_instead,
+            useInstead
+          );
+          const chain = chainDiagnosticMessages(details, message, arg0, arg1, arg2, arg3);
+          createDiagnosticForOption(
+            /*onKey*/
+            !value,
+            name,
+            /*option2*/
+            void 0,
+            chain
+          );
+        } else {
+          createDiagnosticForOption(
+            /*onKey*/
+            !value,
+            name,
+            /*option2*/
+            void 0,
+            message,
+            arg0,
+            arg1,
+            arg2,
+            arg3
           );
         }
       }
+      checkDeprecations("5.0", "5.5", createDiagnostic, (createDeprecatedDiagnostic) => {
+        if (options.target === 0 /* ES3 */) {
+          createDeprecatedDiagnostic("target", "ES3");
+        }
+        if (options.noImplicitUseStrict) {
+          createDeprecatedDiagnostic("noImplicitUseStrict");
+        }
+        if (options.keyofStringsOnly) {
+          createDeprecatedDiagnostic("keyofStringsOnly");
+        }
+        if (options.suppressExcessPropertyErrors) {
+          createDeprecatedDiagnostic("suppressExcessPropertyErrors");
+        }
+        if (options.suppressImplicitAnyIndexErrors) {
+          createDeprecatedDiagnostic("suppressImplicitAnyIndexErrors");
+        }
+        if (options.noStrictGenericChecks) {
+          createDeprecatedDiagnostic("noStrictGenericChecks");
+        }
+        if (options.charset) {
+          createDeprecatedDiagnostic("charset");
+        }
+        if (options.out) {
+          createDeprecatedDiagnostic(
+            "out",
+            /*value*/
+            void 0,
+            "outFile"
+          );
+        }
+        if (options.importsNotUsedAsValues) {
+          createDeprecatedDiagnostic(
+            "importsNotUsedAsValues",
+            /*value*/
+            void 0,
+            "verbatimModuleSyntax"
+          );
+        }
+        if (options.preserveValueImports) {
+          createDeprecatedDiagnostic(
+            "preserveValueImports",
+            /*value*/
+            void 0,
+            "verbatimModuleSyntax"
+          );
+        }
+      });
     }
-    function createDeprecatedDiagnosticForOption(version2, name, value, useInstead) {
-      return createDeprecatedOptionForVersionDiagnostic(
-        version2,
-        (message, arg0, arg1, arg2) => {
-          if (useInstead) {
-            const details = chainDiagnosticMessages(
-              /*details*/
-              void 0,
-              Diagnostics.Use_0_instead,
-              useInstead
-            );
-            const chain = chainDiagnosticMessages(details, message, arg0, arg1, arg2);
-            createDiagnosticForOption(
-              /*onKey*/
-              !value,
-              name,
-              /*option2*/
-              void 0,
-              chain
-            );
-          } else {
-            createDiagnosticForOption(
-              /*onKey*/
-              !value,
-              name,
-              /*option2*/
-              void 0,
-              message,
-              arg0,
-              arg1,
-              arg2
-            );
-          }
-        },
-        name,
-        value
-      );
-    }
-    function createDeprecatedOptionForVersionDiagnostic(version2, createDiagnostic, name, value) {
-      if (version2 === "6.0" /* v6_0 */) {
-        createDiagnostic(Diagnostics.Flag_0_is_deprecated_Please_remove_it_from_your_configuration, value || name);
-      } else {
-        createDiagnostic(Diagnostics.Flag_0_is_deprecated_and_will_stop_functioning_in_TypeScript_1_Specify_compilerOption_ignoreDeprecations_Colon_2_to_silence_this_error, value || name, "5.5" /* v5_5 */, "5.0" /* v5_0 */);
+    function verifyDeprecatedProjectReference(ref, parentFile, index) {
+      function createDiagnostic(_name, _value, _useInstead, message, arg0, arg1, arg2, arg3) {
+        createDiagnosticForReference(parentFile, index, message, arg0, arg1, arg2, arg3);
       }
+      checkDeprecations("5.0", "5.5", createDiagnostic, (createDeprecatedDiagnostic) => {
+        if (ref.prepend) {
+          createDeprecatedDiagnostic("prepend");
+        }
+      });
     }
     function createDiagnosticExplainingFile(file, fileProcessingReason, diagnostic, args) {
       var _a3;
@@ -118605,25 +118631,25 @@ ${lanes.join("\n")}
         arg1
       );
     }
-    function createDiagnosticForReference(sourceFile, index, message, arg0, arg1, arg2) {
+    function createDiagnosticForReference(sourceFile, index, message, arg0, arg1, arg2, arg3) {
       const referencesSyntax = firstDefined(
         getTsConfigPropArray(sourceFile || options.configFile, "references"),
         (property) => isArrayLiteralExpression(property.initializer) ? property.initializer : void 0
       );
       if (referencesSyntax && referencesSyntax.elements.length > index) {
-        programDiagnostics.add(createDiagnosticForNodeInSourceFile(sourceFile || options.configFile, referencesSyntax.elements[index], message, arg0, arg1, arg2));
+        programDiagnostics.add(createDiagnosticForNodeInSourceFile(sourceFile || options.configFile, referencesSyntax.elements[index], message, arg0, arg1, arg2, arg3));
       } else {
-        programDiagnostics.add(createCompilerDiagnostic(message, arg0, arg1, arg2));
+        programDiagnostics.add(createCompilerDiagnostic(message, arg0, arg1, arg2, arg3));
       }
     }
-    function createDiagnosticForOption(onKey, option1, option2, message, arg0, arg1, arg2) {
+    function createDiagnosticForOption(onKey, option1, option2, message, arg0, arg1, arg2, arg3) {
       const compilerOptionsObjectLiteralSyntax = getCompilerOptionsObjectLiteralSyntax();
-      const needCompilerDiagnostic = !compilerOptionsObjectLiteralSyntax || !createOptionDiagnosticInObjectLiteralSyntax(compilerOptionsObjectLiteralSyntax, onKey, option1, option2, message, arg0, arg1, arg2);
+      const needCompilerDiagnostic = !compilerOptionsObjectLiteralSyntax || !createOptionDiagnosticInObjectLiteralSyntax(compilerOptionsObjectLiteralSyntax, onKey, option1, option2, message, arg0, arg1, arg2, arg3);
       if (needCompilerDiagnostic) {
         if ("messageText" in message) {
           programDiagnostics.add(createCompilerDiagnosticFromMessageChain(message));
         } else {
-          programDiagnostics.add(createCompilerDiagnostic(message, arg0, arg1, arg2));
+          programDiagnostics.add(createCompilerDiagnostic(message, arg0, arg1, arg2, arg3));
         }
       }
     }
@@ -118642,13 +118668,13 @@ ${lanes.join("\n")}
       }
       return _compilerOptionsObjectLiteralSyntax || void 0;
     }
-    function createOptionDiagnosticInObjectLiteralSyntax(objectLiteral, onKey, key1, key2, message, arg0, arg1, arg2) {
+    function createOptionDiagnosticInObjectLiteralSyntax(objectLiteral, onKey, key1, key2, message, arg0, arg1, arg2, arg3) {
       const props = getPropertyAssignment(objectLiteral, key1, key2);
       for (const prop of props) {
         if ("messageText" in message) {
           programDiagnostics.add(createDiagnosticForNodeFromMessageChain(options.configFile, onKey ? prop.name : prop.initializer, message));
         } else {
-          programDiagnostics.add(createDiagnosticForNodeInSourceFile(options.configFile, onKey ? prop.name : prop.initializer, message, arg0, arg1, arg2));
+          programDiagnostics.add(createDiagnosticForNodeInSourceFile(options.configFile, onKey ? prop.name : prop.initializer, message, arg0, arg1, arg2, arg3));
         }
       }
       return !!props.length;
@@ -127136,12 +127162,15 @@ ${lanes.join("\n")}
     }
     return false;
   }
+  function areIntersectedTypesAvoidingStringReduction(checker, t1, t2) {
+    return !!(t1.flags & 4 /* String */) && checker.isEmptyAnonymousObjectType(t2);
+  }
   function isStringAndEmptyAnonymousObjectIntersection(type) {
     if (!type.isIntersection()) {
       return false;
     }
     const { types, checker } = type;
-    return types.length === 2 && types[0].flags & 4 /* String */ && checker.isEmptyAnonymousObjectType(types[1]);
+    return types.length === 2 && (areIntersectedTypesAvoidingStringReduction(checker, types[0], types[1]) || areIntersectedTypesAvoidingStringReduction(checker, types[1], types[0]));
   }
   function isPunctuation(kind) {
     return 18 /* FirstPunctuation */ <= kind && kind <= 78 /* LastPunctuation */;
@@ -129074,8 +129103,8 @@ ${lanes.join("\n")}
           handleToken();
           lastNonTriviaToken = token;
         }
-        const end = scanner2.getTextPos();
-        pushEncodedClassification(scanner2.getTokenPos(), end, offset, classFromKind(token), spans);
+        const end = scanner2.getTokenEnd();
+        pushEncodedClassification(scanner2.getTokenStart(), end, offset, classFromKind(token), spans);
         if (end >= text.length) {
           const end2 = getNewEndOfLineState(scanner2, token, lastOrUndefined(templateStack));
           if (end2 !== void 0) {
@@ -129540,14 +129569,14 @@ ${lanes.join("\n")}
       result.push(type);
     }
     function classifyLeadingTriviaAndGetTokenStart(token) {
-      triviaScanner.setTextPos(token.pos);
+      triviaScanner.resetTokenState(token.pos);
       while (true) {
-        const start = triviaScanner.getTextPos();
+        const start = triviaScanner.getTokenEnd();
         if (!couldStartTrivia(sourceFile.text, start)) {
           return start;
         }
         const kind = triviaScanner.scan();
-        const end = triviaScanner.getTextPos();
+        const end = triviaScanner.getTokenEnd();
         const width = end - start;
         if (!isTrivia(kind)) {
           return start;
@@ -129559,7 +129588,7 @@ ${lanes.join("\n")}
           case 2 /* SingleLineCommentTrivia */:
           case 3 /* MultiLineCommentTrivia */:
             classifyComment(token, kind, start, width);
-            triviaScanner.setTextPos(end);
+            triviaScanner.resetTokenState(end);
             continue;
           case 7 /* ConflictMarkerTrivia */:
             const text = sourceFile.text;
@@ -129758,15 +129787,15 @@ ${lanes.join("\n")}
         }
       }
       pushClassification(start, i - start, 1 /* comment */);
-      mergeConflictScanner.setTextPos(i);
-      while (mergeConflictScanner.getTextPos() < end) {
+      mergeConflictScanner.resetTokenState(i);
+      while (mergeConflictScanner.getTokenEnd() < end) {
         classifyDisabledCodeToken();
       }
     }
     function classifyDisabledCodeToken() {
-      const start = mergeConflictScanner.getTextPos();
+      const start = mergeConflictScanner.getTokenEnd();
       const tokenKind = mergeConflictScanner.scan();
-      const end = mergeConflictScanner.getTextPos();
+      const end = mergeConflictScanner.getTokenEnd();
       const type = classifyTokenType(tokenKind);
       if (type) {
         pushClassification(start, end - start, type);
@@ -131165,7 +131194,7 @@ ${lanes.join("\n")}
     }
     function getFileReference() {
       const fileName = scanner.getTokenValue();
-      const pos = scanner.getTokenPos();
+      const pos = scanner.getTokenStart();
       return { fileName, pos, end: pos + fileName.length };
     }
     function recordAmbientExternalModule() {
@@ -132882,10 +132911,10 @@ ${lanes.join("\n")}
     return children;
   }
   function addSyntheticNodes(nodes, pos, end, parent2) {
-    scanner.setTextPos(pos);
+    scanner.resetTokenState(pos);
     while (pos < end) {
       const token = scanner.scan();
-      const textPos = scanner.getTextPos();
+      const textPos = scanner.getTokenEnd();
       if (textPos <= end) {
         if (token === 79 /* Identifier */) {
           if (hasTabstop(parent2)) {
@@ -143873,6 +143902,24 @@ ${lanes.join("\n")}
   function deleteDestructuringElements(changes, sourceFile, node) {
     forEach(node.elements, (n) => changes.delete(sourceFile, n));
   }
+  function deleteDestructuring(context, changes, sourceFile, { parent: parent2 }) {
+    if (isVariableDeclaration(parent2) && parent2.initializer && isCallLikeExpression(parent2.initializer)) {
+      if (isVariableDeclarationList(parent2.parent) && length(parent2.parent.declarations) > 1) {
+        const varStatement = parent2.parent.parent;
+        const pos = varStatement.getStart(sourceFile);
+        const end = varStatement.end;
+        changes.delete(sourceFile, parent2);
+        changes.insertNodeAt(sourceFile, end, parent2.initializer, {
+          prefix: getNewLineOrDefaultFromHost(context.host, context.formatContext.options) + sourceFile.text.slice(getPrecedingNonSpaceCharacterPosition(sourceFile.text, pos - 1), pos),
+          suffix: probablyUsesSemicolons(sourceFile) ? ";" : ""
+        });
+      } else {
+        changes.replaceNode(sourceFile, parent2.parent, parent2.initializer);
+      }
+    } else {
+      changes.delete(sourceFile, parent2);
+    }
+  }
   function tryPrefixDeclaration(changes, errorCode, sourceFile, token) {
     if (errorCode === Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
       return;
@@ -144062,7 +144109,7 @@ ${lanes.join("\n")}
               ];
             }
             return [
-              createDeleteFix(ts_textChanges_exports.ChangeTracker.with(context, (t) => t.delete(sourceFile, token.parent.parent)), Diagnostics.Remove_unused_destructuring_declaration)
+              createDeleteFix(ts_textChanges_exports.ChangeTracker.with(context, (t) => deleteDestructuring(context, t, sourceFile, token.parent)), Diagnostics.Remove_unused_destructuring_declaration)
             ];
           }
           if (canDeleteEntireVariableStatement(sourceFile, token)) {
@@ -149453,7 +149500,7 @@ ${lanes.join("\n")}
     function getTypeScriptMemberSymbols() {
       completionKind = 2 /* PropertyAccess */;
       const isImportType = isLiteralImportTypeNode(node);
-      const isTypeLocation = insideJsDocTagTypeExpression || isImportType && !node.isTypeOf || isPartOfTypeNode(node.parent) || isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
+      const isTypeLocation = isImportType && !node.isTypeOf || isPartOfTypeNode(node.parent) || isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
       const isRhsOfImportDeclaration = isInRightSideOfInternalImportEqualsDeclaration(node);
       if (isEntityName(node) || isImportType || isPropertyAccessExpression(node)) {
         const isNamespaceName = isModuleDeclaration(node.parent);
@@ -149473,13 +149520,13 @@ ${lanes.join("\n")}
             } : isRhsOfImportDeclaration ? (
               // Any kind is allowed when dotting off namespace in internal import equals declaration
               (symbol2) => isValidTypeAccess(symbol2) || isValidValueAccess(symbol2)
-            ) : isTypeLocation ? isValidTypeAccess : isValidValueAccess;
+            ) : isTypeLocation || insideJsDocTagTypeExpression ? isValidTypeAccess : isValidValueAccess;
             for (const exportedSymbol of exportedSymbols) {
               if (isValidAccess(exportedSymbol)) {
                 symbols.push(exportedSymbol);
               }
             }
-            if (!isTypeLocation && symbol.declarations && symbol.declarations.some((d) => d.kind !== 308 /* SourceFile */ && d.kind !== 264 /* ModuleDeclaration */ && d.kind !== 263 /* EnumDeclaration */)) {
+            if (!isTypeLocation && !insideJsDocTagTypeExpression && symbol.declarations && symbol.declarations.some((d) => d.kind !== 308 /* SourceFile */ && d.kind !== 264 /* ModuleDeclaration */ && d.kind !== 263 /* EnumDeclaration */)) {
               let type = typeChecker.getTypeOfSymbolAtLocation(symbol, node).getNonOptionalType();
               let insertQuestionDot = false;
               if (type.isNullableType()) {
@@ -155744,7 +155791,7 @@ ${lanes.join("\n")}
     const endPos = decl.getStart();
     scanner2.setText(sourceFile.text, startPos, endPos - startPos);
     let numberOfNewLines = 0;
-    while (scanner2.getTokenPos() < endPos) {
+    while (scanner2.getTokenStart() < endPos) {
       const tokenKind = scanner2.scan();
       if (tokenKind === 4 /* NewLineTrivia */) {
         numberOfNewLines++;
@@ -157606,7 +157653,7 @@ ${lanes.join("\n")}
     }
     deleteUnusedOldImports(oldFile, toMove.all, changes, usage.unusedImportsFromOldFile, checker);
     deleteMovedStatements(oldFile, toMove.ranges, changes);
-    updateImportsInOtherFiles(changes, program, host, oldFile, usage.movedSymbols, newFilename);
+    updateImportsInOtherFiles(changes, program, host, oldFile, usage.movedSymbols, newFilename, quotePreference);
     const imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, program, host, useEsModuleSyntax, quotePreference);
     const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEsModuleSyntax);
     if (imports.length && body.length) {
@@ -157635,7 +157682,7 @@ ${lanes.join("\n")}
       forEachImportInStatement(statement, (i) => deleteUnusedImports(oldFile, i, changes, (name) => toDelete.has(checker.getSymbolAtLocation(name))));
     }
   }
-  function updateImportsInOtherFiles(changes, program, host, oldFile, movedSymbols, newFilename) {
+  function updateImportsInOtherFiles(changes, program, host, oldFile, movedSymbols, newFilename, quotePreference) {
     const checker = program.getTypeChecker();
     for (const sourceFile of program.getSourceFiles()) {
       if (sourceFile === oldFile)
@@ -157651,12 +157698,12 @@ ${lanes.join("\n")}
           deleteUnusedImports(sourceFile, importNode, changes, shouldMove);
           const pathToNewFileWithExtension = resolvePath(getDirectoryPath(oldFile.path), newFilename);
           const newModuleSpecifier = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.path, pathToNewFileWithExtension, createModuleSpecifierResolutionHost(program, host));
-          const newImportDeclaration = filterImport(importNode, factory.createStringLiteral(newModuleSpecifier), shouldMove);
+          const newImportDeclaration = filterImport(importNode, makeStringLiteral(newModuleSpecifier, quotePreference), shouldMove);
           if (newImportDeclaration)
             changes.insertNodeAfter(sourceFile, statement, newImportDeclaration);
           const ns = getNamespaceLikeImport(importNode);
           if (ns)
-            updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleSpecifier, ns, importNode);
+            updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleSpecifier, ns, importNode, quotePreference);
         });
       }
     }
@@ -157673,7 +157720,7 @@ ${lanes.join("\n")}
         return Debug.assertNever(node, `Unexpected node kind ${node.kind}`);
     }
   }
-  function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleSpecifier, oldImportId, oldImportNode) {
+  function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleSpecifier, oldImportId, oldImportNode, quotePreference) {
     const preferredNewNamespaceName = ts_codefix_exports.moduleSpecifierToValidIdentifier(newModuleSpecifier, 99 /* ESNext */);
     let needUniqueName = false;
     const toChange = [];
@@ -157696,12 +157743,12 @@ ${lanes.join("\n")}
       for (const ref of toChange) {
         changes.replaceNode(sourceFile, ref, factory.createIdentifier(newNamespaceName));
       }
-      changes.insertNodeAfter(sourceFile, oldImportNode, updateNamespaceLikeImportNode(oldImportNode, preferredNewNamespaceName, newModuleSpecifier));
+      changes.insertNodeAfter(sourceFile, oldImportNode, updateNamespaceLikeImportNode(oldImportNode, preferredNewNamespaceName, newModuleSpecifier, quotePreference));
     }
   }
-  function updateNamespaceLikeImportNode(node, newNamespaceName, newModuleSpecifier) {
+  function updateNamespaceLikeImportNode(node, newNamespaceName, newModuleSpecifier, quotePreference) {
     const newNamespaceId = factory.createIdentifier(newNamespaceName);
-    const newModuleString = factory.createStringLiteral(newModuleSpecifier);
+    const newModuleString = makeStringLiteral(newModuleSpecifier, quotePreference);
     switch (node.kind) {
       case 269 /* ImportDeclaration */:
         return factory.createImportDeclaration(
@@ -157800,7 +157847,7 @@ ${lanes.join("\n")}
         factory.createObjectBindingPattern(bindingElements),
         /*type*/
         void 0,
-        createRequireCall(factory.createStringLiteral(pathToNewFileWithCorrectExtension))
+        createRequireCall(makeStringLiteral(pathToNewFileWithCorrectExtension, quotePreference))
       ) : void 0;
     }
   }
@@ -164814,7 +164861,7 @@ ${options.prefix}` : "\n" : options.prefix
   function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
     const scanner2 = languageVariant === 1 /* JSX */ ? jsxScanner : standardScanner;
     scanner2.setText(text);
-    scanner2.setTextPos(startPos);
+    scanner2.resetTokenState(startPos);
     let wasNewLine = true;
     let leadingTrivia;
     let trailingTrivia;
@@ -164831,9 +164878,13 @@ ${options.prefix}` : "\n" : options.prefix
       lastTrailingTriviaWasNewLine: () => wasNewLine,
       skipToEndOf,
       skipToStartOf,
+      getTokenFullStart: () => {
+        var _a2;
+        return (_a2 = lastTokenInfo == null ? void 0 : lastTokenInfo.token.pos) != null ? _a2 : scanner2.getTokenStart();
+      },
       getStartPos: () => {
         var _a2;
-        return (_a2 = lastTokenInfo == null ? void 0 : lastTokenInfo.token.pos) != null ? _a2 : scanner2.getTokenPos();
+        return (_a2 = lastTokenInfo == null ? void 0 : lastTokenInfo.token.pos) != null ? _a2 : scanner2.getTokenStart();
       }
     });
     lastTokenInfo = void 0;
@@ -164841,7 +164892,7 @@ ${options.prefix}` : "\n" : options.prefix
     return res;
     function advance() {
       lastTokenInfo = void 0;
-      const isStarted = scanner2.getStartPos() !== startPos;
+      const isStarted = scanner2.getTokenFullStart() !== startPos;
       if (isStarted) {
         wasNewLine = !!trailingTrivia && last(trailingTrivia).kind === 4 /* NewLineTrivia */;
       } else {
@@ -164849,7 +164900,7 @@ ${options.prefix}` : "\n" : options.prefix
       }
       leadingTrivia = void 0;
       trailingTrivia = void 0;
-      let pos = scanner2.getStartPos();
+      let pos = scanner2.getTokenFullStart();
       while (pos < endPos) {
         const t = scanner2.getToken();
         if (!isTrivia(t)) {
@@ -164858,13 +164909,13 @@ ${options.prefix}` : "\n" : options.prefix
         scanner2.scan();
         const item = {
           pos,
-          end: scanner2.getStartPos(),
+          end: scanner2.getTokenFullStart(),
           kind: t
         };
-        pos = scanner2.getStartPos();
+        pos = scanner2.getTokenFullStart();
         leadingTrivia = append(leadingTrivia, item);
       }
-      savedPos = scanner2.getStartPos();
+      savedPos = scanner2.getTokenFullStart();
     }
     function shouldRescanGreaterThanToken(node) {
       switch (node.kind) {
@@ -164910,28 +164961,28 @@ ${options.prefix}` : "\n" : options.prefix
       if (lastTokenInfo && expectedScanAction === lastScanAction) {
         return fixTokenKind(lastTokenInfo, n);
       }
-      if (scanner2.getStartPos() !== savedPos) {
+      if (scanner2.getTokenFullStart() !== savedPos) {
         Debug.assert(lastTokenInfo !== void 0);
-        scanner2.setTextPos(savedPos);
+        scanner2.resetTokenState(savedPos);
         scanner2.scan();
       }
       let currentToken = getNextToken(n, expectedScanAction);
       const token = createTextRangeWithKind(
-        scanner2.getStartPos(),
-        scanner2.getTextPos(),
+        scanner2.getTokenFullStart(),
+        scanner2.getTokenEnd(),
         currentToken
       );
       if (trailingTrivia) {
         trailingTrivia = void 0;
       }
-      while (scanner2.getStartPos() < endPos) {
+      while (scanner2.getTokenFullStart() < endPos) {
         currentToken = scanner2.scan();
         if (!isTrivia(currentToken)) {
           break;
         }
         const trivia = createTextRangeWithKind(
-          scanner2.getStartPos(),
-          scanner2.getTextPos(),
+          scanner2.getTokenFullStart(),
+          scanner2.getTokenEnd(),
           currentToken
         );
         if (!trailingTrivia) {
@@ -164996,7 +165047,7 @@ ${options.prefix}` : "\n" : options.prefix
     }
     function readEOFTokenRange() {
       Debug.assert(isOnEOF());
-      return createTextRangeWithKind(scanner2.getStartPos(), scanner2.getTextPos(), 1 /* EndOfFileToken */);
+      return createTextRangeWithKind(scanner2.getTokenFullStart(), scanner2.getTokenEnd(), 1 /* EndOfFileToken */);
     }
     function isOnToken() {
       const current = lastTokenInfo ? lastTokenInfo.token.kind : scanner2.getToken();
@@ -165013,8 +165064,8 @@ ${options.prefix}` : "\n" : options.prefix
       return tokenInfo;
     }
     function skipToEndOf(node) {
-      scanner2.setTextPos(node.end);
-      savedPos = scanner2.getStartPos();
+      scanner2.resetTokenState(node.end);
+      savedPos = scanner2.getTokenFullStart();
       lastScanAction = void 0;
       lastTokenInfo = void 0;
       wasNewLine = false;
@@ -165022,8 +165073,8 @@ ${options.prefix}` : "\n" : options.prefix
       trailingTrivia = void 0;
     }
     function skipToStartOf(node) {
-      scanner2.setTextPos(node.pos);
-      savedPos = scanner2.getStartPos();
+      scanner2.resetTokenState(node.pos);
+      savedPos = scanner2.getTokenFullStart();
       lastScanAction = void 0;
       lastTokenInfo = void 0;
       wasNewLine = false;
@@ -166139,7 +166190,7 @@ ${options.prefix}` : "\n" : options.prefix
         }
       }
     }
-    if (previousRange && formattingScanner.getStartPos() >= originalRange.end) {
+    if (previousRange && formattingScanner.getTokenFullStart() >= originalRange.end) {
       const tokenInfo = formattingScanner.isOnEOF() ? formattingScanner.readEOFTokenRange() : formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(enclosingNode).token : void 0;
       if (tokenInfo && tokenInfo.pos === previousRangeTriviaEnd) {
         const parent2 = ((_a2 = findPrecedingToken(tokenInfo.end, sourceFile, enclosingNode)) == null ? void 0 : _a2.parent) || previousParent;
@@ -166317,7 +166368,7 @@ ${options.prefix}` : "\n" : options.prefix
           processChildNodes(nodes, node, nodeStartLine, nodeDynamicIndentation);
         }
       );
-      while (formattingScanner.isOnToken() && formattingScanner.getStartPos() < originalRange.end) {
+      while (formattingScanner.isOnToken() && formattingScanner.getTokenFullStart() < originalRange.end) {
         const tokenInfo = formattingScanner.readTokenInfo(node);
         if (tokenInfo.token.end > Math.min(node.end, originalRange.end)) {
           break;
@@ -166351,7 +166402,7 @@ ${options.prefix}` : "\n" : options.prefix
         if (child.getFullWidth() === 0) {
           return inheritedIndentation;
         }
-        while (formattingScanner.isOnToken() && formattingScanner.getStartPos() < originalRange.end) {
+        while (formattingScanner.isOnToken() && formattingScanner.getTokenFullStart() < originalRange.end) {
           const tokenInfo = formattingScanner.readTokenInfo(node);
           if (tokenInfo.token.end > originalRange.end) {
             return inheritedIndentation;
@@ -166364,7 +166415,7 @@ ${options.prefix}` : "\n" : options.prefix
           }
           consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, node);
         }
-        if (!formattingScanner.isOnToken() || formattingScanner.getStartPos() >= originalRange.end) {
+        if (!formattingScanner.isOnToken() || formattingScanner.getTokenFullStart() >= originalRange.end) {
           return inheritedIndentation;
         }
         if (isToken(child)) {
@@ -166397,7 +166448,7 @@ ${options.prefix}` : "\n" : options.prefix
           return;
         }
         if (listStartToken !== 0 /* Unknown */) {
-          while (formattingScanner.isOnToken() && formattingScanner.getStartPos() < originalRange.end) {
+          while (formattingScanner.isOnToken() && formattingScanner.getTokenFullStart() < originalRange.end) {
             const tokenInfo = formattingScanner.readTokenInfo(parent2);
             if (tokenInfo.token.end > nodes.pos) {
               break;
@@ -166434,7 +166485,7 @@ ${options.prefix}` : "\n" : options.prefix
           );
         }
         const listEndToken = getCloseTokenForOpenToken(listStartToken);
-        if (listEndToken !== 0 /* Unknown */ && formattingScanner.isOnToken() && formattingScanner.getStartPos() < originalRange.end) {
+        if (listEndToken !== 0 /* Unknown */ && formattingScanner.isOnToken() && formattingScanner.getTokenFullStart() < originalRange.end) {
           let tokenInfo = formattingScanner.readTokenInfo(parent2);
           if (tokenInfo.token.kind === 27 /* CommaToken */) {
             consumeTokenAndAdvanceScanner(tokenInfo, parent2, listDynamicIndentation, parent2);
@@ -178559,7 +178610,6 @@ ${e.message}`;
     ContextFlags: () => ContextFlags,
     CoreServicesShimHostAdapter: () => CoreServicesShimHostAdapter,
     Debug: () => Debug,
-    DeprecationVersion: () => DeprecationVersion,
     DiagnosticCategory: () => DiagnosticCategory,
     Diagnostics: () => Diagnostics,
     DocumentHighlights: () => DocumentHighlights,
@@ -180917,7 +180967,6 @@ ${e.message}`;
     ContextFlags: () => ContextFlags,
     CoreServicesShimHostAdapter: () => CoreServicesShimHostAdapter,
     Debug: () => Debug,
-    DeprecationVersion: () => DeprecationVersion,
     DiagnosticCategory: () => DiagnosticCategory,
     Diagnostics: () => Diagnostics,
     DocumentHighlights: () => DocumentHighlights,