@typescript-deploys/pr-build 5.5.0-pr-57465-98 → 5.5.0-pr-57772-2

package/lib/tsserver.js

@@ -1760,6 +1760,7 @@ __export(server_exports, {
   isSuperProperty: () => isSuperProperty,
   isSupportedSourceFileName: () => isSupportedSourceFileName,
   isSwitchStatement: () => isSwitchStatement,
+  isSyntacticallyString: () => isSyntacticallyString,
   isSyntaxList: () => isSyntaxList,
   isSyntheticExpression: () => isSyntheticExpression,
   isSyntheticReference: () => isSyntheticReference,
@@ -2326,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-insiders.20240313`;
+var version = `${versionMajorMinor}.0-insiders.20240314`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9675,6 +9676,8 @@ var Diagnostics = {
   The_left_hand_side_of_a_for_in_statement_cannot_be_an_await_using_declaration: diag(1494, 1 /* Error */, "The_left_hand_side_of_a_for_in_statement_cannot_be_an_await_using_declaration_1494", "The left-hand side of a 'for...in' statement cannot be an 'await using' declaration."),
   _0_modifier_cannot_appear_on_an_await_using_declaration: diag(1495, 1 /* Error */, "_0_modifier_cannot_appear_on_an_await_using_declaration_1495", "'{0}' modifier cannot appear on an 'await using' declaration."),
   Identifier_string_literal_or_number_literal_expected: diag(1496, 1 /* Error */, "Identifier_string_literal_or_number_literal_expected_1496", "Identifier, string literal, or number literal expected."),
+  Expression_must_be_enclosed_in_parentheses_to_be_used_as_a_decorator: diag(1497, 1 /* Error */, "Expression_must_be_enclosed_in_parentheses_to_be_used_as_a_decorator_1497", "Expression must be enclosed in parentheses to be used as a decorator."),
+  Invalid_syntax_in_decorator: diag(1498, 1 /* Error */, "Invalid_syntax_in_decorator_1498", "Invalid syntax in decorator."),
   The_types_of_0_are_incompatible_between_these_types: diag(2200, 1 /* Error */, "The_types_of_0_are_incompatible_between_these_types_2200", "The types of '{0}' are incompatible between these types."),
   The_types_returned_by_0_are_incompatible_between_these_types: diag(2201, 1 /* Error */, "The_types_returned_by_0_are_incompatible_between_these_types_2201", "The types returned by '{0}' are incompatible between these types."),
   Call_signature_return_types_0_and_1_are_incompatible: diag(
@@ -11326,6 +11329,8 @@ var Diagnostics = {
   Add_optional_parameter_to_0: diag(95191, 3 /* Message */, "Add_optional_parameter_to_0_95191", "Add optional parameter to '{0}'"),
   Add_optional_parameters_to_0: diag(95192, 3 /* Message */, "Add_optional_parameters_to_0_95192", "Add optional parameters to '{0}'"),
   Add_all_optional_parameters: diag(95193, 3 /* Message */, "Add_all_optional_parameters_95193", "Add all optional parameters"),
+  Wrap_in_parentheses: diag(95194, 3 /* Message */, "Wrap_in_parentheses_95194", "Wrap in parentheses"),
+  Wrap_all_invalid_decorator_expressions_in_parentheses: diag(95195, 3 /* Message */, "Wrap_all_invalid_decorator_expressions_in_parentheses_95195", "Wrap all invalid decorator expressions in parentheses"),
   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?"),
@@ -21910,6 +21915,20 @@ function replaceFirstStar(s, replacement) {
 function getNameFromImportAttribute(node) {
   return isIdentifier(node.name) ? node.name.escapedText : escapeLeadingUnderscores(node.name.text);
 }
+function isSyntacticallyString(expr) {
+  expr = skipOuterExpressions(expr);
+  switch (expr.kind) {
+    case 226 /* BinaryExpression */:
+      const left = expr.left;
+      const right = expr.right;
+      return expr.operatorToken.kind === 40 /* PlusToken */ && (isSyntacticallyString(left) || isSyntacticallyString(right));
+    case 228 /* TemplateExpression */:
+    case 11 /* StringLiteral */:
+    case 15 /* NoSubstitutionTemplateLiteral */:
+      return true;
+  }
+  return false;
+}
 
 // src/compiler/factory/baseNodeFactory.ts
 function createBaseNodeFactory() {
@@ -44493,7 +44512,7 @@ function createBinder() {
       inAssignmentPattern = saveInAssignmentPattern;
       return;
     }
-    if (node.kind >= 243 /* FirstStatement */ && node.kind <= 259 /* LastStatement */ && (!options.allowUnreachableCode || node.kind === 253 /* ReturnStatement */)) {
+    if (node.kind >= 243 /* FirstStatement */ && node.kind <= 259 /* LastStatement */ && !options.allowUnreachableCode) {
       node.flowNode = currentFlow;
     }
     switch (node.kind) {
@@ -52521,6 +52540,18 @@ function createTypeChecker(host) {
   function createNodeBuilder() {
     return {
       typeToTypeNode: (type, enclosingDeclaration, flags, tracker) => withContext(enclosingDeclaration, flags, tracker, (context) => typeToTypeNodeHelper(type, context)),
+      expressionOrTypeToTypeNode: (type, expr, addUndefined, enclosingDeclaration, flags, tracker) => withContext(enclosingDeclaration, flags, tracker, (context) => expressionOrTypeToTypeNode(context, expr, type, addUndefined)),
+      serializeTypeForDeclaration: (type, symbol, addUndefined, enclosingDeclaration, flags, tracker) => withContext(enclosingDeclaration, flags, tracker, (context) => serializeTypeForDeclaration(
+        context,
+        type,
+        symbol,
+        enclosingDeclaration,
+        /*includePrivateSymbol*/
+        void 0,
+        /*bundled*/
+        void 0,
+        addUndefined
+      )),
       indexInfoToIndexSignatureDeclaration: (indexInfo, enclosingDeclaration, flags, tracker) => withContext(enclosingDeclaration, flags, tracker, (context) => indexInfoToIndexSignatureDeclarationHelper(
         indexInfo,
         context,
@@ -52542,6 +52573,47 @@ function createTypeChecker(host) {
       symbolTableToDeclarationStatements: (symbolTable, enclosingDeclaration, flags, tracker, bundled) => withContext(enclosingDeclaration, flags, tracker, (context) => symbolTableToDeclarationStatements(symbolTable, context, bundled)),
       symbolToNode: (symbol, meaning, enclosingDeclaration, flags, tracker) => withContext(enclosingDeclaration, flags, tracker, (context) => symbolToNode(symbol, context, meaning))
     };
+    function expressionOrTypeToTypeNode(context, expr, type, addUndefined) {
+      if (expr) {
+        const typeNode = isAssertionExpression(expr) ? expr.type : isJSDocTypeAssertion(expr) ? getJSDocTypeAssertionType(expr) : void 0;
+        if (typeNode && !isConstTypeReference(typeNode)) {
+          const result = tryReuseExistingTypeNode(context, typeNode, type, expr.parent, addUndefined);
+          if (result) {
+            return result;
+          }
+        }
+      }
+      if (addUndefined) {
+        type = getOptionalType(type);
+      }
+      return typeToTypeNodeHelper(type, context);
+    }
+    function tryReuseExistingTypeNode(context, typeNode, type, host2, addUndefined, includePrivateSymbol, bundled) {
+      const originalType = type;
+      if (addUndefined) {
+        type = getOptionalType(type);
+      }
+      const clone2 = tryReuseExistingNonParameterTypeNode(context, typeNode, type, host2, includePrivateSymbol, bundled);
+      if (clone2) {
+        return clone2;
+      }
+      if (addUndefined && originalType !== type) {
+        const cloneMissingUndefined = tryReuseExistingNonParameterTypeNode(context, typeNode, originalType, host2, includePrivateSymbol, bundled);
+        if (cloneMissingUndefined) {
+          return factory.createUnionTypeNode([cloneMissingUndefined, factory.createKeywordTypeNode(157 /* UndefinedKeyword */)]);
+        }
+      }
+      return void 0;
+    }
+    function tryReuseExistingNonParameterTypeNode(context, existing, type, host2 = context.enclosingDeclaration, includePrivateSymbol, bundled, annotationType) {
+      if (typeNodeIsEquivalentToType(existing, host2, type, annotationType) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
+        const result = serializeExistingTypeNode(context, existing, includePrivateSymbol, bundled);
+        if (result) {
+          return result;
+        }
+      }
+      return void 0;
+    }
     function symbolToNode(symbol, context, meaning) {
       if (context.flags & 1073741824 /* WriteComputedProps */) {
         if (symbol.valueDeclaration) {
@@ -52983,8 +53055,8 @@ function createTypeChecker(host) {
           if (isInstantiationExpressionType) {
             const instantiationExpressionType = type2;
             const existing = instantiationExpressionType.node;
-            if (isTypeQueryNode(existing) && getTypeFromTypeNode(existing) === type2) {
-              const typeNode = serializeExistingTypeNode(context, existing);
+            if (isTypeQueryNode(existing)) {
+              const typeNode = tryReuseExistingNonParameterTypeNode(context, existing, type2);
               if (typeNode) {
                 return typeNode;
               }
@@ -53787,11 +53859,9 @@ function createTypeChecker(host) {
     }
     function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags, privateSymbolVisitor, bundledImports) {
       const parameterDeclaration = getEffectiveParameterDeclaration(parameterSymbol);
-      let parameterType = getTypeOfSymbol(parameterSymbol);
-      if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
-        parameterType = getOptionalType(parameterType);
-      }
-      const parameterTypeNode = serializeTypeForDeclaration(context, parameterType, parameterSymbol, context.enclosingDeclaration, privateSymbolVisitor, bundledImports);
+      const parameterType = getTypeOfSymbol(parameterSymbol);
+      const addUndefined = parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration);
+      const parameterTypeNode = serializeTypeForDeclaration(context, parameterType, parameterSymbol, context.enclosingDeclaration, privateSymbolVisitor, bundledImports, addUndefined);
       const modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && canHaveModifiers(parameterDeclaration) ? map(getModifiers(parameterDeclaration), factory.cloneNode) : void 0;
       const isRest = parameterDeclaration && isRestParameter(parameterDeclaration) || getCheckFlags(parameterSymbol) & 32768 /* RestParameter */;
       const dotDotDotToken = isRest ? factory.createToken(26 /* DotDotDotToken */) : void 0;
@@ -54381,16 +54451,15 @@ function createTypeChecker(host) {
       }
       return enclosingDeclaration;
     }
-    function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
+    function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled, addUndefined) {
+      var _a;
       if (!isErrorType(type) && enclosingDeclaration) {
         const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration));
         if (declWithExistingAnnotation && !isFunctionLikeDeclaration(declWithExistingAnnotation) && !isGetAccessorDeclaration(declWithExistingAnnotation)) {
           const existing = getEffectiveTypeAnnotationNode(declWithExistingAnnotation);
-          if (typeNodeIsEquivalentToType(existing, declWithExistingAnnotation, type) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
-            const result2 = serializeExistingTypeNode(context, existing, includePrivateSymbol, bundled);
-            if (result2) {
-              return result2;
-            }
+          const result2 = tryReuseExistingTypeNode(context, existing, type, declWithExistingAnnotation, addUndefined, includePrivateSymbol, bundled);
+          if (result2) {
+            return result2;
           }
         }
       }
@@ -54398,16 +54467,17 @@ function createTypeChecker(host) {
       if (type.flags & 8192 /* UniqueESSymbol */ && type.symbol === symbol && (!context.enclosingDeclaration || some(symbol.declarations, (d) => getSourceFileOfNode(d) === getSourceFileOfNode(context.enclosingDeclaration)))) {
         context.flags |= 1048576 /* AllowUniqueESSymbolType */;
       }
-      const result = typeToTypeNodeHelper(type, context);
+      const decl = symbol.valueDeclaration || ((_a = symbol.declarations) == null ? void 0 : _a[0]);
+      const expr = decl && isDeclarationWithPossibleInnerTypeNodeReuse(decl) ? getPossibleTypeNodeReuseExpression(decl) : void 0;
+      const result = expressionOrTypeToTypeNode(context, expr, type, addUndefined);
       context.flags = oldFlags;
       return result;
     }
-    function typeNodeIsEquivalentToType(typeNode, annotatedDeclaration, type) {
-      const typeFromTypeNode = getTypeFromTypeNode(typeNode);
+    function typeNodeIsEquivalentToType(typeNode, annotatedDeclaration, type, typeFromTypeNode = getTypeFromTypeNode(typeNode)) {
       if (typeFromTypeNode === type) {
         return true;
       }
-      if (isParameter(annotatedDeclaration) && annotatedDeclaration.questionToken) {
+      if (annotatedDeclaration && (isParameter(annotatedDeclaration) || isPropertyDeclaration(annotatedDeclaration)) && annotatedDeclaration.questionToken) {
         return getTypeWithFacts(type, 524288 /* NEUndefined */) === typeFromTypeNode;
       }
       return false;
@@ -54419,11 +54489,9 @@ function createTypeChecker(host) {
         if (!!findAncestor(annotation, (n) => n === enclosingDeclarationIgnoringFakeScope) && annotation) {
           const annotated = getTypeFromTypeNode(annotation);
           const thisInstantiated = annotated.flags & 262144 /* TypeParameter */ && annotated.isThisType ? instantiateType(annotated, signature.mapper) : annotated;
-          if (thisInstantiated === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(annotation, type)) {
-            const result = serializeExistingTypeNode(context, annotation, includePrivateSymbol, bundled);
-            if (result) {
-              return result;
-            }
+          const result = tryReuseExistingNonParameterTypeNode(context, annotation, type, signature.declaration, includePrivateSymbol, bundled, thisInstantiated);
+          if (result) {
+            return result;
           }
         }
       }
@@ -54452,7 +54520,9 @@ function createTypeChecker(host) {
           /*shouldComputeAliasesToMakeVisible*/
           false
         ).accessibility !== 0 /* Accessible */) {
-          introducesError = true;
+          if (!isDeclarationName(node)) {
+            introducesError = true;
+          }
         } else {
           context.tracker.trackSymbol(sym, context.enclosingDeclaration, -1 /* All */);
           includePrivateSymbol == null ? void 0 : includePrivateSymbol(sym);
@@ -54590,6 +54660,31 @@ function createTypeChecker(host) {
             node.isTypeOf
           );
         }
+        if (isParameter(node)) {
+          if (!node.type && !node.initializer) {
+            return factory.updateParameterDeclaration(
+              node,
+              /*modifiers*/
+              void 0,
+              node.dotDotDotToken,
+              visitEachChild(
+                node.name,
+                visitExistingNodeTreeSymbols,
+                /*context*/
+                void 0
+              ),
+              node.questionToken,
+              factory.createKeywordTypeNode(133 /* AnyKeyword */),
+              /*initializer*/
+              void 0
+            );
+          }
+        }
+        if (isPropertySignature(node)) {
+          if (!node.type && !node.initializer) {
+            return factory.updatePropertySignature(node, node.modifiers, node.name, node.questionToken, factory.createKeywordTypeNode(133 /* AnyKeyword */));
+          }
+        }
         if (isEntityName(node) || isEntityNameExpression(node)) {
           const { introducesError, node: result } = trackExistingEntityName(node, context, includePrivateSymbol);
           hadError = hadError || introducesError;
@@ -54597,7 +54692,7 @@ function createTypeChecker(host) {
             return result;
           }
         }
-        if (file && isTupleTypeNode(node) && getLineAndCharacterOfPosition(file, node.pos).line === getLineAndCharacterOfPosition(file, node.end).line) {
+        if (file && isTupleTypeNode(node) && !nodeIsSynthesized(node) && getLineAndCharacterOfPosition(file, node.pos).line === getLineAndCharacterOfPosition(file, node.end).line) {
           setEmitFlags(node, 1 /* SingleLine */);
         }
         return visitEachChild(
@@ -55121,7 +55216,15 @@ function createTypeChecker(host) {
         context.flags |= 8388608 /* InTypeAlias */;
         const oldEnclosingDecl = context.enclosingDeclaration;
         context.enclosingDeclaration = jsdocAliasDecl;
-        const typeNode = jsdocAliasDecl && jsdocAliasDecl.typeExpression && isJSDocTypeExpression(jsdocAliasDecl.typeExpression) && serializeExistingTypeNode(context, jsdocAliasDecl.typeExpression.type, includePrivateSymbol, bundled) || typeToTypeNodeHelper(aliasType, context);
+        const typeNode = jsdocAliasDecl && jsdocAliasDecl.typeExpression && isJSDocTypeExpression(jsdocAliasDecl.typeExpression) && tryReuseExistingNonParameterTypeNode(
+          context,
+          jsdocAliasDecl.typeExpression.type,
+          aliasType,
+          /*host*/
+          void 0,
+          includePrivateSymbol,
+          bundled
+        ) || typeToTypeNodeHelper(aliasType, context);
         addResult(
           setSyntheticLeadingComments(
             factory.createTypeAliasDeclaration(
@@ -55354,7 +55457,15 @@ function createTypeChecker(host) {
           }
           return cleanup(factory.createExpressionWithTypeArguments(
             expr,
-            map(e.typeArguments, (a) => serializeExistingTypeNode(context, a, includePrivateSymbol, bundled) || typeToTypeNodeHelper(getTypeFromTypeNode(a), context))
+            map(e.typeArguments, (a) => tryReuseExistingNonParameterTypeNode(
+              context,
+              a,
+              getTypeFromTypeNode(a),
+              /*host*/
+              void 0,
+              includePrivateSymbol,
+              bundled
+            ) || typeToTypeNodeHelper(getTypeFromTypeNode(a), context))
           ));
           function cleanup(result2) {
             context.enclosingDeclaration = oldEnclosing;
@@ -55813,8 +55924,10 @@ function createTypeChecker(host) {
         }
       }
       function isTypeRepresentableAsFunctionNamespaceMerge(typeToSerialize, hostSymbol) {
+        var _a2;
         const ctxSrc = getSourceFileOfNode(context.enclosingDeclaration);
-        return getObjectFlags(typeToSerialize) & (16 /* Anonymous */ | 32 /* Mapped */) && !length(getIndexInfosOfType(typeToSerialize)) && !isClassInstanceSide(typeToSerialize) && // While a class instance is potentially representable as a NS, prefer printing a reference to the instance type and serializing the class
+        return getObjectFlags(typeToSerialize) & (16 /* Anonymous */ | 32 /* Mapped */) && !some((_a2 = typeToSerialize.symbol) == null ? void 0 : _a2.declarations, isTypeNode) && // If the type comes straight from a type node, we shouldn't try to break it up
+        !length(getIndexInfosOfType(typeToSerialize)) && !isClassInstanceSide(typeToSerialize) && // While a class instance is potentially representable as a NS, prefer printing a reference to the instance type and serializing the class
         !!(length(filter(getPropertiesOfType(typeToSerialize), isNamespaceMember)) || length(getSignaturesOfType(typeToSerialize, 0 /* Call */))) && !length(getSignaturesOfType(typeToSerialize, 1 /* Construct */)) && // TODO: could probably serialize as function + ns + class, now that that's OK
         !getDeclarationWithTypeAnnotation(hostSymbol, enclosingDeclaration) && !(typeToSerialize.symbol && some(typeToSerialize.symbol.declarations, (d) => getSourceFileOfNode(d) !== ctxSrc)) && !some(getPropertiesOfType(typeToSerialize), (p) => isLateBoundName(p.escapedName)) && !some(getPropertiesOfType(typeToSerialize), (p) => some(p.declarations, (d) => getSourceFileOfNode(d) !== ctxSrc)) && every(getPropertiesOfType(typeToSerialize), (p) => {
           if (!isIdentifierText(symbolName(p), languageVersion)) {
@@ -60393,15 +60506,7 @@ function createTypeChecker(host) {
             jsdocPredicate = getTypePredicateOfSignature(jsdocSignature);
           }
         }
-        if (type || jsdocPredicate) {
-          signature.resolvedTypePredicate = type && isTypePredicateNode(type) ? createTypePredicateFromTypePredicateNode(type, signature) : jsdocPredicate || noTypePredicate;
-        } else if (signature.declaration && isFunctionLikeDeclaration(signature.declaration) && (!signature.resolvedReturnType || signature.resolvedReturnType.flags & 16 /* Boolean */)) {
-          const { declaration } = signature;
-          signature.resolvedTypePredicate = noTypePredicate;
-          signature.resolvedTypePredicate = getTypePredicateFromBody(declaration) || noTypePredicate;
-        } else {
-          signature.resolvedTypePredicate = noTypePredicate;
-        }
+        signature.resolvedTypePredicate = type && isTypePredicateNode(type) ? createTypePredicateFromTypePredicateNode(type, signature) : jsdocPredicate || noTypePredicate;
       }
       Debug.assert(!!signature.resolvedTypePredicate);
     }
@@ -62351,7 +62456,7 @@ function createTypeChecker(host) {
       const typeVarIndex = typeSet[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
       const typeVariable = typeSet[typeVarIndex];
       const primitiveType = typeSet[1 - typeVarIndex];
-      if (typeVariable.flags & 8650752 /* TypeVariable */ && (primitiveType.flags & (402784252 /* Primitive */ | 67108864 /* NonPrimitive */) || includes & 16777216 /* IncludesEmptyObject */)) {
+      if (typeVariable.flags & 8650752 /* TypeVariable */ && (primitiveType.flags & (402784252 /* Primitive */ | 67108864 /* NonPrimitive */) && !isGenericStringLikeType(primitiveType) || includes & 16777216 /* IncludesEmptyObject */)) {
         const constraint = getBaseConstraintOfType(typeVariable);
         if (constraint && everyType(constraint, (t) => !!(t.flags & (402784252 /* Primitive */ | 67108864 /* NonPrimitive */)) || isEmptyAnonymousObjectType(t))) {
           if (isTypeStrictSubtypeOf(constraint, primitiveType)) {
@@ -62956,6 +63061,9 @@ function createTypeChecker(host) {
   function isPatternLiteralType(type) {
     return !!(type.flags & 134217728 /* TemplateLiteral */) && every(type.types, isPatternLiteralPlaceholderType) || !!(type.flags & 268435456 /* StringMapping */) && isPatternLiteralPlaceholderType(type.type);
   }
+  function isGenericStringLikeType(type) {
+    return !!(type.flags & (134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */)) && !isPatternLiteralType(type);
+  }
   function isGenericType(type) {
     return !!getGenericObjectFlags(type);
   }
@@ -62978,7 +63086,7 @@ function createTypeChecker(host) {
       }
       return type.objectFlags & 12582912 /* IsGenericType */;
     }
-    return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 8388608 /* IsGenericIndexType */ : 0);
+    return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */) || isGenericStringLikeType(type) ? 8388608 /* IsGenericIndexType */ : 0);
   }
   function getSimplifiedType(type, writing) {
     return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) : type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) : type;
@@ -76245,7 +76353,10 @@ function createTypeChecker(host) {
     return Debug.fail();
   }
   function getDecoratorArgumentCount(node, signature) {
-    return compilerOptions.experimentalDecorators ? getLegacyDecoratorArgumentCount(node, signature) : 2;
+    return compilerOptions.experimentalDecorators ? getLegacyDecoratorArgumentCount(node, signature) : (
+      // Allow the runtime to oversupply arguments to an ES decorator as long as there's at least one parameter.
+      Math.min(Math.max(getParameterCount(signature), 1), 2)
+    );
   }
   function getLegacyDecoratorArgumentCount(node, signature) {
     switch (node.parent.kind) {
@@ -78825,67 +78936,6 @@ function createTypeChecker(host) {
         return false;
     }
   }
-  function getTypePredicateFromBody(func) {
-    switch (func.kind) {
-      case 176 /* Constructor */:
-      case 177 /* GetAccessor */:
-      case 178 /* SetAccessor */:
-        return void 0;
-    }
-    const functionFlags = getFunctionFlags(func);
-    if (functionFlags !== 0 /* Normal */ || func.parameters.length === 0)
-      return void 0;
-    let singleReturn;
-    if (func.body && func.body.kind !== 241 /* Block */) {
-      singleReturn = func.body;
-    } else {
-      const bailedEarly = forEachReturnStatement(func.body, (returnStatement) => {
-        if (singleReturn || !returnStatement.expression)
-          return true;
-        singleReturn = returnStatement.expression;
-      });
-      if (bailedEarly || !singleReturn || functionHasImplicitReturn(func))
-        return void 0;
-    }
-    return checkIfExpressionRefinesAnyParameter(func, singleReturn);
-  }
-  function checkIfExpressionRefinesAnyParameter(func, expr) {
-    expr = skipParentheses(
-      expr,
-      /*excludeJSDocTypeAssertions*/
-      true
-    );
-    const returnType = checkExpressionCached(expr);
-    if (!(returnType.flags & 16 /* Boolean */))
-      return void 0;
-    return forEach(func.parameters, (param, i) => {
-      const initType = getTypeOfSymbol(param.symbol);
-      if (!initType || initType.flags & 16 /* Boolean */ || !isIdentifier(param.name) || isSymbolAssigned(param.symbol)) {
-        return;
-      }
-      const trueType2 = checkIfExpressionRefinesParameter(func, expr, param, initType);
-      if (trueType2) {
-        return createTypePredicate(1 /* Identifier */, unescapeLeadingUnderscores(param.name.escapedText), i, trueType2);
-      }
-    });
-  }
-  function checkIfExpressionRefinesParameter(func, expr, param, initType) {
-    const antecedent = expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || { flags: 2 /* Start */ };
-    const trueCondition = {
-      flags: 32 /* TrueCondition */,
-      node: expr,
-      antecedent
-    };
-    const trueType2 = getFlowTypeOfReference(param.name, initType, initType, func, trueCondition);
-    if (trueType2 === initType)
-      return void 0;
-    const falseCondition = {
-      ...trueCondition,
-      flags: 64 /* FalseCondition */
-    };
-    const falseSubtype = getFlowTypeOfReference(param.name, trueType2, trueType2, func, falseCondition);
-    return falseSubtype.flags & 131072 /* Never */ ? trueType2 : void 0;
-  }
   function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
     addLazyDiagnostic(checkAllCodePathsInNonVoidFunctionReturnOrThrowDiagnostics);
     return;
@@ -82166,7 +82216,56 @@ function createTypeChecker(host) {
       }
     }
   }
+  function checkGrammarDecorator(decorator) {
+    const sourceFile = getSourceFileOfNode(decorator);
+    if (!hasParseDiagnostics(sourceFile)) {
+      let node = decorator.expression;
+      if (isParenthesizedExpression(node)) {
+        return false;
+      }
+      let canHaveCallExpression = true;
+      let errorNode;
+      while (true) {
+        if (isExpressionWithTypeArguments(node) || isNonNullExpression(node)) {
+          node = node.expression;
+          continue;
+        }
+        if (isCallExpression(node)) {
+          if (!canHaveCallExpression) {
+            errorNode = node;
+          }
+          if (node.questionDotToken) {
+            errorNode = node.questionDotToken;
+          }
+          node = node.expression;
+          canHaveCallExpression = false;
+          continue;
+        }
+        if (isPropertyAccessExpression(node)) {
+          if (node.questionDotToken) {
+            errorNode = node.questionDotToken;
+          }
+          node = node.expression;
+          canHaveCallExpression = false;
+          continue;
+        }
+        if (!isIdentifier(node)) {
+          errorNode = node;
+        }
+        break;
+      }
+      if (errorNode) {
+        addRelatedInfo(
+          error2(decorator.expression, Diagnostics.Expression_must_be_enclosed_in_parentheses_to_be_used_as_a_decorator),
+          createDiagnosticForNode(errorNode, Diagnostics.Invalid_syntax_in_decorator)
+        );
+        return true;
+      }
+    }
+    return false;
+  }
   function checkDecorator(node) {
+    checkGrammarDecorator(node);
     const signature = getResolvedSignature(node);
     checkDeprecatedSignature(signature, node);
     const returnType = getReturnTypeOfSignature(signature);
@@ -87589,14 +87688,34 @@ function createTypeChecker(host) {
       return factory.createToken(133 /* AnyKeyword */);
     }
     const symbol = getSymbolOfDeclaration(declaration);
-    let type = symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */)) ? getWidenedLiteralType(getTypeOfSymbol(symbol)) : errorType;
-    if (type.flags & 8192 /* UniqueESSymbol */ && type.symbol === symbol) {
-      flags |= 1048576 /* AllowUniqueESSymbolType */;
-    }
-    if (addUndefined) {
-      type = getOptionalType(type);
+    const type = symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */)) ? getWidenedLiteralType(getTypeOfSymbol(symbol)) : errorType;
+    return nodeBuilder.serializeTypeForDeclaration(type, symbol, addUndefined, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
+  }
+  function isDeclarationWithPossibleInnerTypeNodeReuse(declaration) {
+    return isFunctionLike(declaration) || isExportAssignment(declaration) || isVariableLike(declaration);
+  }
+  function getPossibleTypeNodeReuseExpression(declaration) {
+    var _a;
+    return isFunctionLike(declaration) && !isSetAccessor(declaration) ? getSingleReturnExpression(declaration) : isExportAssignment(declaration) ? declaration.expression : !!declaration.initializer ? declaration.initializer : isParameter(declaration) && isSetAccessor(declaration.parent) ? getSingleReturnExpression(getAllAccessorDeclarations((_a = getSymbolOfDeclaration(declaration.parent)) == null ? void 0 : _a.declarations, declaration.parent).getAccessor) : void 0;
+  }
+  function getSingleReturnExpression(declaration) {
+    let candidateExpr;
+    if (declaration && !nodeIsMissing(declaration.body)) {
+      const body = declaration.body;
+      if (body && isBlock(body)) {
+        forEachReturnStatement(body, (s) => {
+          if (!candidateExpr) {
+            candidateExpr = s.expression;
+          } else {
+            candidateExpr = void 0;
+            return true;
+          }
+        });
+      } else {
+        candidateExpr = body;
+      }
     }
-    return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
+    return candidateExpr;
   }
   function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) {
     const signatureDeclaration = getParseTreeNode(signatureDeclarationIn, isFunctionLike);
@@ -87604,7 +87723,15 @@ function createTypeChecker(host) {
       return factory.createToken(133 /* AnyKeyword */);
     }
     const signature = getSignatureFromDeclaration(signatureDeclaration);
-    return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
+    return nodeBuilder.expressionOrTypeToTypeNode(
+      getReturnTypeOfSignature(signature),
+      getPossibleTypeNodeReuseExpression(signatureDeclaration),
+      /*addUndefined*/
+      void 0,
+      enclosingDeclaration,
+      flags | 1024 /* MultilineObjectLiterals */,
+      tracker
+    );
   }
   function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) {
     const expr = getParseTreeNode(exprIn, isExpression);
@@ -87612,7 +87739,15 @@ function createTypeChecker(host) {
       return factory.createToken(133 /* AnyKeyword */);
     }
     const type = getWidenedType(getRegularTypeOfExpression(expr));
-    return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
+    return nodeBuilder.expressionOrTypeToTypeNode(
+      type,
+      expr,
+      /*addUndefined*/
+      void 0,
+      enclosingDeclaration,
+      flags | 1024 /* MultilineObjectLiterals */,
+      tracker
+    );
   }
   function hasGlobalName(name) {
     return globals.has(escapeLeadingUnderscores(name));
@@ -94342,7 +94477,7 @@ function transformTypeScript(context) {
       ),
       valueExpression
     );
-    const outerAssignment = valueExpression.kind === 11 /* StringLiteral */ ? innerAssignment : factory2.createAssignment(
+    const outerAssignment = isSyntacticallyString(valueExpression) ? innerAssignment : factory2.createAssignment(
       factory2.createElementAccessExpression(
         currentNamespaceContainerName,
         innerAssignment
@@ -145703,22 +145838,22 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     }
     return [];
   }
-  function getCodeFixesAtPosition(fileName, start2, end, errorCodes65, formatOptions, preferences = emptyOptions) {
+  function getCodeFixesAtPosition(fileName, start2, end, errorCodes66, formatOptions, preferences = emptyOptions) {
     synchronizeHostData();
     const sourceFile = getValidSourceFile(fileName);
     const span = createTextSpanFromBounds(start2, end);
     const formatContext = ts_formatting_exports.getFormatContext(formatOptions, host);
-    return flatMap(deduplicate(errorCodes65, equateValues, compareValues), (errorCode) => {
+    return flatMap(deduplicate(errorCodes66, equateValues, compareValues), (errorCode) => {
       cancellationToken.throwIfCancellationRequested();
       return ts_codefix_exports.getFixes({ errorCode, sourceFile, span, program, host, cancellationToken, formatContext, preferences });
     });
   }
-  function getCombinedCodeFix(scope, fixId52, formatOptions, preferences = emptyOptions) {
+  function getCombinedCodeFix(scope, fixId53, formatOptions, preferences = emptyOptions) {
     synchronizeHostData();
     Debug.assert(scope.type === "file");
     const sourceFile = getValidSourceFile(scope.fileName);
     const formatContext = ts_formatting_exports.getFormatContext(formatOptions, host);
-    return ts_codefix_exports.getAllFixes({ fixId: fixId52, sourceFile, program, host, cancellationToken, formatContext, preferences });
+    return ts_codefix_exports.getAllFixes({ fixId: fixId53, sourceFile, program, host, cancellationToken, formatContext, preferences });
   }
   function organizeImports2(args, formatOptions, preferences = emptyOptions) {
     synchronizeHostData();
@@ -147397,14 +147532,14 @@ function createCodeFixActionWithoutFixAll(fixName8, changes, description3) {
     void 0
   );
 }
-function createCodeFixAction(fixName8, changes, description3, fixId52, fixAllDescription, command) {
-  return createCodeFixActionWorker(fixName8, diagnosticToString(description3), changes, fixId52, diagnosticToString(fixAllDescription), command);
+function createCodeFixAction(fixName8, changes, description3, fixId53, fixAllDescription, command) {
+  return createCodeFixActionWorker(fixName8, diagnosticToString(description3), changes, fixId53, diagnosticToString(fixAllDescription), command);
 }
-function createCodeFixActionMaybeFixAll(fixName8, changes, description3, fixId52, fixAllDescription, command) {
-  return createCodeFixActionWorker(fixName8, diagnosticToString(description3), changes, fixId52, fixAllDescription && diagnosticToString(fixAllDescription), command);
+function createCodeFixActionMaybeFixAll(fixName8, changes, description3, fixId53, fixAllDescription, command) {
+  return createCodeFixActionWorker(fixName8, diagnosticToString(description3), changes, fixId53, fixAllDescription && diagnosticToString(fixAllDescription), command);
 }
-function createCodeFixActionWorker(fixName8, description3, changes, fixId52, fixAllDescription, command) {
-  return { fixName: fixName8, description: description3, changes, fixId: fixId52, fixAllDescription, commands: command ? [command] : void 0 };
+function createCodeFixActionWorker(fixName8, description3, changes, fixId53, fixAllDescription, command) {
+  return { fixName: fixName8, description: description3, changes, fixId: fixId53, fixAllDescription, commands: command ? [command] : void 0 };
 }
 function registerCodeFix(reg) {
   for (const error2 of reg.errorCodes) {
@@ -147412,9 +147547,9 @@ function registerCodeFix(reg) {
     errorCodeToFixes.add(String(error2), reg);
   }
   if (reg.fixIds) {
-    for (const fixId52 of reg.fixIds) {
-      Debug.assert(!fixIdToRegistration.has(fixId52));
-      fixIdToRegistration.set(fixId52, reg);
+    for (const fixId53 of reg.fixIds) {
+      Debug.assert(!fixIdToRegistration.has(fixId53));
+      fixIdToRegistration.set(fixId53, reg);
     }
   }
 }
@@ -147423,17 +147558,17 @@ function getSupportedErrorCodes() {
   return errorCodeToFixesArray ?? (errorCodeToFixesArray = arrayFrom(errorCodeToFixes.keys()));
 }
 function removeFixIdIfFixAllUnavailable(registration, diagnostics) {
-  const { errorCodes: errorCodes65 } = registration;
+  const { errorCodes: errorCodes66 } = registration;
   let maybeFixableDiagnostics = 0;
   for (const diag2 of diagnostics) {
-    if (contains(errorCodes65, diag2.code))
+    if (contains(errorCodes66, diag2.code))
       maybeFixableDiagnostics++;
     if (maybeFixableDiagnostics > 1)
       break;
   }
   const fixAllUnavailable = maybeFixableDiagnostics < 2;
-  return ({ fixId: fixId52, fixAllDescription, ...action }) => {
-    return fixAllUnavailable ? action : { ...action, fixId: fixId52, fixAllDescription };
+  return ({ fixId: fixId53, fixAllDescription, ...action }) => {
+    return fixAllUnavailable ? action : { ...action, fixId: fixId53, fixAllDescription };
   };
 }
 function getFixes(context) {
@@ -147450,14 +147585,14 @@ function createCombinedCodeActions(changes, commands) {
 function createFileTextChanges(fileName, textChanges2) {
   return { fileName, textChanges: textChanges2 };
 }
-function codeFixAll(context, errorCodes65, use) {
+function codeFixAll(context, errorCodes66, use) {
   const commands = [];
-  const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => eachDiagnostic(context, errorCodes65, (diag2) => use(t, diag2, commands)));
+  const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => eachDiagnostic(context, errorCodes66, (diag2) => use(t, diag2, commands)));
   return createCombinedCodeActions(changes, commands.length === 0 ? void 0 : commands);
 }
-function eachDiagnostic(context, errorCodes65, cb) {
+function eachDiagnostic(context, errorCodes66, cb) {
   for (const diag2 of getDiagnostics(context)) {
-    if (contains(errorCodes65, diag2.code)) {
+    if (contains(errorCodes66, diag2.code)) {
       cb(diag2);
     }
   }
@@ -151868,10 +152003,10 @@ registerCodeFix({
     const info = errorCodeFixIdMap[errorCode];
     if (!info)
       return emptyArray;
-    const { descriptions, fixId: fixId52, fixAllDescriptions } = info;
+    const { descriptions, fixId: fixId53, fixAllDescriptions } = info;
     const changes = ts_textChanges_exports.ChangeTracker.with(context, (changes2) => dispatchChanges(changes2, context, errorCode, span.start));
     return [
-      createCodeFixActionMaybeFixAll(fixName, changes, descriptions, fixId52, fixAllDescriptions)
+      createCodeFixActionMaybeFixAll(fixName, changes, descriptions, fixId53, fixAllDescriptions)
     ];
   },
   fixIds: [fixName, fixAddOverrideId, fixRemoveOverrideId],
@@ -152676,7 +152811,7 @@ registerCodeFix({
   },
   fixIds: [fixMissingMember, fixMissingFunctionDeclaration, fixMissingProperties, fixMissingAttributes],
   getAllCodeActions: (context) => {
-    const { program, fixId: fixId52 } = context;
+    const { program, fixId: fixId53 } = context;
     const checker = program.getTypeChecker();
     const seen = /* @__PURE__ */ new Map();
     const typeDeclToMembers = /* @__PURE__ */ new Map();
@@ -152686,11 +152821,11 @@ registerCodeFix({
         if (!info || !addToSeen(seen, getNodeId(info.parentDeclaration) + "#" + (info.kind === 3 /* ObjectLiteral */ ? info.identifier : info.token.text))) {
           return;
         }
-        if (fixId52 === fixMissingFunctionDeclaration && (info.kind === 2 /* Function */ || info.kind === 5 /* Signature */)) {
+        if (fixId53 === fixMissingFunctionDeclaration && (info.kind === 2 /* Function */ || info.kind === 5 /* Signature */)) {
           addFunctionDeclaration(changes, context, info);
-        } else if (fixId52 === fixMissingProperties && info.kind === 3 /* ObjectLiteral */) {
+        } else if (fixId53 === fixMissingProperties && info.kind === 3 /* ObjectLiteral */) {
           addObjectLiteralProperties(changes, context, info);
-        } else if (fixId52 === fixMissingAttributes && info.kind === 4 /* JsxAttributes */) {
+        } else if (fixId53 === fixMissingAttributes && info.kind === 4 /* JsxAttributes */) {
           addJsxAttributes(changes, context, info);
         } else {
           if (info.kind === 1 /* Enum */) {
@@ -154589,21 +154724,21 @@ registerCodeFix({
       actions2.push(fix(type, fixIdNullable, Diagnostics.Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types));
     }
     return actions2;
-    function fix(type2, fixId52, fixAllDescription) {
+    function fix(type2, fixId53, fixAllDescription) {
       const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange29(t, sourceFile, typeNode, type2, checker));
-      return createCodeFixAction("jdocTypes", changes, [Diagnostics.Change_0_to_1, original, checker.typeToString(type2)], fixId52, fixAllDescription);
+      return createCodeFixAction("jdocTypes", changes, [Diagnostics.Change_0_to_1, original, checker.typeToString(type2)], fixId53, fixAllDescription);
     }
   },
   fixIds: [fixIdPlain, fixIdNullable],
   getAllCodeActions(context) {
-    const { fixId: fixId52, program, sourceFile } = context;
+    const { fixId: fixId53, program, sourceFile } = context;
     const checker = program.getTypeChecker();
     return codeFixAll(context, errorCodes45, (changes, err) => {
       const info = getInfo15(err.file, err.start, checker);
       if (!info)
         return;
       const { typeNode, type } = info;
-      const fixedType = typeNode.kind === 314 /* JSDocNullableType */ && fixId52 === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+      const fixedType = typeNode.kind === 314 /* JSDocNullableType */ && fixId53 === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
       doChange29(changes, sourceFile, typeNode, fixedType, checker);
     });
   }
@@ -157311,11 +157446,31 @@ function flattenInvalidBinaryExpr(node) {
   }
 }
 
-// src/services/codefixes/convertToMappedObjectType.ts
-var fixId45 = "fixConvertToMappedObjectType";
-var errorCodes58 = [Diagnostics.An_index_signature_parameter_type_cannot_be_a_literal_type_or_generic_type_Consider_using_a_mapped_object_type_instead.code];
+// src/services/codefixes/wrapDecoratorInParentheses.ts
+var fixId45 = "wrapDecoratorInParentheses";
+var errorCodes58 = [Diagnostics.Expression_must_be_enclosed_in_parentheses_to_be_used_as_a_decorator.code];
 registerCodeFix({
   errorCodes: errorCodes58,
+  getCodeActions: function getCodeActionsToWrapDecoratorExpressionInParentheses(context) {
+    const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => makeChange10(t, context.sourceFile, context.span.start));
+    return [createCodeFixAction(fixId45, changes, Diagnostics.Wrap_in_parentheses, fixId45, Diagnostics.Wrap_all_invalid_decorator_expressions_in_parentheses)];
+  },
+  fixIds: [fixId45],
+  getAllCodeActions: (context) => codeFixAll(context, errorCodes58, (changes, diag2) => makeChange10(changes, diag2.file, diag2.start))
+});
+function makeChange10(changeTracker, sourceFile, pos) {
+  const token = getTokenAtPosition(sourceFile, pos);
+  const decorator = findAncestor(token, isDecorator);
+  Debug.assert(!!decorator, "Expected position to be owned by a decorator.");
+  const replacement = factory.createParenthesizedExpression(decorator.expression);
+  changeTracker.replaceNode(sourceFile, decorator.expression, replacement);
+}
+
+// src/services/codefixes/convertToMappedObjectType.ts
+var fixId46 = "fixConvertToMappedObjectType";
+var errorCodes59 = [Diagnostics.An_index_signature_parameter_type_cannot_be_a_literal_type_or_generic_type_Consider_using_a_mapped_object_type_instead.code];
+registerCodeFix({
+  errorCodes: errorCodes59,
   getCodeActions: function getCodeActionsToConvertToMappedTypeObject(context) {
     const { sourceFile, span } = context;
     const info = getInfo20(sourceFile, span.start);
@@ -157323,10 +157478,10 @@ registerCodeFix({
       return void 0;
     const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange39(t, sourceFile, info));
     const name = idText(info.container.name);
-    return [createCodeFixAction(fixId45, changes, [Diagnostics.Convert_0_to_mapped_object_type, name], fixId45, [Diagnostics.Convert_0_to_mapped_object_type, name])];
+    return [createCodeFixAction(fixId46, changes, [Diagnostics.Convert_0_to_mapped_object_type, name], fixId46, [Diagnostics.Convert_0_to_mapped_object_type, name])];
   },
-  fixIds: [fixId45],
-  getAllCodeActions: (context) => codeFixAll(context, errorCodes58, (changes, diag2) => {
+  fixIds: [fixId46],
+  getAllCodeActions: (context) => codeFixAll(context, errorCodes59, (changes, diag2) => {
     const info = getInfo20(diag2.file, diag2.start);
     if (info)
       doChange39(changes, diag2.file, info);
@@ -157374,12 +157529,12 @@ function doChange39(changes, sourceFile, { indexSignature, container }) {
 }
 
 // src/services/codefixes/removeAccidentalCallParentheses.ts
-var fixId46 = "removeAccidentalCallParentheses";
-var errorCodes59 = [
+var fixId47 = "removeAccidentalCallParentheses";
+var errorCodes60 = [
   Diagnostics.This_expression_is_not_callable_because_it_is_a_get_accessor_Did_you_mean_to_use_it_without.code
 ];
 registerCodeFix({
-  errorCodes: errorCodes59,
+  errorCodes: errorCodes60,
   getCodeActions(context) {
     const callExpression = findAncestor(getTokenAtPosition(context.sourceFile, context.span.start), isCallExpression);
     if (!callExpression) {
@@ -157388,30 +157543,30 @@ registerCodeFix({
     const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => {
       t.deleteRange(context.sourceFile, { pos: callExpression.expression.end, end: callExpression.end });
     });
-    return [createCodeFixActionWithoutFixAll(fixId46, changes, Diagnostics.Remove_parentheses)];
+    return [createCodeFixActionWithoutFixAll(fixId47, changes, Diagnostics.Remove_parentheses)];
   },
-  fixIds: [fixId46]
+  fixIds: [fixId47]
 });
 
 // src/services/codefixes/removeUnnecessaryAwait.ts
-var fixId47 = "removeUnnecessaryAwait";
-var errorCodes60 = [
+var fixId48 = "removeUnnecessaryAwait";
+var errorCodes61 = [
   Diagnostics.await_has_no_effect_on_the_type_of_this_expression.code
 ];
 registerCodeFix({
-  errorCodes: errorCodes60,
+  errorCodes: errorCodes61,
   getCodeActions: function getCodeActionsToRemoveUnnecessaryAwait(context) {
-    const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => makeChange10(t, context.sourceFile, context.span));
+    const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => makeChange11(t, context.sourceFile, context.span));
     if (changes.length > 0) {
-      return [createCodeFixAction(fixId47, changes, Diagnostics.Remove_unnecessary_await, fixId47, Diagnostics.Remove_all_unnecessary_uses_of_await)];
+      return [createCodeFixAction(fixId48, changes, Diagnostics.Remove_unnecessary_await, fixId48, Diagnostics.Remove_all_unnecessary_uses_of_await)];
     }
   },
-  fixIds: [fixId47],
+  fixIds: [fixId48],
   getAllCodeActions: (context) => {
-    return codeFixAll(context, errorCodes60, (changes, diag2) => makeChange10(changes, diag2.file, diag2));
+    return codeFixAll(context, errorCodes61, (changes, diag2) => makeChange11(changes, diag2.file, diag2));
   }
 });
-function makeChange10(changeTracker, sourceFile, span) {
+function makeChange11(changeTracker, sourceFile, span) {
   const awaitKeyword = tryCast(getTokenAtPosition(sourceFile, span.start), (node) => node.kind === 135 /* AwaitKeyword */);
   const awaitExpression = awaitKeyword && tryCast(awaitKeyword.parent, isAwaitExpression);
   if (!awaitExpression) {
@@ -157436,20 +157591,20 @@ function makeChange10(changeTracker, sourceFile, span) {
 }
 
 // src/services/codefixes/splitTypeOnlyImport.ts
-var errorCodes61 = [Diagnostics.A_type_only_import_can_specify_a_default_import_or_named_bindings_but_not_both.code];
-var fixId48 = "splitTypeOnlyImport";
+var errorCodes62 = [Diagnostics.A_type_only_import_can_specify_a_default_import_or_named_bindings_but_not_both.code];
+var fixId49 = "splitTypeOnlyImport";
 registerCodeFix({
-  errorCodes: errorCodes61,
-  fixIds: [fixId48],
+  errorCodes: errorCodes62,
+  fixIds: [fixId49],
   getCodeActions: function getCodeActionsToSplitTypeOnlyImport(context) {
     const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => {
       return splitTypeOnlyImport(t, getImportDeclaration2(context.sourceFile, context.span), context);
     });
     if (changes.length) {
-      return [createCodeFixAction(fixId48, changes, Diagnostics.Split_into_two_separate_import_declarations, fixId48, Diagnostics.Split_all_invalid_type_only_imports)];
+      return [createCodeFixAction(fixId49, changes, Diagnostics.Split_into_two_separate_import_declarations, fixId49, Diagnostics.Split_all_invalid_type_only_imports)];
     }
   },
-  getAllCodeActions: (context) => codeFixAll(context, errorCodes61, (changes, error2) => {
+  getAllCodeActions: (context) => codeFixAll(context, errorCodes62, (changes, error2) => {
     splitTypeOnlyImport(changes, getImportDeclaration2(context.sourceFile, error2), context);
   })
 });
@@ -157498,23 +157653,23 @@ function splitTypeOnlyImport(changes, importDeclaration, context) {
 }
 
 // src/services/codefixes/convertConstToLet.ts
-var fixId49 = "fixConvertConstToLet";
-var errorCodes62 = [Diagnostics.Cannot_assign_to_0_because_it_is_a_constant.code];
+var fixId50 = "fixConvertConstToLet";
+var errorCodes63 = [Diagnostics.Cannot_assign_to_0_because_it_is_a_constant.code];
 registerCodeFix({
-  errorCodes: errorCodes62,
+  errorCodes: errorCodes63,
   getCodeActions: function getCodeActionsToConvertConstToLet(context) {
     const { sourceFile, span, program } = context;
     const info = getInfo21(sourceFile, span.start, program);
     if (info === void 0)
       return;
     const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange40(t, sourceFile, info.token));
-    return [createCodeFixActionMaybeFixAll(fixId49, changes, Diagnostics.Convert_const_to_let, fixId49, Diagnostics.Convert_all_const_to_let)];
+    return [createCodeFixActionMaybeFixAll(fixId50, changes, Diagnostics.Convert_const_to_let, fixId50, Diagnostics.Convert_all_const_to_let)];
   },
   getAllCodeActions: (context) => {
     const { program } = context;
     const seen = /* @__PURE__ */ new Map();
     return createCombinedCodeActions(ts_textChanges_exports.ChangeTracker.with(context, (changes) => {
-      eachDiagnostic(context, errorCodes62, (diag2) => {
+      eachDiagnostic(context, errorCodes63, (diag2) => {
         const info = getInfo21(diag2.file, diag2.start, program);
         if (info) {
           if (addToSeen(seen, getSymbolId(info.symbol))) {
@@ -157525,7 +157680,7 @@ registerCodeFix({
       });
     }));
   },
-  fixIds: [fixId49]
+  fixIds: [fixId50]
 });
 function getInfo21(sourceFile, pos, program) {
   var _a;
@@ -157546,11 +157701,11 @@ function doChange40(changes, sourceFile, token) {
 }
 
 // src/services/codefixes/fixExpectedComma.ts
-var fixId50 = "fixExpectedComma";
+var fixId51 = "fixExpectedComma";
 var expectedErrorCode = Diagnostics._0_expected.code;
-var errorCodes63 = [expectedErrorCode];
+var errorCodes64 = [expectedErrorCode];
 registerCodeFix({
-  errorCodes: errorCodes63,
+  errorCodes: errorCodes64,
   getCodeActions(context) {
     const { sourceFile } = context;
     const info = getInfo22(sourceFile, context.span.start, context.errorCode);
@@ -157558,15 +157713,15 @@ registerCodeFix({
       return void 0;
     const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange41(t, sourceFile, info));
     return [createCodeFixAction(
-      fixId50,
+      fixId51,
       changes,
       [Diagnostics.Change_0_to_1, ";", ","],
-      fixId50,
+      fixId51,
       [Diagnostics.Change_0_to_1, ";", ","]
     )];
   },
-  fixIds: [fixId50],
-  getAllCodeActions: (context) => codeFixAll(context, errorCodes63, (changes, diag2) => {
+  fixIds: [fixId51],
+  getAllCodeActions: (context) => codeFixAll(context, errorCodes64, (changes, diag2) => {
     const info = getInfo22(diag2.file, diag2.start, diag2.code);
     if (info)
       doChange41(changes, context.sourceFile, info);
@@ -157583,25 +157738,25 @@ function doChange41(changes, sourceFile, { node }) {
 
 // src/services/codefixes/fixAddVoidToPromise.ts
 var fixName7 = "addVoidToPromise";
-var fixId51 = "addVoidToPromise";
-var errorCodes64 = [
+var fixId52 = "addVoidToPromise";
+var errorCodes65 = [
   Diagnostics.Expected_1_argument_but_got_0_new_Promise_needs_a_JSDoc_hint_to_produce_a_resolve_that_can_be_called_without_arguments.code,
   Diagnostics.Expected_0_arguments_but_got_1_Did_you_forget_to_include_void_in_your_type_argument_to_Promise.code
 ];
 registerCodeFix({
-  errorCodes: errorCodes64,
-  fixIds: [fixId51],
+  errorCodes: errorCodes65,
+  fixIds: [fixId52],
   getCodeActions(context) {
-    const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => makeChange11(t, context.sourceFile, context.span, context.program));
+    const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => makeChange12(t, context.sourceFile, context.span, context.program));
     if (changes.length > 0) {
-      return [createCodeFixAction(fixName7, changes, Diagnostics.Add_void_to_Promise_resolved_without_a_value, fixId51, Diagnostics.Add_void_to_all_Promises_resolved_without_a_value)];
+      return [createCodeFixAction(fixName7, changes, Diagnostics.Add_void_to_Promise_resolved_without_a_value, fixId52, Diagnostics.Add_void_to_all_Promises_resolved_without_a_value)];
     }
   },
   getAllCodeActions(context) {
-    return codeFixAll(context, errorCodes64, (changes, diag2) => makeChange11(changes, diag2.file, diag2, context.program, /* @__PURE__ */ new Set()));
+    return codeFixAll(context, errorCodes65, (changes, diag2) => makeChange12(changes, diag2.file, diag2, context.program, /* @__PURE__ */ new Set()));
   }
 });
-function makeChange11(changes, sourceFile, span, program, seen) {
+function makeChange12(changes, sourceFile, span, program, seen) {
   const node = getTokenAtPosition(sourceFile, span.start);
   if (!isIdentifier(node) || !isCallExpression(node.parent) || node.parent.expression !== node || node.parent.arguments.length !== 0)
     return;
@@ -175086,6 +175241,7 @@ __export(ts_exports2, {
   isSuperProperty: () => isSuperProperty,
   isSupportedSourceFileName: () => isSupportedSourceFileName,
   isSwitchStatement: () => isSwitchStatement,
+  isSyntacticallyString: () => isSyntacticallyString,
   isSyntaxList: () => isSyntaxList,
   isSyntheticExpression: () => isSyntheticExpression,
   isSyntheticReference: () => isSyntheticReference,
@@ -186089,10 +186245,10 @@ ${e.message}`;
     }
     return simplifiedResult ? codeActions.map((codeAction) => this.mapCodeFixAction(codeAction)) : codeActions;
   }
-  getCombinedCodeFix({ scope, fixId: fixId52 }, simplifiedResult) {
+  getCombinedCodeFix({ scope, fixId: fixId53 }, simplifiedResult) {
     Debug.assert(scope.type === "file");
     const { file, project } = this.getFileAndProject(scope.args);
-    const res = project.getLanguageService().getCombinedCodeFix({ type: "file", fileName: file }, fixId52, this.getFormatOptions(file), this.getPreferences(file));
+    const res = project.getLanguageService().getCombinedCodeFix({ type: "file", fileName: file }, fixId53, this.getFormatOptions(file), this.getPreferences(file));
     if (simplifiedResult) {
       return { changes: this.mapTextChangesToCodeEdits(res.changes), commands: res.commands };
     } else {
@@ -186131,8 +186287,8 @@ ${e.message}`;
   mapCodeAction({ description: description3, changes, commands }) {
     return { description: description3, changes: this.mapTextChangesToCodeEdits(changes), commands };
   }
-  mapCodeFixAction({ fixName: fixName8, description: description3, changes, commands, fixId: fixId52, fixAllDescription }) {
-    return { fixName: fixName8, description: description3, changes: this.mapTextChangesToCodeEdits(changes), commands, fixId: fixId52, fixAllDescription };
+  mapCodeFixAction({ fixName: fixName8, description: description3, changes, commands, fixId: fixId53, fixAllDescription }) {
+    return { fixName: fixName8, description: description3, changes: this.mapTextChangesToCodeEdits(changes), commands, fixId: fixId53, fixAllDescription };
   }
   mapTextChangesToCodeEdits(textChanges2) {
     return textChanges2.map((change) => this.mapTextChangeToCodeEdit(change));
@@ -189862,6 +190018,7 @@ start(initializeNodeSystem(), require("os").platform());
   isSuperProperty,
   isSupportedSourceFileName,
   isSwitchStatement,
+  isSyntacticallyString,
   isSyntaxList,
   isSyntheticExpression,
   isSyntheticReference,