Perform checks prior to calling addTypeProperties.

DanielRosenwasser · DanielRosenwasser · commit 9b6a02716798 · 2019-10-18T13:03:25.000-07:00
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -340,10 +340,6 @@ namespace ts.Completions {
         let replacementSpan: TextSpan | undefined;
 
         const insertQuestionDot = origin && originIsNullableMember(origin);
-        if (insertQuestionDot && preferences.includeAutomaticOptionalChainCompletions === false) {
-            return undefined;
-        }
-
         const useBraces = origin && originIsSymbolMember(origin) || needsConvertPropertyAccess;
         if (origin && originIsThisType(origin)) {
             insertText = needsConvertPropertyAccess
@@ -785,7 +781,7 @@ namespace ts.Completions {
         sourceFile: SourceFile,
         isUncheckedFile: boolean,
         position: number,
-        preferences: Pick<UserPreferences, "includeCompletionsForModuleExports" | "includeCompletionsWithInsertText">,
+        preferences: Pick<UserPreferences, "includeCompletionsForModuleExports" | "includeCompletionsWithInsertText" | "includeAutomaticOptionalChainCompletions">,
         detailsEntryId: CompletionEntryIdentifier | undefined,
         host: LanguageServiceHost,
     ): CompletionData | Request | undefined {
@@ -1124,6 +1120,9 @@ namespace ts.Completions {
                                 insertQuestionDot = isRightOfDot && !isRightOfQuestionDot;
                                 type = type.getNonNullableType();
                             }
+                            if (insertQuestionDot && preferences.includeAutomaticOptionalChainCompletions === false) {
+                                return;
+                            }
                             addTypeProperties(type, !!(node.flags & NodeFlags.AwaitContext), insertQuestionDot);
                         }
 
@@ -1145,6 +1144,9 @@ namespace ts.Completions {
                     insertQuestionDot = isRightOfDot && !isRightOfQuestionDot;
                     type = type.getNonNullableType();
                 }
+                if (insertQuestionDot && preferences.includeAutomaticOptionalChainCompletions === false) {
+                    return;
+                }
                 addTypeProperties(type, !!(node.flags & NodeFlags.AwaitContext), insertQuestionDot);
             }
         }
