Update src/services/refactors/convertToOptionalChainExpression.ts

Co-authored-by: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
microsoft · jessetrinity · Jul 14, 2020 · Jun 12, 2020 · Jun 16, 2020 · Jun 17, 2020
commit 65ca81e6e373373b1fc5da9527e900d451cc2a07
diff --git a/src/services/refactors/convertToOptionalChainExpression.ts b/src/services/refactors/convertToOptionalChainExpression.ts
@@ -35,8 +35,8 @@ namespace ts.refactor.convertToOptionalChainExpression {
         const { file, program } = context;
         const span = getRefactorContextSpan(context);
 
-        if (span.length === 0 && !considerEmptySpans) return undefined;
-        const forEmptySpan = span.length === 0 && considerEmptySpans;
+        const forEmptySpan = span.length === 0;
+        if (forEmptySpan && !considerEmptySpans) return undefined;
 
         const startToken = getTokenAtPosition(file, span.start);
 
@@ -127,4 +127,4 @@ namespace ts.refactor.convertToOptionalChainExpression {
             changes.replaceNode(sourceFile, expression, factory.createBinaryExpression(convertPropertyAccessToOptionalChain(checker, fullPropertyAccess, until), factory.createToken(SyntaxKind.QuestionQuestionToken), expression.whenFalse));
         }
     }
-}
+}