@typescript-deploys/pr-build 5.2.0-pr-54536-13 → 5.2.0-pr-54281-18

package/lib/tsserver.js

@@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230605`;
+var version = `${versionMajorMinor}.0-insiders.20230607`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9494,6 +9494,8 @@ var Diagnostics = {
   Class_constructor_may_not_be_a_generator: diag(1368, 1 /* Error */, "Class_constructor_may_not_be_a_generator_1368", "Class constructor may not be a generator."),
   Did_you_mean_0: diag(1369, 3 /* Message */, "Did_you_mean_0_1369", "Did you mean '{0}'?"),
   This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set_to_error: diag(1371, 1 /* Error */, "This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set__1371", "This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'."),
+  Convert_to_type_only_import: diag(1373, 3 /* Message */, "Convert_to_type_only_import_1373", "Convert to type-only import"),
+  Convert_all_imports_not_used_as_a_value_to_type_only_imports: diag(1374, 3 /* Message */, "Convert_all_imports_not_used_as_a_value_to_type_only_imports_1374", "Convert all imports not used as a value to type-only imports"),
   await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_file_has_no_imports_or_exports_Consider_adding_an_empty_export_to_make_this_file_a_module: diag(1375, 1 /* Error */, "await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_fi_1375", "'await' expressions are only allowed at the top level of a file when that file is a module, but this file has no imports or exports. Consider adding an empty 'export {}' to make this file a module."),
   _0_was_imported_here: diag(1376, 3 /* Message */, "_0_was_imported_here_1376", "'{0}' was imported here."),
   _0_was_exported_here: diag(1377, 3 /* Message */, "_0_was_exported_here_1377", "'{0}' was exported here."),
@@ -10699,8 +10701,6 @@ var Diagnostics = {
   Resolved_under_condition_0: diag(6414, 3 /* Message */, "Resolved_under_condition_0_6414", "Resolved under condition '{0}'."),
   Failed_to_resolve_under_condition_0: diag(6415, 3 /* Message */, "Failed_to_resolve_under_condition_0_6415", "Failed to resolve under condition '{0}'."),
   Exiting_conditional_exports: diag(6416, 3 /* Message */, "Exiting_conditional_exports_6416", "Exiting conditional exports."),
-  Searching_all_ancestor_node_modules_directories_for_preferred_extensions_Colon_0: diag(6417, 3 /* Message */, "Searching_all_ancestor_node_modules_directories_for_preferred_extensions_Colon_0_6417", "Searching all ancestor node_modules directories for preferred extensions: {0}."),
-  Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0: diag(6418, 3 /* Message */, "Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0_6418", "Searching all ancestor node_modules directories for fallback extensions: {0}."),
   The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, 3 /* Message */, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
   The_expected_type_comes_from_this_index_signature: diag(6501, 3 /* Message */, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
   The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, 3 /* Message */, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
@@ -11213,9 +11213,9 @@ var Diagnostics = {
   Convert_all_typedef_to_TypeScript_types: diag(95177, 3 /* Message */, "Convert_all_typedef_to_TypeScript_types_95177", "Convert all typedef to TypeScript types."),
   Move_to_file: diag(95178, 3 /* Message */, "Move_to_file_95178", "Move to file"),
   Cannot_move_to_file_selected_file_is_invalid: diag(95179, 3 /* Message */, "Cannot_move_to_file_selected_file_is_invalid_95179", "Cannot move to file, selected file is invalid"),
-  Use_import_type: diag(95180, 3 /* Message */, "Use_import_type_95180", "Use 'import type'"),
-  Use_type_0: diag(95181, 3 /* Message */, "Use_type_0_95181", "Use 'type {0}'"),
-  Fix_all_with_type_only_imports: diag(95182, 3 /* Message */, "Fix_all_with_type_only_imports_95182", "Fix all with type-only imports"),
+  Inline_variable: diag(95180, 3 /* Message */, "Inline_variable_95180", "Inline variable"),
+  Could_not_find_variable_to_inline: diag(95181, 3 /* Message */, "Could_not_find_variable_to_inline_95181", "Could not find variable to inline."),
+  Variables_that_share_a_name_with_a_type_or_namespace_in_the_same_scope_cannot_be_inlined: diag(95182, 3 /* Message */, "Variables_that_share_a_name_with_a_type_or_namespace_in_the_same_scope_cannot_be_inlined_95182", "Variables that share a name with a type or namespace in the same scope cannot be inlined."),
   No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
   Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
   JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -43083,13 +43083,11 @@ function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName,
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   if (priorityExtensions) {
-    traceIfEnabled(state, Diagnostics.Searching_all_ancestor_node_modules_directories_for_preferred_extensions_Colon_0, formatExtensions(priorityExtensions));
     const result = lookup(priorityExtensions);
     if (result)
       return result;
   }
   if (secondaryExtensions && !typesScopeOnly) {
-    traceIfEnabled(state, Diagnostics.Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0, formatExtensions(secondaryExtensions));
     return lookup(secondaryExtensions);
   }
   function lookup(extensions2) {
@@ -47309,11 +47307,10 @@ var CheckMode = /* @__PURE__ */ ((CheckMode3) => {
   CheckMode3[CheckMode3["Inferential"] = 2] = "Inferential";
   CheckMode3[CheckMode3["SkipContextSensitive"] = 4] = "SkipContextSensitive";
   CheckMode3[CheckMode3["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
-  CheckMode3[CheckMode3["SkipAddingIntraExpressionSites"] = 16] = "SkipAddingIntraExpressionSites";
-  CheckMode3[CheckMode3["IsForSignatureHelp"] = 32] = "IsForSignatureHelp";
-  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 64] = "IsForStringLiteralArgumentCompletions";
-  CheckMode3[CheckMode3["RestBindingElement"] = 128] = "RestBindingElement";
-  CheckMode3[CheckMode3["TypeOnly"] = 256] = "TypeOnly";
+  CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
+  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
+  CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
+  CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
   return CheckMode3;
 })(CheckMode || {});
 var SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -47593,9 +47590,9 @@ function createTypeChecker(host) {
       candidatesOutArray,
       /*argumentCount*/
       void 0,
-      64 /* IsForStringLiteralArgumentCompletions */
+      32 /* IsForStringLiteralArgumentCompletions */
     )),
-    getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 32 /* IsForSignatureHelp */)),
+    getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
     getExpandedParameters,
     hasEffectiveRestParameter,
     containsArgumentsReference,
@@ -55550,7 +55547,7 @@ function createTypeChecker(host) {
     return type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */) ? "" + type.value : void 0;
   }
   function getTypeForBindingElement(declaration) {
-    const checkMode = declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
+    const checkMode = declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
     const parentType = getTypeForBindingElementParent(declaration.parent.parent, checkMode);
     return parentType && getBindingElementTypeFromParentType(declaration, parentType);
   }
@@ -57307,13 +57304,19 @@ function createTypeChecker(host) {
     if (getObjectFlags(type) & 4 /* Reference */) {
       const target = type.target;
       const typeArguments = getTypeArguments(type);
-      return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
+      if (length(target.typeParameters) === length(typeArguments)) {
+        const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
+        return needApparentType ? getApparentType(ref) : ref;
+      }
     } else if (type.flags & 2097152 /* Intersection */) {
       const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
       return types !== type.types ? getIntersectionType(types) : type;
     }
     return needApparentType ? getApparentType(type) : type;
   }
+  function getThisArgument(type) {
+    return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
+  }
   function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
     let mapper;
     let members;
@@ -58379,7 +58382,7 @@ function createTypeChecker(host) {
       return type.resolvedBaseConstraint;
     }
     const stack = [];
-    return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
+    return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
     function getImmediateBaseConstraint(t) {
       if (!t.immediateBaseConstraint) {
         if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -58471,18 +58474,18 @@ function createTypeChecker(host) {
       }
       if (isGenericTupleType(t)) {
         const newElements = map(getElementTypes(t), (v, i) => {
-          const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
-          return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
+          const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
+          return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
         });
         return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
       }
       return t;
     }
   }
-  function getApparentTypeOfIntersectionType(type, thisArgument) {
+  function getApparentTypeOfIntersectionType(type) {
     return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
       type,
-      thisArgument,
+      type,
       /*needApparentType*/
       true
     ));
@@ -58533,9 +58536,8 @@ function createTypeChecker(host) {
     return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
   }
   function getApparentType(type) {
-    const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
-    const objectFlags = getObjectFlags(t);
-    return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
+    const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
+    return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
   }
   function getReducedApparentType(type) {
     return getReducedType(getApparentType(getReducedType(type)));
@@ -65356,7 +65358,7 @@ function createTypeChecker(host) {
           return 3 /* Maybe */;
         }
         const c = target2;
-        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
+        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
           const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
           const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
           if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
@@ -69366,8 +69368,6 @@ function createTypeChecker(host) {
   }
   function isConstantReference(node) {
     switch (node.kind) {
-      case 110 /* ThisKeyword */:
-        return true;
       case 80 /* Identifier */:
         if (!isThisInTypeQuery(node)) {
           const symbol = getResolvedSymbol(node);
@@ -70442,7 +70442,7 @@ function createTypeChecker(host) {
     return type.flags & 2097152 /* Intersection */ ? some(type.types, isGenericTypeWithoutNullableConstraint) : !!(type.flags & 465829888 /* Instantiable */ && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304 /* Nullable */));
   }
   function hasContextualTypeWithNoGenericTypes(node, checkMode) {
-    const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 128 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
+    const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 64 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
       node,
       /*contextFlags*/
       void 0
@@ -71199,7 +71199,7 @@ function createTypeChecker(host) {
   function getContextualTypeForBindingElement(declaration, contextFlags) {
     const parent2 = declaration.parent.parent;
     const name = declaration.propertyName || declaration.name;
-    const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */);
+    const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */);
     if (!parentType || isBindingPattern(name) || isComputedNonLiteralName(name))
       return void 0;
     if (parent2.name.kind === 206 /* ArrayBindingPattern */) {
@@ -72248,9 +72248,7 @@ function createTypeChecker(host) {
         elementTypes.push(undefinedOrMissingType);
         elementFlags.push(2 /* Optional */);
       } else {
-        const shouldAddAsIntraExpressionInferenceSite = inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(e);
-        const elementCheckMode = (checkMode || 0 /* Normal */) | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
-        const type = checkExpressionForMutableLocation(e, elementCheckMode, forceTuple);
+        const type = checkExpressionForMutableLocation(e, checkMode, forceTuple);
         elementTypes.push(addOptionality(
           type,
           /*isProperty*/
@@ -72258,7 +72256,7 @@ function createTypeChecker(host) {
           hasOmittedExpression
         ));
         elementFlags.push(hasOmittedExpression ? 2 /* Optional */ : 1 /* Required */);
-        if (shouldAddAsIntraExpressionInferenceSite) {
+        if (inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(e)) {
           const inferenceContext = getInferenceContext(node);
           Debug.assert(inferenceContext);
           addIntraExpressionInferenceSite(inferenceContext, e, type);
@@ -72399,13 +72397,11 @@ function createTypeChecker(host) {
       let member = getSymbolOfDeclaration(memberDecl);
       const computedNameType = memberDecl.name && memberDecl.name.kind === 166 /* ComputedPropertyName */ ? checkComputedPropertyName(memberDecl.name) : void 0;
       if (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 303 /* ShorthandPropertyAssignment */ || isObjectLiteralMethod(memberDecl)) {
-        const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl);
-        const propCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
-        let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, propCheckMode) : (
+        let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : (
           // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring
           // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`.
           // we don't want to say "could not find 'a'".
-          memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, propCheckMode) : checkObjectLiteralMethod(memberDecl, propCheckMode)
+          memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) : checkObjectLiteralMethod(memberDecl, checkMode)
         );
         if (isInJavascript) {
           const jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -72449,7 +72445,7 @@ function createTypeChecker(host) {
         prop.links.target = member;
         member = prop;
         allPropertiesTable == null ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
-        if (shouldAddAsIntraExpressionInferenceSite) {
+        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl)) {
           const inferenceContext = getInferenceContext(node);
           Debug.assert(inferenceContext);
           const inferenceNode = memberDecl.kind === 302 /* PropertyAssignment */ ? memberDecl.initializer : memberDecl;
@@ -72622,9 +72618,7 @@ function createTypeChecker(host) {
     for (const attributeDecl of attributes.properties) {
       const member = attributeDecl.symbol;
       if (isJsxAttribute(attributeDecl)) {
-        const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(attributeDecl);
-        const attributeCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
-        const exprType = checkJsxAttribute(attributeDecl, attributeCheckMode);
+        const exprType = checkJsxAttribute(attributeDecl, checkMode);
         objectFlags |= getObjectFlags(exprType) & 458752 /* PropagatingFlags */;
         const attributeSymbol = createSymbol(4 /* Property */ | member.flags, member.escapedName);
         attributeSymbol.declarations = member.declarations;
@@ -72645,7 +72639,7 @@ function createTypeChecker(host) {
             addDeprecatedSuggestion(attributeDecl.name, prop.declarations, attributeDecl.name.escapedText);
           }
         }
-        if (shouldAddAsIntraExpressionInferenceSite) {
+        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(attributeDecl)) {
           const inferenceContext = getInferenceContext(attributes);
           Debug.assert(inferenceContext);
           const inferenceNode = attributeDecl.initializer.expression;
@@ -74263,7 +74257,7 @@ function createTypeChecker(host) {
     }
     for (let i = 0; i < argCount; i++) {
       const arg = args[i];
-      if (arg.kind !== 231 /* OmittedExpression */ && !(checkMode & 64 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
+      if (arg.kind !== 231 /* OmittedExpression */ && !(checkMode & 32 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -74876,12 +74870,12 @@ function createTypeChecker(host) {
     const args = getEffectiveCallArguments(node);
     const isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
     let argCheckMode = !isDecorator2 && !isSingleNonGenericCandidate && some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
-    argCheckMode |= checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
+    argCheckMode |= checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
     let candidatesForArgumentError;
     let candidateForArgumentArityError;
     let candidateForTypeArgumentError;
     let result;
-    const signatureHelpTrailingComma = !!(checkMode & 32 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
+    const signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
     if (candidates.length > 1) {
       result = chooseOverload(candidates, subtypeRelation, isSingleNonGenericCandidate, signatureHelpTrailingComma);
     }
@@ -75100,7 +75094,7 @@ function createTypeChecker(host) {
           continue;
         }
         if (argCheckMode) {
-          argCheckMode = checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
+          argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
           if (inferenceContext) {
             const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -78178,7 +78172,7 @@ function createTypeChecker(host) {
       case 36 /* ExclamationEqualsToken */:
       case 37 /* EqualsEqualsEqualsToken */:
       case 38 /* ExclamationEqualsEqualsToken */:
-        if (!(checkMode && checkMode & 256 /* TypeOnly */)) {
+        if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
           if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
             const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
             error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
@@ -78837,7 +78831,7 @@ function createTypeChecker(host) {
       }
     }
     const startInvocationCount = flowInvocationCount;
-    const type = checkExpression(node, 256 /* TypeOnly */);
+    const type = checkExpression(node, 128 /* TypeOnly */);
     if (flowInvocationCount !== startInvocationCount) {
       const cache = flowTypeCache || (flowTypeCache = []);
       cache[getNodeId(node)] = type;
@@ -81308,7 +81302,7 @@ function createTypeChecker(host) {
         checkComputedPropertyName(node.propertyName);
       }
       const parent2 = node.parent.parent;
-      const parentCheckMode = node.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
+      const parentCheckMode = node.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
       const parentType = getTypeForBindingElementParent(parent2, parentCheckMode);
       const name = node.propertyName || node.name;
       if (parentType && !isBindingPattern(name)) {
@@ -100230,7 +100224,7 @@ function transformJsx(context) {
           continue;
         }
         finishObjectLiteralIfNeeded();
-        expressions.push(Debug.checkDefined(visitNode(attr.expression, visitor, isExpression)));
+        expressions.push(attr.expression);
         continue;
       }
       properties.push(transformJsxAttributeToObjectLiteralElement(attr));
@@ -135645,8 +135639,8 @@ function getApplicableRefactors(context, includeInteractiveActions) {
     return context.cancellationToken && context.cancellationToken.isCancellationRequested() || !((_a = refactor.kinds) == null ? void 0 : _a.some((kind) => refactorKindBeginsWith(kind, context.kind))) ? void 0 : refactor.getAvailableActions(context, includeInteractiveActions);
   }));
 }
-function getEditsForRefactor(context, refactorName13, actionName2, interactiveRefactorArguments) {
-  const refactor = refactors.get(refactorName13);
+function getEditsForRefactor(context, refactorName14, actionName2, interactiveRefactorArguments) {
+  const refactor = refactors.get(refactorName14);
   return refactor && refactor.getEditsForAction(context, actionName2, interactiveRefactorArguments);
 }
 
@@ -136414,24 +136408,147 @@ function refactorKindBeginsWith(known, requested) {
   return known.substr(0, requested.length) === requested;
 }
 
+// src/services/refactors/inlineVariable.ts
+var refactorName4 = "Inline variable";
+var refactorDescription = getLocaleSpecificMessage(Diagnostics.Inline_variable);
+var inlineVariableAction = {
+  name: refactorName4,
+  description: refactorDescription,
+  kind: "refactor.inline.variable"
+};
+registerRefactor(refactorName4, {
+  kinds: [inlineVariableAction.kind],
+  getAvailableActions(context) {
+    const {
+      file,
+      program,
+      preferences,
+      startPosition,
+      triggerReason
+    } = context;
+    const info = getInliningInfo(file, startPosition, triggerReason === "invoked", program);
+    if (!info) {
+      return emptyArray;
+    }
+    if (ts_refactor_exports.isRefactorErrorInfo(info) && preferences.provideRefactorNotApplicableReason) {
+      return [{
+        name: refactorName4,
+        description: refactorDescription,
+        actions: [{
+          ...inlineVariableAction,
+          notApplicableReason: info.error
+        }]
+      }];
+    }
+    if (!ts_refactor_exports.isRefactorErrorInfo(info)) {
+      return [{
+        name: refactorName4,
+        description: refactorDescription,
+        actions: [inlineVariableAction]
+      }];
+    }
+    return emptyArray;
+  },
+  getEditsForAction(context, actionName2) {
+    Debug.assert(actionName2 === refactorName4, "Unexpected refactor invoked");
+    const { file, program, startPosition } = context;
+    const info = getInliningInfo(
+      file,
+      startPosition,
+      /*tryWithReferenceToken*/
+      true,
+      program
+    );
+    if (!info || ts_refactor_exports.isRefactorErrorInfo(info)) {
+      return void 0;
+    }
+    const { references, declaration, replacement } = info;
+    const edits = ts_textChanges_exports.ChangeTracker.with(context, (tracker) => {
+      for (const node of references) {
+        tracker.replaceNode(file, node, getReplacementExpression(node, replacement));
+      }
+      tracker.delete(file, declaration);
+    });
+    return { edits };
+  }
+});
+function getInliningInfo(file, startPosition, tryWithReferenceToken, program) {
+  var _a, _b;
+  const checker = program.getTypeChecker();
+  const token = getTokenAtPosition(file, startPosition);
+  const parent2 = token.parent;
+  if (isInitializedVariable(parent2) && isVariableDeclarationInVariableStatement(parent2) && isIdentifier(parent2.name)) {
+    if (((_a = parent2.symbol.declarations) == null ? void 0 : _a.length) !== 1) {
+      return { error: getLocaleSpecificMessage(Diagnostics.Variables_that_share_a_name_with_a_type_or_namespace_in_the_same_scope_cannot_be_inlined) };
+    }
+    if (findAncestor(parent2, (node) => canHaveModifiers(node) && some(node.modifiers, isExportModifier))) {
+      return void 0;
+    }
+    const references = getReferenceNodes(parent2, checker, file);
+    return references && { references, declaration: parent2, replacement: parent2.initializer };
+  }
+  if (tryWithReferenceToken && isIdentifier(token)) {
+    const definition = checker.resolveName(
+      token.text,
+      token,
+      111551 /* Value */,
+      /*excludeGlobals*/
+      false
+    );
+    if (((_b = definition == null ? void 0 : definition.declarations) == null ? void 0 : _b.length) !== 1) {
+      return { error: getLocaleSpecificMessage(Diagnostics.Variables_that_share_a_name_with_a_type_or_namespace_in_the_same_scope_cannot_be_inlined) };
+    }
+    const declaration = definition.declarations[0];
+    if (!isInitializedVariable(declaration) || !isVariableDeclarationInVariableStatement(declaration) || !isIdentifier(declaration.name)) {
+      return void 0;
+    }
+    const references = getReferenceNodes(declaration, checker, file);
+    return references && { references, declaration, replacement: declaration.initializer };
+  }
+  return { error: getLocaleSpecificMessage(Diagnostics.Could_not_find_variable_to_inline) };
+}
+function getReferenceNodes(declaration, checker, file) {
+  const references = [];
+  const cannotInline = ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(declaration.name, checker, file, (ref) => {
+    if (ts_FindAllReferences_exports.isWriteAccessForReference(ref)) {
+      return true;
+    }
+    if (isTypeQueryNode(ref.parent)) {
+      return true;
+    }
+    if (findAncestor(ref, (node) => node === declaration.initializer)) {
+      return true;
+    }
+    references.push(ref);
+  });
+  return references.length === 0 || cannotInline ? void 0 : references;
+}
+function getReplacementExpression(reference, replacement) {
+  const { parent: parent2 } = reference;
+  if (isExpression(parent2) && (getExpressionPrecedence(replacement) < getExpressionPrecedence(parent2) || needsParentheses(parent2))) {
+    return factory.createParenthesizedExpression(replacement);
+  }
+  return replacement;
+}
+
 // src/services/refactors/moveToNewFile.ts
-var refactorName4 = "Move to a new file";
+var refactorName5 = "Move to a new file";
 var description = getLocaleSpecificMessage(Diagnostics.Move_to_a_new_file);
 var moveToNewFileAction = {
-  name: refactorName4,
+  name: refactorName5,
   description,
   kind: "refactor.move.newFile"
 };
-registerRefactor(refactorName4, {
+registerRefactor(refactorName5, {
   kinds: [moveToNewFileAction.kind],
   getAvailableActions: function getRefactorActionsToMoveToNewFile(context) {
     const statements = getStatementsToMove(context);
     if (context.preferences.allowTextChangesInNewFiles && statements) {
-      return [{ name: refactorName4, description, actions: [moveToNewFileAction] }];
+      return [{ name: refactorName5, description, actions: [moveToNewFileAction] }];
     }
     if (context.preferences.provideRefactorNotApplicableReason) {
       return [{
-        name: refactorName4,
+        name: refactorName5,
         description,
         actions: [{ ...moveToNewFileAction, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_statement_or_statements) }]
       }];
@@ -136439,7 +136556,7 @@ registerRefactor(refactorName4, {
     return emptyArray;
   },
   getEditsForAction: function getRefactorEditsToMoveToNewFile(context, actionName2) {
-    Debug.assert(actionName2 === refactorName4, "Wrong refactor invoked");
+    Debug.assert(actionName2 === refactorName5, "Wrong refactor invoked");
     const statements = Debug.checkDefined(getStatementsToMove(context));
     const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange3(context.file, context.program, statements, t, context.host, context.preferences, context));
     return { edits, renameFilename: void 0, renameLocation: void 0 };
@@ -137416,14 +137533,14 @@ function getOverloadRangeToMove(sourceFile, statement) {
 var ts_refactor_addOrRemoveBracesToArrowFunction_exports = {};
 
 // src/services/refactors/convertOverloadListToSingleSignature.ts
-var refactorName5 = "Convert overload list to single signature";
-var refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_overload_list_to_single_signature);
+var refactorName6 = "Convert overload list to single signature";
+var refactorDescription2 = getLocaleSpecificMessage(Diagnostics.Convert_overload_list_to_single_signature);
 var functionOverloadAction = {
-  name: refactorName5,
-  description: refactorDescription,
+  name: refactorName6,
+  description: refactorDescription2,
   kind: "refactor.rewrite.function.overloadList"
 };
-registerRefactor(refactorName5, {
+registerRefactor(refactorName6, {
   kinds: [functionOverloadAction.kind],
   getEditsForAction: getRefactorEditsToConvertOverloadsToOneSignature,
   getAvailableActions: getRefactorActionsToConvertOverloadsToOneSignature
@@ -137434,8 +137551,8 @@ function getRefactorActionsToConvertOverloadsToOneSignature(context) {
   if (!info)
     return emptyArray;
   return [{
-    name: refactorName5,
-    description: refactorDescription,
+    name: refactorName6,
+    description: refactorDescription2,
     actions: [functionOverloadAction]
   }];
 }
@@ -137628,8 +137745,8 @@ function getConvertableOverloadListAtPosition(file, startPosition, program) {
 }
 
 // src/services/refactors/addOrRemoveBracesToArrowFunction.ts
-var refactorName6 = "Add or remove braces in an arrow function";
-var refactorDescription2 = getLocaleSpecificMessage(Diagnostics.Add_or_remove_braces_in_an_arrow_function);
+var refactorName7 = "Add or remove braces in an arrow function";
+var refactorDescription3 = getLocaleSpecificMessage(Diagnostics.Add_or_remove_braces_in_an_arrow_function);
 var addBracesAction = {
   name: "Add braces to arrow function",
   description: getLocaleSpecificMessage(Diagnostics.Add_braces_to_arrow_function),
@@ -137640,7 +137757,7 @@ var removeBracesAction = {
   description: getLocaleSpecificMessage(Diagnostics.Remove_braces_from_arrow_function),
   kind: "refactor.rewrite.arrow.braces.remove"
 };
-registerRefactor(refactorName6, {
+registerRefactor(refactorName7, {
   kinds: [removeBracesAction.kind],
   getEditsForAction: getRefactorEditsToRemoveFunctionBraces,
   getAvailableActions: getRefactorActionsToRemoveFunctionBraces
@@ -137652,8 +137769,8 @@ function getRefactorActionsToRemoveFunctionBraces(context) {
     return emptyArray;
   if (!isRefactorErrorInfo(info)) {
     return [{
-      name: refactorName6,
-      description: refactorDescription2,
+      name: refactorName7,
+      description: refactorDescription3,
       actions: [
         info.addBraces ? addBracesAction : removeBracesAction
       ]
@@ -137661,8 +137778,8 @@ function getRefactorActionsToRemoveFunctionBraces(context) {
   }
   if (context.preferences.provideRefactorNotApplicableReason) {
     return [{
-      name: refactorName6,
-      description: refactorDescription2,
+      name: refactorName7,
+      description: refactorDescription3,
       actions: [
         { ...addBracesAction, notApplicableReason: info.error },
         { ...removeBracesAction, notApplicableReason: info.error }
@@ -137758,8 +137875,8 @@ function getConvertibleArrowFunctionAtPosition(file, startPosition, considerFunc
 var ts_refactor_convertArrowFunctionOrFunctionExpression_exports = {};
 
 // src/services/refactors/convertArrowFunctionOrFunctionExpression.ts
-var refactorName7 = "Convert arrow function or function expression";
-var refactorDescription3 = getLocaleSpecificMessage(Diagnostics.Convert_arrow_function_or_function_expression);
+var refactorName8 = "Convert arrow function or function expression";
+var refactorDescription4 = getLocaleSpecificMessage(Diagnostics.Convert_arrow_function_or_function_expression);
 var toAnonymousFunctionAction = {
   name: "Convert to anonymous function",
   description: getLocaleSpecificMessage(Diagnostics.Convert_to_anonymous_function),
@@ -137775,7 +137892,7 @@ var toArrowFunctionAction = {
   description: getLocaleSpecificMessage(Diagnostics.Convert_to_arrow_function),
   kind: "refactor.rewrite.function.arrow"
 };
-registerRefactor(refactorName7, {
+registerRefactor(refactorName8, {
   kinds: [
     toAnonymousFunctionAction.kind,
     toNamedFunctionAction.kind,
@@ -137817,8 +137934,8 @@ function getRefactorActionsToConvertFunctionExpressions(context) {
     }
   }
   return [{
-    name: refactorName7,
-    description: refactorDescription3,
+    name: refactorName8,
+    description: refactorDescription4,
     actions: possibleActions.length === 0 && context.preferences.provideRefactorNotApplicableReason ? errors : possibleActions
   }];
 }
@@ -137983,15 +138100,15 @@ function isFunctionReferencedInFile(sourceFile, typeChecker, node) {
 var ts_refactor_convertParamsToDestructuredObject_exports = {};
 
 // src/services/refactors/convertParamsToDestructuredObject.ts
-var refactorName8 = "Convert parameters to destructured object";
+var refactorName9 = "Convert parameters to destructured object";
 var minimumParameterLength = 1;
-var refactorDescription4 = getLocaleSpecificMessage(Diagnostics.Convert_parameters_to_destructured_object);
+var refactorDescription5 = getLocaleSpecificMessage(Diagnostics.Convert_parameters_to_destructured_object);
 var toDestructuredAction = {
-  name: refactorName8,
-  description: refactorDescription4,
+  name: refactorName9,
+  description: refactorDescription5,
   kind: "refactor.rewrite.parameters.toDestructured"
 };
-registerRefactor(refactorName8, {
+registerRefactor(refactorName9, {
   kinds: [toDestructuredAction.kind],
   getEditsForAction: getRefactorEditsToConvertParametersToDestructuredObject,
   getAvailableActions: getRefactorActionsToConvertParametersToDestructuredObject
@@ -138005,13 +138122,13 @@ function getRefactorActionsToConvertParametersToDestructuredObject(context) {
   if (!functionDeclaration)
     return emptyArray;
   return [{
-    name: refactorName8,
-    description: refactorDescription4,
+    name: refactorName9,
+    description: refactorDescription5,
     actions: [toDestructuredAction]
   }];
 }
 function getRefactorEditsToConvertParametersToDestructuredObject(context, actionName2) {
-  Debug.assert(actionName2 === refactorName8, "Unexpected action name");
+  Debug.assert(actionName2 === refactorName9, "Unexpected action name");
   const { file, startPosition, program, cancellationToken, host } = context;
   const functionDeclaration = getFunctionDeclarationAtPosition(file, startPosition, program.getTypeChecker());
   if (!functionDeclaration || !cancellationToken)
@@ -138526,14 +138643,14 @@ function getFunctionNames(functionDeclaration) {
 var ts_refactor_convertStringOrTemplateLiteral_exports = {};
 
 // src/services/refactors/convertStringOrTemplateLiteral.ts
-var refactorName9 = "Convert to template string";
-var refactorDescription5 = getLocaleSpecificMessage(Diagnostics.Convert_to_template_string);
+var refactorName10 = "Convert to template string";
+var refactorDescription6 = getLocaleSpecificMessage(Diagnostics.Convert_to_template_string);
 var convertStringAction = {
-  name: refactorName9,
-  description: refactorDescription5,
+  name: refactorName10,
+  description: refactorDescription6,
   kind: "refactor.rewrite.string"
 };
-registerRefactor(refactorName9, {
+registerRefactor(refactorName10, {
   kinds: [convertStringAction.kind],
   getEditsForAction: getRefactorEditsToConvertToTemplateString,
   getAvailableActions: getRefactorActionsToConvertToTemplateString
@@ -138542,7 +138659,7 @@ function getRefactorActionsToConvertToTemplateString(context) {
   const { file, startPosition } = context;
   const node = getNodeOrParentOfParentheses(file, startPosition);
   const maybeBinary = getParentBinaryExpression(node);
-  const refactorInfo = { name: refactorName9, description: refactorDescription5, actions: [] };
+  const refactorInfo = { name: refactorName10, description: refactorDescription6, actions: [] };
   if (isBinaryExpression(maybeBinary) && treeToArray(maybeBinary).isValidConcatenation) {
     refactorInfo.actions.push(convertStringAction);
     return [refactorInfo];
@@ -138568,7 +138685,7 @@ function getRefactorEditsToConvertToTemplateString(context, actionName2) {
   const { file, startPosition } = context;
   const node = getNodeOrParentOfParentheses(file, startPosition);
   switch (actionName2) {
-    case refactorDescription5:
+    case refactorDescription6:
       return { edits: getEditsForToTemplateLiteral(context, node) };
     default:
       return Debug.fail("invalid action");
@@ -138750,14 +138867,14 @@ function getExpressionFromParenthesesOrExpression(node) {
 var ts_refactor_convertToOptionalChainExpression_exports = {};
 
 // src/services/refactors/convertToOptionalChainExpression.ts
-var refactorName10 = "Convert to optional chain expression";
+var refactorName11 = "Convert to optional chain expression";
 var convertToOptionalChainExpressionMessage = getLocaleSpecificMessage(Diagnostics.Convert_to_optional_chain_expression);
 var toOptionalChainAction = {
-  name: refactorName10,
+  name: refactorName11,
   description: convertToOptionalChainExpressionMessage,
   kind: "refactor.rewrite.expression.optionalChain"
 };
-registerRefactor(refactorName10, {
+registerRefactor(refactorName11, {
   kinds: [toOptionalChainAction.kind],
   getEditsForAction: getRefactorEditsToConvertToOptionalChain,
   getAvailableActions: getRefactorActionsToConvertToOptionalChain
@@ -138768,14 +138885,14 @@ function getRefactorActionsToConvertToOptionalChain(context) {
     return emptyArray;
   if (!isRefactorErrorInfo(info)) {
     return [{
-      name: refactorName10,
+      name: refactorName11,
       description: convertToOptionalChainExpressionMessage,
       actions: [toOptionalChainAction]
     }];
   }
   if (context.preferences.provideRefactorNotApplicableReason) {
     return [{
-      name: refactorName10,
+      name: refactorName11,
       description: convertToOptionalChainExpressionMessage,
       actions: [{ ...toOptionalChainAction, notApplicableReason: info.error }]
     }];
@@ -138971,7 +139088,7 @@ __export(ts_refactor_extractSymbol_exports, {
 });
 
 // src/services/refactors/extractSymbol.ts
-var refactorName11 = "Extract Symbol";
+var refactorName12 = "Extract Symbol";
 var extractConstantAction = {
   name: "Extract Constant",
   description: getLocaleSpecificMessage(Diagnostics.Extract_constant),
@@ -138982,7 +139099,7 @@ var extractFunctionAction = {
   description: getLocaleSpecificMessage(Diagnostics.Extract_function),
   kind: "refactor.extract.function"
 };
-registerRefactor(refactorName11, {
+registerRefactor(refactorName12, {
   kinds: [
     extractConstantAction.kind,
     extractFunctionAction.kind
@@ -139001,14 +139118,14 @@ function getRefactorActionsToExtractSymbol(context) {
     const errors = [];
     if (refactorKindBeginsWith(extractFunctionAction.kind, requestedRefactor)) {
       errors.push({
-        name: refactorName11,
+        name: refactorName12,
         description: extractFunctionAction.description,
         actions: [{ ...extractFunctionAction, notApplicableReason: getStringError(rangeToExtract.errors) }]
       });
     }
     if (refactorKindBeginsWith(extractConstantAction.kind, requestedRefactor)) {
       errors.push({
-        name: refactorName11,
+        name: refactorName12,
         description: extractConstantAction.description,
         actions: [{ ...extractConstantAction, notApplicableReason: getStringError(rangeToExtract.errors) }]
       });
@@ -139072,26 +139189,26 @@ function getRefactorActionsToExtractSymbol(context) {
   const infos = [];
   if (functionActions.length) {
     infos.push({
-      name: refactorName11,
+      name: refactorName12,
       description: getLocaleSpecificMessage(Diagnostics.Extract_function),
       actions: functionActions
     });
   } else if (context.preferences.provideRefactorNotApplicableReason && innermostErrorFunctionAction) {
     infos.push({
-      name: refactorName11,
+      name: refactorName12,
       description: getLocaleSpecificMessage(Diagnostics.Extract_function),
       actions: [innermostErrorFunctionAction]
     });
   }
   if (constantActions.length) {
     infos.push({
-      name: refactorName11,
+      name: refactorName12,
       description: getLocaleSpecificMessage(Diagnostics.Extract_constant),
       actions: constantActions
     });
   } else if (context.preferences.provideRefactorNotApplicableReason && innermostErrorConstantAction) {
     infos.push({
-      name: refactorName11,
+      name: refactorName12,
       description: getLocaleSpecificMessage(Diagnostics.Extract_constant),
       actions: [innermostErrorConstantAction]
     });
@@ -140623,14 +140740,14 @@ registerRefactor(actionName, {
 var ts_refactor_inferFunctionReturnType_exports = {};
 
 // src/services/refactors/inferFunctionReturnType.ts
-var refactorName12 = "Infer function return type";
-var refactorDescription6 = getLocaleSpecificMessage(Diagnostics.Infer_function_return_type);
+var refactorName13 = "Infer function return type";
+var refactorDescription7 = getLocaleSpecificMessage(Diagnostics.Infer_function_return_type);
 var inferReturnTypeAction = {
-  name: refactorName12,
-  description: refactorDescription6,
+  name: refactorName13,
+  description: refactorDescription7,
   kind: "refactor.rewrite.function.returnType"
 };
-registerRefactor(refactorName12, {
+registerRefactor(refactorName13, {
   kinds: [inferReturnTypeAction.kind],
   getEditsForAction: getRefactorEditsToInferReturnType,
   getAvailableActions: getRefactorActionsToInferReturnType
@@ -140649,15 +140766,15 @@ function getRefactorActionsToInferReturnType(context) {
     return emptyArray;
   if (!isRefactorErrorInfo(info)) {
     return [{
-      name: refactorName12,
-      description: refactorDescription6,
+      name: refactorName13,
+      description: refactorDescription7,
       actions: [inferReturnTypeAction]
     }];
   }
   if (context.preferences.provideRefactorNotApplicableReason) {
     return [{
-      name: refactorName12,
-      description: refactorDescription6,
+      name: refactorName13,
+      description: refactorDescription7,
       actions: [{ ...inferReturnTypeAction, notApplicableReason: info.error }]
     }];
   }
@@ -142901,10 +143018,10 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     const newFileName = createNewFileName(sourceFile, program, getRefactorContext(sourceFile, positionOrRange, preferences, emptyOptions), host);
     return { newFileName, files };
   }
-  function getEditsForRefactor2(fileName, formatOptions, positionOrRange, refactorName13, actionName2, preferences = emptyOptions, interactiveRefactorArguments) {
+  function getEditsForRefactor2(fileName, formatOptions, positionOrRange, refactorName14, actionName2, preferences = emptyOptions, interactiveRefactorArguments) {
     synchronizeHostData();
     const file = getValidSourceFile(fileName);
-    return ts_refactor_exports.getEditsForRefactor(getRefactorContext(file, positionOrRange, preferences, formatOptions), refactorName13, actionName2, interactiveRefactorArguments);
+    return ts_refactor_exports.getEditsForRefactor(getRefactorContext(file, positionOrRange, preferences, formatOptions), refactorName14, actionName2, interactiveRefactorArguments);
   }
   function toLineColumnOffset(fileName, position) {
     if (position === 0) {
@@ -147608,41 +147725,19 @@ var fixId13 = "convertToTypeOnlyImport";
 registerCodeFix({
   errorCodes: errorCodes14,
   getCodeActions: function getCodeActionsToConvertToTypeOnlyImport(context) {
-    var _a;
     const declaration = getDeclaration2(context.sourceFile, context.span.start);
     if (declaration) {
       const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange11(t, context.sourceFile, declaration));
-      const importDeclarationChanges = declaration.kind === 275 /* ImportSpecifier */ && canConvertImportDeclarationForSpecifier(declaration, context.sourceFile, context.program) ? ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange11(t, context.sourceFile, declaration.parent.parent.parent)) : void 0;
-      const mainAction = createCodeFixAction(
-        fixId13,
-        changes,
-        declaration.kind === 275 /* ImportSpecifier */ ? [Diagnostics.Use_type_0, ((_a = declaration.propertyName) == null ? void 0 : _a.text) ?? declaration.name.text] : Diagnostics.Use_import_type,
-        fixId13,
-        Diagnostics.Fix_all_with_type_only_imports
-      );
-      if (some(importDeclarationChanges)) {
-        return [
-          createCodeFixActionWithoutFixAll(fixId13, importDeclarationChanges, Diagnostics.Use_import_type),
-          mainAction
-        ];
-      }
-      return [mainAction];
+      return [createCodeFixAction(fixId13, changes, Diagnostics.Convert_to_type_only_import, fixId13, Diagnostics.Convert_all_imports_not_used_as_a_value_to_type_only_imports)];
     }
     return void 0;
   },
   fixIds: [fixId13],
   getAllCodeActions: function getAllCodeActionsToConvertToTypeOnlyImport(context) {
-    const fixedImportDeclarations = /* @__PURE__ */ new Set();
     return codeFixAll(context, errorCodes14, (changes, diag2) => {
-      const errorDeclaration = getDeclaration2(diag2.file, diag2.start);
-      if ((errorDeclaration == null ? void 0 : errorDeclaration.kind) === 271 /* ImportDeclaration */ && !fixedImportDeclarations.has(errorDeclaration)) {
-        doChange11(changes, diag2.file, errorDeclaration);
-        fixedImportDeclarations.add(errorDeclaration);
-      } else if ((errorDeclaration == null ? void 0 : errorDeclaration.kind) === 275 /* ImportSpecifier */ && !fixedImportDeclarations.has(errorDeclaration.parent.parent.parent) && canConvertImportDeclarationForSpecifier(errorDeclaration, diag2.file, context.program)) {
-        doChange11(changes, diag2.file, errorDeclaration.parent.parent.parent);
-        fixedImportDeclarations.add(errorDeclaration.parent.parent.parent);
-      } else if ((errorDeclaration == null ? void 0 : errorDeclaration.kind) === 275 /* ImportSpecifier */) {
-        doChange11(changes, diag2.file, errorDeclaration);
+      const declaration = getDeclaration2(diag2.file, diag2.start);
+      if (declaration) {
+        doChange11(changes, diag2.file, declaration);
       }
     });
   }
@@ -147651,27 +147746,7 @@ function getDeclaration2(sourceFile, pos) {
   const { parent: parent2 } = getTokenAtPosition(sourceFile, pos);
   return isImportSpecifier(parent2) || isImportDeclaration(parent2) && parent2.importClause ? parent2 : void 0;
 }
-function canConvertImportDeclarationForSpecifier(specifier, sourceFile, program) {
-  if (specifier.parent.parent.name) {
-    return false;
-  }
-  const nonTypeOnlySpecifiers = specifier.parent.elements.filter((e) => !e.isTypeOnly);
-  if (nonTypeOnlySpecifiers.length === 1) {
-    return true;
-  }
-  const checker = program.getTypeChecker();
-  for (const specifier2 of nonTypeOnlySpecifiers) {
-    const isUsedAsValue = ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(specifier2.name, checker, sourceFile, (usage) => {
-      return !isValidTypeOnlyAliasUseSite(usage);
-    });
-    if (isUsedAsValue) {
-      return false;
-    }
-  }
-  return true;
-}
 function doChange11(changes, sourceFile, declaration) {
-  var _a;
   if (isImportSpecifier(declaration)) {
     changes.replaceNode(sourceFile, declaration, factory.updateImportSpecifier(
       declaration,
@@ -147742,16 +147817,6 @@ function doChange11(changes, sourceFile, declaration) {
         )
       ]);
     } else {
-      const newNamedBindings = ((_a = importClause.namedBindings) == null ? void 0 : _a.kind) === 274 /* NamedImports */ ? factory.updateNamedImports(
-        importClause.namedBindings,
-        sameMap(importClause.namedBindings.elements, (e) => factory.updateImportSpecifier(
-          e,
-          /*isTypeOnly*/
-          false,
-          e.propertyName,
-          e.name
-        ))
-      ) : importClause.namedBindings;
       const importDeclaration = factory.updateImportDeclaration(
         declaration,
         declaration.modifiers,
@@ -147760,7 +147825,7 @@ function doChange11(changes, sourceFile, declaration) {
           /*isTypeOnly*/
           true,
           importClause.name,
-          newNamedBindings
+          importClause.namedBindings
         ),
         declaration.moduleSpecifier,
         declaration.assertClause
@@ -151449,7 +151514,7 @@ registerCodeFix({
       actions2 = append(actions2, createCodeFixActionWithoutFixAll(fixId32, namespaceChanges, Diagnostics.Convert_named_imports_to_namespace_import));
     }
     if (typeOnlyChanges.length) {
-      actions2 = append(actions2, createCodeFixActionWithoutFixAll(fixId32, typeOnlyChanges, Diagnostics.Use_import_type));
+      actions2 = append(actions2, createCodeFixActionWithoutFixAll(fixId32, typeOnlyChanges, Diagnostics.Convert_to_type_only_import));
     }
     return actions2;
   },
@@ -159382,7 +159447,7 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, c
               }
               const keys = getOwnKeys(exports);
               const fragmentSubpath = components.join("/") + (components.length && hasTrailingDirectorySeparator(fragment) ? "/" : "");
-              const conditions = getConditions(compilerOptions, mode === 99 /* ESNext */);
+              const conditions = mode === 99 /* ESNext */ ? ["node", "import", "types"] : ["node", "require", "types"];
               addCompletionEntriesFromPathsOrExports(
                 result,
                 fragmentSubpath,
@@ -159631,6 +159696,7 @@ __export(ts_FindAllReferences_exports, {
   getTextSpanOfEntry: () => getTextSpanOfEntry,
   isContextWithStartAndEndNode: () => isContextWithStartAndEndNode,
   isDeclarationOfSymbol: () => isDeclarationOfSymbol,
+  isWriteAccessForReference: () => isWriteAccessForReference,
   nodeEntry: () => nodeEntry,
   toContextSpan: () => toContextSpan,
   toHighlightSpan: () => toHighlightSpan,
@@ -162743,29 +162809,13 @@ function provideInlayHints(context) {
     if (!signature || !candidates.length) {
       return;
     }
-    let signatureParamPos = 0;
-    for (const originalArg of args) {
+    for (let i = 0; i < args.length; ++i) {
+      const originalArg = args[i];
       const arg = skipParentheses(originalArg);
       if (shouldShowLiteralParameterNameHintsOnly(preferences) && !isHintableLiteral(arg)) {
         continue;
       }
-      let spreadArgs = 0;
-      if (isSpreadElement(arg)) {
-        const spreadType = checker.getTypeAtLocation(arg.expression);
-        if (checker.isTupleType(spreadType)) {
-          const { elementFlags, fixedLength } = spreadType.target;
-          if (fixedLength === 0) {
-            continue;
-          }
-          const firstOptionalIndex = findIndex(elementFlags, (f) => !(f & 1 /* Required */));
-          const requiredArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
-          if (requiredArgs > 0) {
-            spreadArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
-          }
-        }
-      }
-      const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, signatureParamPos);
-      signatureParamPos = signatureParamPos + (spreadArgs || 1);
+      const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, i);
       if (identifierNameInfo) {
         const [parameterName, isFirstVariadicArgument] = identifierNameInfo;
         const isParameterNameNotSameAsArgument = preferences.includeInlayParameterNameHintsWhenArgumentMatchesName || !identifierOrAccessExpressionPostfixMatchesParameterName(arg, parameterName);
@@ -172291,9 +172341,9 @@ function buildOverload(name) {
 
 // src/deprecatedCompat/5.0/identifierProperties.ts
 addObjectAllocatorPatcher((objectAllocator2) => {
-  const Identifier74 = objectAllocator2.getIdentifierConstructor();
-  if (!hasProperty(Identifier74.prototype, "originalKeywordKind")) {
-    Object.defineProperty(Identifier74.prototype, "originalKeywordKind", {
+  const Identifier75 = objectAllocator2.getIdentifierConstructor();
+  if (!hasProperty(Identifier75.prototype, "originalKeywordKind")) {
+    Object.defineProperty(Identifier75.prototype, "originalKeywordKind", {
       get: deprecate(function() {
         return identifierToKeywordKind(this);
       }, {
@@ -172305,8 +172355,8 @@ addObjectAllocatorPatcher((objectAllocator2) => {
       })
     });
   }
-  if (!hasProperty(Identifier74.prototype, "isInJSDocNamespace")) {
-    Object.defineProperty(Identifier74.prototype, "isInJSDocNamespace", {
+  if (!hasProperty(Identifier75.prototype, "isInJSDocNamespace")) {
+    Object.defineProperty(Identifier75.prototype, "isInJSDocNamespace", {
       get: deprecate(function() {
         return this.flags & 2048 /* IdentifierIsInJSDocNamespace */ ? true : void 0;
       }, {