stash

add surmise for return type
add support for more case
microsoft · amcasey · Apr 2, 2020 · amcasey · Apr 2, 2020 · Kingwl
diff --git a/src/services/codefixes/returnValueSurmise.ts b/src/services/codefixes/returnValueSurmise.ts
+    }
+
+    function checkFixedAssignableTo(checker: TypeChecker, declaration: FunctionLikeDeclaration, expr: Expression, type: Type, isFunctionType: boolean) {
+        return checker.isTypeAssignableTo(checker.getTypeAtLocation(isFunctionType ? updateFunctionLikeBody(declaration, createBlock([createReturn(expr)])) : expr), type);
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
+        "category": "Message",
+        "code": 95080
+    },
+    "Surmise all return value": {
diff --git a/src/services/codefixes/returnValueSurmise.ts b/src/services/codefixes/returnValueSurmise.ts
+        changes.replaceNode(sourceFile, declaration.body, createParen(expression));
+    }
+
+    function getActionForfixAddReturnStatement(context: CodeFixContext, declaration: FunctionLikeDeclaration, expression: Expression) {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
+        "category": "Message",
+        "code": 95080
+    },
+    "Surmise all return value": {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
diff --git a/src/services/codefixes/returnValueCorrect.ts b/src/services/codefixes/returnValueCorrect.ts
+    ];
+
+    enum FixKind {
+        MissingReturnStatement,
diff --git a/src/services/codefixes/returnValueCorrect.ts b/src/services/codefixes/returnValueCorrect.ts
diff --git a/tests/cases/fourslash/codeFixSurmiseReturnValue1.ts b/tests/cases/fourslash/codeFixSurmiseReturnValue1.ts
diff --git a/src/services/codefixes/returnValueCorrect.ts b/src/services/codefixes/returnValueCorrect.ts
+    }
+
+    function removeBlockBodyBrace(changes: textChanges.ChangeTracker, sourceFile: SourceFile, declaration: ArrowFunction, expression: Expression, withParen: boolean) {
+        changes.replaceNode(sourceFile, declaration.body, (withParen || needsParentheses(expression)) ? createParen(expression) : expression);
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
diff --git a/src/services/codefixes/returnValueCorrect.ts b/src/services/codefixes/returnValueCorrect.ts
+    }
+
+    function removeBlockBodyBrace(changes: textChanges.ChangeTracker, sourceFile: SourceFile, declaration: ArrowFunction, expression: Expression, withParen: boolean) {
+        changes.replaceNode(sourceFile, declaration.body, (withParen || needsParentheses(expression)) ? createParen(expression) : expression);
diff --git a/tests/cases/fourslash/codeFixSurmiseReturnValue10.ts b/tests/cases/fourslash/codeFixSurmiseReturnValue10.ts
+//// const a: ((() => number) | (() => undefined)) = () => { 1 }
+
+verify.codeFixAvailable([
+    { description: 'Add a return statement' },