Call widening functions on the correct type when adding satisfies to …

…expressions Widening of types only work on types from variable declaration, so when getWidenedLiteralType is being called on expressions the compiler wouldn't widen it. So call getWidenedLiteralType on the type of variables instead on those cases.
microsoft · Apr 26, 2024 · cb45ffe · cb45ffe
1 parent 5704f4e
commit cb45ffe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/services/codefixes/fixMissingTypeAnnotationOnExports.ts b/src/services/codefixes/fixMissingTypeAnnotationOnExports.ts
@@ -375,7 +375,7 @@ function withContext<T>(
 
         if (!(isExpressionTarget || isShorthandPropertyAssignmentTarget)) return undefined;
 
-        const { typeNode, mutatedTarget } = inferType(targetNode);
+        const { typeNode, mutatedTarget } = inferType(targetNode, type);
         if (!typeNode || mutatedTarget) return undefined;
 
         if (isShorthandPropertyAssignmentTarget) {
@@ -921,7 +921,7 @@ function withContext<T>(
         mutatedTarget: boolean;
     }
 
-    function inferType(node: Node): InferenceResult {
+    function inferType(node: Node, variableType?: Type | undefined): InferenceResult {
         if (typePrintMode === TypePrintMode.RELATIVE) {
             return relativeType(node);
         }
@@ -934,6 +934,11 @@ function withContext<T>(
         }
 
         if (typePrintMode === TypePrintMode.WIDENED) {
+            if (variableType) {
+              type = variableType;
+            }
+            // Widening of types can happen on union of type literals on
+            // declaration emit so we query it.
             const widenedType = typeChecker.getWidenedLiteralType(type);
             if (typeChecker.isTypeAssignableTo(widenedType, type)) {
                 return emptyInferenceResult;

diff --git a/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports36-conditional-releative.ts b/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports36-conditional-releative.ts
@@ -22,11 +22,14 @@ verify.codeFixAvailable([
     },
     {
       "description": "Add satisfies and an inline type assertion with 'typeof A | typeof B'"
+    },
+    {
+      "description": "Add satisfies and an inline type assertion with 'string'"
     }
 ])
 verify.codeFix({
     description: "Add satisfies and an inline type assertion with 'typeof A | typeof B'" ,
-    index: 3,
+    index: 4,
     newFileContent:
 `const A = "A"
 const B = "B"