Support semi

microsoft · amcasey · Apr 2, 2020 · Aug 10, 2018 · Aug 14, 2018 · Aug 14, 2018
commit 175cf4ea9f1f1b24a8cc312c67d3e41095a4e882
diff --git a/src/services/codefixes/returnValueCorrect.ts b/src/services/codefixes/returnValueCorrect.ts
@@ -171,7 +171,12 @@ namespace ts.codefix {
 
     function addReturnStatement(changes: textChanges.ChangeTracker, sourceFile: SourceFile, expression: Expression, statement: Statement) {
         suppressLeadingAndTrailingTrivia(expression);
-        changes.replaceNode(sourceFile, statement, createReturn(expression));
+        const probablyNeedSemi = probablyUsesSemicolons(sourceFile);
+        changes.replaceNode(sourceFile, statement, createReturn(expression), {
+            leadingTriviaOption: textChanges.LeadingTriviaOption.Exclude,
+            trailingTriviaOption: textChanges.TrailingTriviaOption.Exclude,
+            suffix: probablyNeedSemi ? ";" : undefined
+        });
     }
 
     function removeBlockBodyBrace(changes: textChanges.ChangeTracker, sourceFile: SourceFile, declaration: ArrowFunction, expression: Expression, commentSource: Node, withParen: boolean) {

diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue24.ts b/tests/cases/fourslash/codeFixCorrectReturnValue24.ts
@@ -7,6 +7,6 @@ verify.codeFix({
     description: "Add a return statement",
     index: 0,
     newFileContent: 
-    `function Foo (a: () => number) { a() }
+`function Foo (a: () => number) { a() }
 Foo(() => { /* leading */ return 1 /* trailing */ })`
 })
diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue25.ts b/tests/cases/fourslash/codeFixCorrectReturnValue25.ts
@@ -7,6 +7,6 @@ verify.codeFix({
     description: "Remove block body braces",
     index: 1,
     newFileContent: 
-    `function Foo (a: () => number) { a() }
+`function Foo (a: () => number) { a() }
 Foo(() => /* leading */ 1 /* trailing */)`
 })
diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue26.ts b/tests/cases/fourslash/codeFixCorrectReturnValue26.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts' />
+//// interface A {
+////     bar: string;
+//// }
+//// 
+//// function Foo (a: () => A) { a(); }
+//// Foo(() => {  
+////     { bar: '123'; }
+//// })
+
+verify.codeFix({
+    description: "Add a return statement",
+    index: 0,
+    newFileContent: 
+`interface A {
+    bar: string;
+}
+
+function Foo (a: () => A) { a(); }
+Foo(() => {  
+    return { bar: '123' };
+})`
+})