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

package/lib/tsserver.js

@@ -62,7 +62,6 @@ __export(server_exports, {
   ContextFlags: () => ContextFlags,
   CoreServicesShimHostAdapter: () => CoreServicesShimHostAdapter,
   Debug: () => Debug,
-  DeprecationVersion: () => DeprecationVersion,
   DiagnosticCategory: () => DiagnosticCategory,
   Diagnostics: () => Diagnostics,
   DocumentHighlights: () => DocumentHighlights,
@@ -2286,7 +2285,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230306`;
+var version = `${versionMajorMinor}.0-insiders.20230308`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6843,6 +6842,7 @@ function diagnosticCategoryName(d, lowerCase = true) {
 }
 var 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";
@@ -7407,12 +7407,6 @@ var commentPragmas = {
     kind: 4 /* MultiLine */
   }
 };
-var DeprecationVersion = /* @__PURE__ */ ((DeprecationVersion2) => {
-  DeprecationVersion2["v5_0"] = "5.0";
-  DeprecationVersion2["v5_5"] = "5.5";
-  DeprecationVersion2["v6_0"] = "6.0";
-  return DeprecationVersion2;
-})(DeprecationVersion || {});
 
 // src/compiler/sys.ts
 function generateDjb2Hash(data) {
@@ -10316,12 +10310,14 @@ var Diagnostics = {
   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."),
@@ -11916,8 +11912,8 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   var text = textInitial;
   var pos;
   var end;
-  var startPos;
-  var tokenPos;
+  var fullStartPos;
+  var tokenStart;
   var token;
   var tokenValue;
   var tokenFlags;
@@ -11925,11 +11921,14 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   var inJSDocType = 0;
   setText(text, start2, 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,
@@ -11963,7 +11962,8 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     setScriptTarget,
     setLanguageVariant,
     setOnError,
-    setTextPos,
+    resetTokenState,
+    setTextPos: resetTokenState,
     setInJSDocType,
     tryScan,
     lookAhead,
@@ -11973,7 +11973,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     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());
       }
     });
   }
@@ -12496,11 +12496,11 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     }
   }
   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 */;
       }
@@ -12659,9 +12659,9 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             }
             commentDirectives = appendIfCommentDirective(
               commentDirectives,
-              text.slice(tokenPos, pos),
+              text.slice(tokenStart, pos),
               commentDirectiveRegExSingleLine,
-              tokenPos
+              tokenStart
             );
             if (skipTrivia2) {
               continue;
@@ -12675,7 +12675,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
               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 */) {
@@ -12953,7 +12953,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   }
   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 */);
@@ -12969,7 +12969,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       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();
       }
@@ -13000,12 +13000,12 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   }
   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) {
@@ -13038,7 +13038,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         p++;
       }
       pos = p;
-      tokenValue = text.substring(tokenPos, pos);
+      tokenValue = text.substring(tokenStart, pos);
       token = 13 /* RegularExpressionLiteral */;
     }
     return token;
@@ -13071,41 +13071,41 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   }
   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 */;
     }
@@ -13150,7 +13150,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       }
       pos++;
     }
-    tokenValue = text.substring(startPos, pos);
+    tokenValue = text.substring(fullStartPos, pos);
     return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
   }
   function scanJsxIdentifier() {
@@ -13184,7 +13184,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     return token;
   }
   function scanJsxAttributeValue() {
-    startPos = pos;
+    fullStartPos = pos;
     switch (text.charCodeAt(pos)) {
       case 34 /* doubleQuote */:
       case 39 /* singleQuote */:
@@ -13198,11 +13198,11 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     }
   }
   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 */;
@@ -13274,7 +13274,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       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();
       }
@@ -13285,16 +13285,16 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   }
   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;
@@ -13304,8 +13304,8 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   function scanRange(start3, 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;
@@ -13314,8 +13314,8 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     const result = callback();
     end = saveEnd;
     pos = savePos;
-    startPos = saveStartPos;
-    tokenPos = saveTokenPos;
+    fullStartPos = saveStartPos;
+    tokenStart = saveTokenPos;
     token = saveToken;
     tokenValue = saveTokenValue;
     tokenFlags = saveTokenFlags;
@@ -13345,7 +13345,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   function setText(newText, start3, length3) {
     text = newText || "";
     end = length3 === void 0 ? text.length : start3 + length3;
-    setTextPos(start3 || 0);
+    resetTokenState(start3 || 0);
   }
   function setOnError(errorCallback) {
     onError = errorCallback;
@@ -13356,11 +13356,11 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   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 */;
@@ -16112,8 +16112,8 @@ function getSpanOfTokenAtPosition(sourceFile, pos) {
     pos
   );
   scanner2.scan();
-  const start2 = scanner2.getTokenPos();
-  return createTextSpanFromBounds(start2, scanner2.getTextPos());
+  const start2 = scanner2.getTokenStart();
+  return createTextSpanFromBounds(start2, scanner2.getTokenEnd());
 }
 function scanTokenAtPosition(sourceFile, pos) {
   const scanner2 = createScanner(
@@ -16143,7 +16143,7 @@ function getErrorSpanForArrowFunction(sourceFile, node) {
 function getErrorSpanForNode(sourceFile, node) {
   let errorNode = node;
   switch (node.kind) {
-    case 308 /* SourceFile */:
+    case 308 /* SourceFile */: {
       const pos2 = skipTrivia(
         sourceFile.text,
         0,
@@ -16154,6 +16154,7 @@ function getErrorSpanForNode(sourceFile, node) {
         return createTextSpan(0, 0);
       }
       return getSpanOfTokenAtPosition(sourceFile, pos2);
+    }
     case 257 /* VariableDeclaration */:
     case 205 /* BindingElement */:
     case 260 /* ClassDeclaration */:
@@ -16176,10 +16177,16 @@ function getErrorSpanForNode(sourceFile, node) {
     case 216 /* ArrowFunction */:
       return getErrorSpanForArrowFunction(sourceFile, node);
     case 292 /* CaseClause */:
-    case 293 /* DefaultClause */:
+    case 293 /* DefaultClause */: {
       const start2 = skipTrivia(sourceFile.text, node.pos);
       const end = node.statements.length > 0 ? node.statements[0].pos : node.end;
       return createTextSpanFromBounds(start2, 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);
@@ -16266,6 +16273,7 @@ function isPartOfTypeNode(node) {
     case 153 /* SymbolKeyword */:
     case 149 /* ObjectKeyword */:
     case 155 /* UndefinedKeyword */:
+    case 104 /* NullKeyword */:
     case 144 /* NeverKeyword */:
       return true;
     case 114 /* VoidKeyword */:
@@ -20977,7 +20985,7 @@ function isValidBigIntString(s, roundTripOnly) {
     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));
@@ -30664,13 +30672,13 @@ var Parser;
       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) {
@@ -30858,7 +30866,7 @@ var Parser;
     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(start2, length2, message, arg0) {
     const lastError = lastOrUndefined(parseDiagnostics);
@@ -30877,10 +30885,10 @@ var Parser;
     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();
@@ -30897,7 +30905,7 @@ var Parser;
   }
   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();
   }
@@ -31010,7 +31018,7 @@ var Parser;
         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":
@@ -31165,11 +31173,11 @@ var Parser;
   }
   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;
     }
@@ -31181,7 +31189,7 @@ var Parser;
   }
   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);
     }
@@ -31567,7 +31575,7 @@ var Parser;
     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;
     }
@@ -31584,7 +31592,7 @@ var Parser;
     return node;
   }
   function consumeNode(node) {
-    scanner2.setTextPos(node.end);
+    scanner2.resetTokenState(node.end);
     nextToken();
     return node;
   }
@@ -31798,14 +31806,14 @@ var Parser;
         /*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;
         }
@@ -31817,7 +31825,7 @@ var Parser;
         if (considerSemicolonAsDelimiter && token() === 26 /* SemicolonToken */ && !scanner2.hasPrecedingLineBreak()) {
           nextToken();
         }
-        if (startPos === scanner2.getStartPos()) {
+        if (startPos === scanner2.getTokenFullStart()) {
           nextToken();
         }
         continue;
@@ -32646,7 +32654,7 @@ var Parser;
   }
   function parseImportTypeAssertions() {
     const pos = getNodePos();
-    const openBracePosition = scanner2.getTokenPos();
+    const openBracePosition = scanner2.getTokenStart();
     parseExpected(18 /* OpenBraceToken */);
     const multiLine = scanner2.hasPrecedingLineBreak();
     parseExpected(130 /* AssertKeyword */);
@@ -33320,7 +33328,7 @@ var Parser;
     }
   }
   function parsePossibleParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
-    const tokenPos = scanner2.getTokenPos();
+    const tokenPos = scanner2.getTokenStart();
     if (notParenthesizedArrow == null ? void 0 : notParenthesizedArrow.has(tokenPos)) {
       return void 0;
     }
@@ -34219,7 +34227,7 @@ var Parser;
   }
   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);
@@ -34279,7 +34287,7 @@ var Parser;
   }
   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(
@@ -34351,7 +34359,7 @@ var Parser;
   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();
@@ -34408,7 +34416,7 @@ var Parser;
     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);
@@ -34422,7 +34430,7 @@ var Parser;
     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);
@@ -34433,7 +34441,7 @@ var Parser;
     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);
@@ -34500,7 +34508,7 @@ var Parser;
     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);
@@ -35596,7 +35604,7 @@ var Parser;
   }
   function parseImportDeclarationOrImportEqualsDeclaration(pos, hasJSDoc, modifiers) {
     parseExpected(100 /* ImportKeyword */);
-    const afterImportPos = scanner2.getStartPos();
+    const afterImportPos = scanner2.getTokenFullStart();
     let identifier;
     if (isIdentifier2()) {
       identifier = parseIdentifier();
@@ -35640,7 +35648,7 @@ var Parser;
     if (!skipAssertKeyword) {
       parseExpected(130 /* AssertKeyword */);
     }
-    const openBracePosition = scanner2.getTokenPos();
+    const openBracePosition = scanner2.getTokenStart();
     if (parseExpected(18 /* OpenBraceToken */)) {
       const multiLine = scanner2.hasPrecedingLineBreak();
       const elements = parseDelimitedList(
@@ -35741,8 +35749,8 @@ var Parser;
   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;
@@ -35787,8 +35795,8 @@ var Parser;
     return finishNode(node, pos);
     function parseNameWithKeywordCheck() {
       checkIdentifierIsKeyword = isKeyword(token()) && !isIdentifier2();
-      checkIdentifierStart = scanner2.getTokenPos();
-      checkIdentifierEnd = scanner2.getTextPos();
+      checkIdentifierStart = scanner2.getTokenStart();
+      checkIdentifierEnd = scanner2.getTokenEnd();
       return parseIdentifierName();
     }
   }
@@ -36074,8 +36082,8 @@ var Parser;
                 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) {
@@ -36084,7 +36092,7 @@ var Parser;
                   parts.push(finishNode(factory2.createJSDocText(comments.join("")), linkEnd != null ? linkEnd : start2, commentEnd));
                   parts.push(link);
                   comments = [];
-                  linkEnd = scanner2.getTextPos();
+                  linkEnd = scanner2.getTokenEnd();
                   break;
                 }
               default:
@@ -36158,7 +36166,7 @@ var Parser;
       }
       function parseTag(margin) {
         Debug.assert(token() === 59 /* AtToken */);
-        const start3 = scanner2.getTokenPos();
+        const start3 = scanner2.getTokenStart();
         nextTokenJSDoc();
         const tagName = parseJSDocIdentifierName(
           /*message*/
@@ -36286,7 +36294,7 @@ var Parser;
                   comments2.push(scanner2.getTokenText());
                   break;
                 }
-                scanner2.setTextPos(scanner2.getTextPos() - 1);
+                scanner2.resetTokenState(scanner2.getTokenEnd() - 1);
               case 1 /* EndOfFileToken */:
                 break loop;
               case 5 /* WhitespaceTrivia */:
@@ -36302,14 +36310,14 @@ var Parser;
                 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());
                 }
@@ -36344,7 +36352,7 @@ var Parser;
           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("");
         }
@@ -36378,7 +36386,7 @@ var Parser;
           nextTokenJSDoc();
         }
         const create = linkType === "link" ? factory2.createJSDocLink : linkType === "linkcode" ? factory2.createJSDocLinkCode : factory2.createJSDocLinkPlain;
-        return finishNode(create(name, text.join("")), start3, scanner2.getTextPos());
+        return finishNode(create(name, text.join("")), start3, scanner2.getTokenEnd());
       }
       function parseJSDocLinkPrefix() {
         skipWhitespaceOrAsterisk();
@@ -36475,14 +36483,14 @@ var Parser;
       }
       function parseReturnTag(start3, 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(start3, getNodePos(), indent3, indentText)), start3);
       }
       function parseTypeTag(start3, 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*/
@@ -36505,10 +36513,10 @@ var Parser;
       function parseAuthorTag(start3, tagName, indent3, indentText) {
         const commentStart = getNodePos();
         const textOnly = parseAuthorNameAndEmail();
-        let commentEnd = scanner2.getStartPos();
+        let commentEnd = scanner2.getTokenFullStart();
         const comments2 = parseTrailingTagComments(start3, 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), start3);
@@ -36524,7 +36532,7 @@ var Parser;
             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());
@@ -36632,7 +36640,7 @@ var Parser;
         return finishNode(typedefTag, start3, end2);
       }
       function parseJSDocTypeNameWithNamespace(nested) {
-        const pos = scanner2.getTokenPos();
+        const start3 = scanner2.getTokenStart();
         if (!tokenIsIdentifierOrKeyword(token())) {
           return void 0;
         }
@@ -36649,7 +36657,7 @@ var Parser;
             body,
             nested ? 4 /* NestedNamespace */ : void 0
           );
-          return finishNode(jsDocNamespaceNode, pos);
+          return finishNode(jsDocNamespaceNode, start3);
         }
         if (nested) {
           typeNameOrNamespaceName.flags |= 2048 /* IdentifierIsInJSDocNamespace */;
@@ -36752,7 +36760,7 @@ var Parser;
       }
       function tryParseChildTag(target, indent3) {
         Debug.assert(token() === 59 /* AtToken */);
-        const start3 = scanner2.getStartPos();
+        const start3 = scanner2.getTokenFullStart();
         nextTokenJSDoc();
         const tagName = parseJSDocIdentifierName();
         skipWhitespace();
@@ -36852,11 +36860,11 @@ var Parser;
           );
         }
         identifierCount++;
-        const pos = scanner2.getTokenPos();
-        const end2 = scanner2.getTextPos();
+        const start3 = 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), start3, end2);
         nextTokenJSDoc();
         return result;
       }
@@ -43390,7 +43398,7 @@ function initFlowNode(node) {
   Debug.attachFlowNodeDebugInfo(node);
   return node;
 }
-var binder = createBinder();
+var binder = /* @__PURE__ */ createBinder();
 function bindSourceFile(file, options) {
   mark("beforeBind");
   perfLogger.logStartBindFile("" + file.fileName);
@@ -47507,7 +47515,10 @@ function createTypeChecker(host) {
     createIndexInfo,
     getAnyType: () => anyType,
     getStringType: () => stringType,
+    getStringLiteralType,
     getNumberType: () => numberType,
+    getNumberLiteralType,
+    getBigIntType: () => bigintType,
     createPromiseType,
     createArrayType,
     getElementTypeOfArrayType,
@@ -56914,9 +56925,14 @@ function createTypeChecker(host) {
     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);
       }
     }
   }
@@ -60839,12 +60855,15 @@ function createTypeChecker(host) {
   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;
@@ -64217,8 +64236,8 @@ function createTypeChecker(host) {
                 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);
                   }
@@ -71804,13 +71823,14 @@ function createTypeChecker(host) {
     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];
@@ -78981,7 +79001,7 @@ function createTypeChecker(host) {
     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);
@@ -117788,6 +117808,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   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;
@@ -120214,127 +120235,131 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       }
     }
   }
-  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;
@@ -120587,25 +120612,25 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       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));
       }
     }
   }
@@ -120624,13 +120649,13 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     }
     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;
@@ -128809,12 +128834,15 @@ function isStringOrRegularExpressionOrTemplateLiteral(kind) {
   }
   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 */;
@@ -130719,8 +130747,8 @@ function createClassifier() {
         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) {
@@ -131200,14 +131228,14 @@ function getEncodedSyntacticClassifications(cancellationToken, sourceFile, span)
     result.push(type);
   }
   function classifyLeadingTriviaAndGetTokenStart(token) {
-    triviaScanner.setTextPos(token.pos);
+    triviaScanner.resetTokenState(token.pos);
     while (true) {
-      const start2 = triviaScanner.getTextPos();
+      const start2 = triviaScanner.getTokenEnd();
       if (!couldStartTrivia(sourceFile.text, start2)) {
         return start2;
       }
       const kind = triviaScanner.scan();
-      const end = triviaScanner.getTextPos();
+      const end = triviaScanner.getTokenEnd();
       const width = end - start2;
       if (!isTrivia(kind)) {
         return start2;
@@ -131219,7 +131247,7 @@ function getEncodedSyntacticClassifications(cancellationToken, sourceFile, span)
         case 2 /* SingleLineCommentTrivia */:
         case 3 /* MultiLineCommentTrivia */:
           classifyComment(token, kind, start2, width);
-          triviaScanner.setTextPos(end);
+          triviaScanner.resetTokenState(end);
           continue;
         case 7 /* ConflictMarkerTrivia */:
           const text = sourceFile.text;
@@ -131418,15 +131446,15 @@ function getEncodedSyntacticClassifications(cancellationToken, sourceFile, span)
       }
     }
     pushClassification(start2, i - start2, 1 /* comment */);
-    mergeConflictScanner.setTextPos(i);
-    while (mergeConflictScanner.getTextPos() < end) {
+    mergeConflictScanner.resetTokenState(i);
+    while (mergeConflictScanner.getTokenEnd() < end) {
       classifyDisabledCodeToken();
     }
   }
   function classifyDisabledCodeToken() {
-    const start2 = mergeConflictScanner.getTextPos();
+    const start2 = mergeConflictScanner.getTokenEnd();
     const tokenKind = mergeConflictScanner.scan();
-    const end = mergeConflictScanner.getTextPos();
+    const end = mergeConflictScanner.getTokenEnd();
     const type = classifyTokenType(tokenKind);
     if (type) {
       pushClassification(start2, end - start2, type);
@@ -132778,7 +132806,7 @@ function preProcessFile(sourceText, readImportFiles = true, detectJavaScriptImpo
   }
   function getFileReference() {
     const fileName = scanner.getTokenValue();
-    const pos = scanner.getTokenPos();
+    const pos = scanner.getTokenStart();
     return { fileName, pos, end: pos + fileName.length };
   }
   function recordAmbientExternalModule() {
@@ -134531,10 +134559,10 @@ function createChildren(node, sourceFile) {
   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)) {
@@ -145106,7 +145134,7 @@ registerCodeFix({
         ];
       }
       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)) {
@@ -145239,6 +145267,24 @@ function deleteEntireVariableStatement(changes, sourceFile, node) {
 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;
@@ -150400,7 +150446,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
   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);
@@ -150420,13 +150466,13 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
           } : 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()) {
@@ -156547,7 +156593,7 @@ function isNewGroup(sourceFile, decl, scanner2) {
   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++;
@@ -158378,7 +158424,7 @@ function getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, p
   }
   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) {
@@ -158407,7 +158453,7 @@ function deleteUnusedOldImports(oldFile, toMove, changes, toDelete, checker) {
     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)
@@ -158423,12 +158469,12 @@ function updateImportsInOtherFiles(changes, program, host, oldFile, movedSymbols
         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);
       });
     }
   }
@@ -158445,7 +158491,7 @@ function getNamespaceLikeImport(node) {
       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 = [];
@@ -158468,12 +158514,12 @@ function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, 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(
@@ -158572,7 +158618,7 @@ function makeImportOrRequire(sourceFile, defaultImport, imports, newFileNameWith
       factory.createObjectBindingPattern(bindingElements),
       /*type*/
       void 0,
-      createRequireCall(factory.createStringLiteral(pathToNewFileWithCorrectExtension))
+      createRequireCall(makeStringLiteral(pathToNewFileWithCorrectExtension, quotePreference))
     ) : void 0;
   }
 }
@@ -165356,7 +165402,7 @@ var jsxScanner = createScanner(
 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;
@@ -165373,9 +165419,13 @@ function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
     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;
@@ -165383,7 +165433,7 @@ function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
   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 {
@@ -165391,7 +165441,7 @@ function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
     }
     leadingTrivia = void 0;
     trailingTrivia = void 0;
-    let pos = scanner2.getStartPos();
+    let pos = scanner2.getTokenFullStart();
     while (pos < endPos) {
       const t = scanner2.getToken();
       if (!isTrivia(t)) {
@@ -165400,13 +165450,13 @@ function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
       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) {
@@ -165452,28 +165502,28 @@ function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
     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) {
@@ -165538,7 +165588,7 @@ function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
   }
   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();
@@ -165555,8 +165605,8 @@ function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
     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;
@@ -165564,8 +165614,8 @@ function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
     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;
@@ -166640,7 +166690,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
       }
     }
   }
-  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;
@@ -166818,7 +166868,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
         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;
@@ -166852,7 +166902,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
       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;
@@ -166865,7 +166915,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
         }
         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, node);
       }
-      if (!formattingScanner.isOnToken() || formattingScanner.getStartPos() >= originalRange.end) {
+      if (!formattingScanner.isOnToken() || formattingScanner.getTokenFullStart() >= originalRange.end) {
         return inheritedIndentation;
       }
       if (isToken(child)) {
@@ -166898,7 +166948,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
         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;
@@ -166935,7 +166985,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
         );
       }
       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);
@@ -167951,7 +168001,6 @@ __export(ts_exports3, {
   ContextFlags: () => ContextFlags,
   CoreServicesShimHostAdapter: () => CoreServicesShimHostAdapter,
   Debug: () => Debug,
-  DeprecationVersion: () => DeprecationVersion,
   DiagnosticCategory: () => DiagnosticCategory,
   Diagnostics: () => Diagnostics,
   DocumentHighlights: () => DocumentHighlights,
@@ -181912,7 +181961,6 @@ start(initializeNodeSystem(), require("os").platform());
   ContextFlags,
   CoreServicesShimHostAdapter,
   Debug,
-  DeprecationVersion,
   DiagnosticCategory,
   Diagnostics,
   DocumentHighlights,