More tests

Author: Maria Solano

src/services/refactors/inlineVariable.ts

@@ -17,6 +17,7 @@ import {
     isInitializedVariable,
     isTypeQueryNode,
     isVariableDeclarationInVariableStatement,
+    needsParentheses,
     Node,
     Program,
     refactor,
@@ -176,10 +177,10 @@ function getReplacementExpression(reference: Node, replacement: Expression): Exp
     // If the operand has higher precedence, then it does not need to be parenthesized."
     //
     // Note that binaryOperandNeedsParentheses has further logic when the precedences
-    // are equal, but for the purposes of this refactor we keep things simple and always
-    // parenthesize.
+    // are equal, but for the purposes of this refactor we keep things simple and
+    // instead just check for special cases with needsParentheses.
     const { parent } = reference;
-    if (isExpression(parent) && (getExpressionPrecedence(replacement) <= getExpressionPrecedence(parent))) {
+    if (isExpression(parent) && (getExpressionPrecedence(replacement) < getExpressionPrecedence(parent) || needsParentheses(parent))) {
         return factory.createParenthesizedExpression(replacement);
     }
 

tests/cases/fourslash/inlineVariableFunctionResult.ts

@@ -0,0 +1,17 @@
+/// <reference path="fourslash.ts" />
+
+////function inc(x: number) { return x + 1; }
+////const y/**/ = inc(1);
+////const z = y + 1;
+////const w = inc(y);
+
+goTo.marker("");
+verify.refactorAvailable("Inline variable");
+edit.applyRefactor({
+    refactorName: "Inline variable",
+    actionName: "Inline variable",
+    actionDescription: "Inline variable",
+    newContent: `function inc(x: number) { return x + 1; }
+const z = inc(1) + 1;
+const w = inc(inc(1));`
+});

tests/cases/fourslash/inlineVariableNullCoalescing.ts

@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts" />
+
+////function foo(): number | undefined { return Math.random() > 0.5 ? 1 : undefined; }
+////const x/**/ = foo();
+////const y = x?.toString();
+
+goTo.marker("");
+verify.refactorAvailable("Inline variable");
+edit.applyRefactor({
+    refactorName: "Inline variable",
+    actionName: "Inline variable",
+    actionDescription: "Inline variable",
+    newContent: `function foo(): number | undefined { return Math.random() > 0.5 ? 1 : undefined; }
+const y = (foo())?.toString();`
+});