fix changed diagnosis

microsoft · amcasey · Apr 2, 2020 · Aug 10, 2018 · Aug 14, 2018 · Aug 14, 2018
commit cbe59bb06344958113b3e2a37f33edca95f41653
diff --git a/src/services/codefixes/returnValueSurmise.ts b/src/services/codefixes/returnValueSurmise.ts
@@ -162,12 +162,6 @@ namespace ts.codefix {
                 if (!initializer || !isFunctionLikeDeclaration(initializer) || !initializer.body) return undefined;
                 return getFixInfo(checker, initializer, checker.getTypeAtLocation(node.parent), /* isFunctionType */ true);
         }
-
-        if (isDeclarationName(node) && (isVariableLike(node.parent) || isJsxAttribute(node.parent))) {
-            const initializer = getVariableLikeInitializer(node.parent);
-            if (!initializer || !isFunctionLikeDeclaration(initializer) || !initializer.body) return undefined;
-            return getFixInfo(checker, initializer, checker.getTypeAtLocation(node.parent), /* isFunctionType */ true);
-        }
         return undefined;
     }
 
@@ -187,8 +181,6 @@ namespace ts.codefix {
             case SyntaxKind.JSDocPropertyTag:
             case SyntaxKind.JSDocParameterTag:
                 return undefined;
-            default:
-                Debug.fail("unexpected token");
         }
     }
 

diff --git a/tests/cases/fourslash/codeFixSurmiseReturnValue18.ts b/tests/cases/fourslash/codeFixSurmiseReturnValue18.ts
@@ -14,4 +14,5 @@ verify.codeFixAvailable([
     { description: 'Add a return statement' },
     { description: 'Remove block body braces' },
     { description: 'Replace braces with parentheses' },
+    { description: `Infer type of 'props' from usage` }
 ]);
diff --git a/tests/cases/fourslash/codeFixSurmiseReturnValue19.ts b/tests/cases/fourslash/codeFixSurmiseReturnValue19.ts
@@ -15,5 +15,6 @@
 
 verify.codeFixAvailable([
     { description: 'Wrap this block with parentheses' },
+    { description: `Infer type of 'props' from usage` },
     { description: 'Remove unused label' },
 ]);
diff --git a/tests/cases/fourslash/codeFixSurmiseReturnValue20.ts b/tests/cases/fourslash/codeFixSurmiseReturnValue20.ts
@@ -19,5 +19,6 @@ verify.codeFixAvailable([
     { description: 'Add a return statement' },
     { description: 'Remove block body braces' },
     { description: 'Replace braces with parentheses' },
+    { description: `Infer type of 'props' from usage` },
     { description: 'Remove unused label' },
 ]);
diff --git a/tests/cases/fourslash/codeFixSurmiseReturnValue_all1.ts b/tests/cases/fourslash/codeFixSurmiseReturnValue_all1.ts
@@ -54,8 +54,6 @@
 //// const baz5: ((() => number) | (() => A)) = () => {
 ////     bar: '1'
 //// }
-//// 
-//// const test: { a: A } = { a: () => { bar: '1' } }
 
 verify.codeFixAll({
     fixId: "fixAddReturnStatement",
@@ -113,9 +111,5 @@ const baz4: ((() => number) | (() => A)) = () => {
 }
 const baz5: ((() => number) | (() => A)) = () => {
     return { bar: '1' };
-}
-
-const test: { a: A } = { a: () => {
-    return { bar: '1' };
-} }`,
-});
+}`,
+});
diff --git a/tests/cases/fourslash/codeFixSurmiseReturnValue_all2.ts b/tests/cases/fourslash/codeFixSurmiseReturnValue_all2.ts
@@ -54,8 +54,6 @@
 //// const baz5: ((() => number) | (() => A)) = () => {
 ////     bar: '1'
 //// }
-//// 
-//// const test: { a: A } = { a: () => { bar: '1' } }
 
 verify.codeFixAll({
     fixId: "fixRemoveBlockBodyBrace",
@@ -93,7 +91,5 @@ const baz1: () => number = () => 1
 const baz2: () => A = () => ({ bar: '1' })
 const baz3: () => A = () => ({ bar: '1' })
 const baz4: ((() => number) | (() => A)) = () => 1
-const baz5: ((() => number) | (() => A)) = () => ({ bar: '1' })
-
-const test: { a: A } = { a: () => ({ bar: '1' }) }`,
+const baz5: ((() => number) | (() => A)) = () => ({ bar: '1' })`,
 });
diff --git a/tests/cases/fourslash/codeFixSurmiseReturnValue_all3.ts b/tests/cases/fourslash/codeFixSurmiseReturnValue_all3.ts
@@ -54,8 +54,6 @@
 //// const baz5: ((() => number) | (() => A)) = () => {
 ////     bar: '1'
 //// }
-//// 
-//// const test: { a: A } = { a: () => { bar: '1' } }
 
 verify.codeFixAll({
     fixId: "fixReplaceBraceWithParen",
@@ -93,7 +91,5 @@ const baz1: () => number = () => (1)
 const baz2: () => A = () => ({ bar: '1' })
 const baz3: () => A = () => ({ bar: '1' })
 const baz4: ((() => number) | (() => A)) = () => (1)
-const baz5: ((() => number) | (() => A)) = () => ({ bar: '1' })
-
-const test: { a: A } = { a: () => ({ bar: '1' }) }`,
+const baz5: ((() => number) | (() => A)) = () => ({ bar: '1' })`,
 });
diff --git a/tests/cases/fourslash/codeFixSurmiseReturnValue_all4.ts b/tests/cases/fourslash/codeFixSurmiseReturnValue_all4.ts
@@ -54,8 +54,6 @@
 //// const baz5: ((() => number) | (() => A)) = () => {
 ////     bar: '1'
 //// }
-//// 
-//// const test: { a: A } = { a: () => { bar: '1' } }
 
 verify.codeFixAll({
     fixId: "fixWrapTheBlockWithParen",
@@ -93,7 +91,5 @@ const baz1: () => number = () => (1)
 const baz2: () => A = () => ({ bar: '1' })
 const baz3: () => A = () => ({ bar: '1' })
 const baz4: ((() => number) | (() => A)) = () => (1)
-const baz5: ((() => number) | (() => A)) = () => ({ bar: '1' })
-
-const test: { a: A } = { a: () => ({ bar: '1' }) }`,
+const baz5: ((() => number) | (() => A)) = () => ({ bar: '1' })`,
 });