Remove ImportCompletion feature flag and enable by default

src/EditorFeatures/Core/IntelliSense/AsyncCompletion/CompletionSource.cs

@@ -272,7 +272,7 @@ public async Task<VSCompletionContext> GetCompletionContextAsync(
 
                 var sessionData = CompletionSessionData.GetOrCreateSessionData(session);
 
-                if (!options.ShouldShowItemsFromUnimportedNamespaces())
+                if (!options.ShouldShowItemsFromUnimportedNamespaces)
                 {
                     // No need to trigger expanded providers at all if the feature is disabled, just trigger core providers and return;
                     var (context, list) = await GetCompletionContextWorkerAsync(session, document, trigger, triggerLocation,

src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb

@@ -6894,7 +6894,6 @@ namespace NS2
                   showCompletionInArgumentLists:=showCompletionInArgumentLists)
 
                 state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ForceExpandedCompletionIndexCreation), True)
-                state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp), False)
 
                 ' trigger completion with import completion disabled
                 state.SendInvokeCompletionList()
@@ -7093,7 +7092,6 @@ public class AA
 }</Document>)
 
                 state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ForceExpandedCompletionIndexCreation), True)
-                state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp), False)
 
                 state.SendInvokeCompletionList()
                 Await state.WaitForUIRenderedAsync()
@@ -7878,9 +7876,6 @@ namespace NS
 } </Document>,
                               showCompletionInArgumentLists:=showCompletionInArgumentLists)
 
-                state.Workspace.GlobalOptions.SetGlobalOption(
-                    New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp), False)
-
                 state.SendTypeChars("task")
                 Await state.WaitForAsynchronousOperationsAsync()
                 Await state.AssertSelectedCompletionItem(displayText:="Task")
@@ -10283,8 +10278,6 @@ class MyClass
                               </Document>,
                               extraExportedTypes:={GetType(ItemWithAdditionalFilterTextsProvider)}.ToList())
 
-                state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp), False)
-
                 state.SendTypeChars(" ")
                 Await state.AssertCompletionItemsContainAll("Consolation", "Add code that write to console", "Add code that write line to console")
 
@@ -10374,7 +10367,6 @@ class MyClass
 }
                               </Document>)
 
-                state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp), False)
                 state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowNewSnippetExperienceUserOption, LanguageNames.CSharp), True)
                 state.SendTypeChars("if")
                 Await state.AssertSelectedCompletionItem(displayText:="if", inlineDescription:=Nothing, isHardSelected:=True)
@@ -10449,7 +10441,6 @@ class MyClass
 }
                               </Document>)
 
-                state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp), False)
                 state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowNewSnippetExperienceUserOption, LanguageNames.CSharp), False)
                 state.SendInvokeCompletionList()
                 ' We should still work normally w/o pythia recommender
@@ -10473,7 +10464,6 @@ class MyClass
                               </Document>,
                               extraExportedTypes:={GetType(TestPythiaDeclarationNameRecommenderImplmentation)}.ToList())
 
-                state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp), False)
                 state.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowNewSnippetExperienceUserOption, LanguageNames.CSharp), False)
 
                 state.SendInvokeCompletionList()

src/EditorFeatures/TestUtilities/Completion/AbstractCompletionProviderTests.cs

@@ -47,7 +47,6 @@ public abstract class AbstractCompletionProviderTests<TWorkspaceFixture> : TestB
         protected readonly Mock<ICompletionSession> MockCompletionSession;
 
         protected bool? ShowTargetTypedCompletionFilter { get; set; }
-        protected bool? TypeImportCompletionFeatureFlag { get; set; }
         protected bool? ShowImportCompletionItemsOptionValue { get; set; }
         protected bool? ForceExpandedCompletionIndexCreation { get; set; }
         protected bool? HideAdvancedMembers { get; set; }
@@ -69,9 +68,6 @@ private CompletionOptions GetCompletionOptions()
             if (ShowTargetTypedCompletionFilter.HasValue)
                 options = options with { TargetTypedCompletionFilter = ShowTargetTypedCompletionFilter.Value };
 
-            if (TypeImportCompletionFeatureFlag.HasValue)
-                options = options with { TypeImportCompletion = TypeImportCompletionFeatureFlag.Value };
-
             if (ShowImportCompletionItemsOptionValue.HasValue)
                 options = options with { ShowItemsFromUnimportedNamespaces = ShowImportCompletionItemsOptionValue.Value };
 

src/EditorFeatures/TestUtilities2/Intellisense/TestStateFactory.vb

@@ -2,8 +2,8 @@
 ' The .NET Foundation licenses this file to you under the MIT license.
 ' See the LICENSE file in the project root for more information.
 
-Imports Microsoft.CodeAnalysis.CSharp
 Imports Microsoft.CodeAnalysis.Completion
+Imports Microsoft.CodeAnalysis.CSharp
 Imports Microsoft.CodeAnalysis.Options
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
@@ -25,24 +25,28 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                                  excludedTypes, extraExportedTypes,
                                  includeFormatCommandHandler, workspaceKind:=Nothing)
 
-            testState.Workspace.GlobalOptions.SetGlobalOption(
-                New OptionKey(CompletionOptionsStorage.TriggerInArgumentLists, LanguageNames.CSharp), showCompletionInArgumentLists)
+            testState.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.TriggerInArgumentLists, LanguageNames.CSharp), showCompletionInArgumentLists)
+            testState.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp), False)
 
             Return testState
         End Function
 
         Public Shared Function CreateVisualBasicTestState(documentElement As XElement,
                                                            Optional extraExportedTypes As List(Of Type) = Nothing) As TestState
 
-            Return New TestState(<Workspace>
-                                     <Project Language="Visual Basic" CommonReferences="true">
-                                         <Document>
-                                             <%= documentElement.Value %>
-                                         </Document>
-                                     </Project>
-                                 </Workspace>,
+            Dim testState = New TestState(<Workspace>
+                                              <Project Language="Visual Basic" CommonReferences="true">
+                                                  <Document>
+                                                      <%= documentElement.Value %>
+                                                  </Document>
+                                              </Project>
+                                          </Workspace>,
                                  excludedTypes:=Nothing, extraExportedTypes,
                                  includeFormatCommandHandler:=False, workspaceKind:=Nothing)
+
+            testState.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.VisualBasic), False)
+
+            Return testState
         End Function
 
         Public Shared Function CreateTestStateFromWorkspace(workspaceElement As XElement,
@@ -53,8 +57,8 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
             Dim testState = New TestState(
                 workspaceElement, excludedTypes:=Nothing, extraExportedTypes, includeFormatCommandHandler:=False, workspaceKind)
 
-            testState.Workspace.GlobalOptions.SetGlobalOption(
-                New OptionKey(CompletionOptionsStorage.TriggerInArgumentLists, LanguageNames.CSharp), showCompletionInArgumentLists)
+            testState.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.TriggerInArgumentLists, LanguageNames.CSharp), showCompletionInArgumentLists)
+            testState.Workspace.GlobalOptions.SetGlobalOption(New OptionKey(CompletionOptionsStorage.ShowItemsFromUnimportedNamespaces, LanguageNames.VisualBasic), False)
 
             Return testState
         End Function

src/Features/Core/Portable/Completion/CompletionOptions.cs

@@ -19,10 +19,9 @@ internal sealed record class CompletionOptions
         public SnippetsRule SnippetsBehavior { get; init; } = SnippetsRule.Default;
         public bool HideAdvancedMembers { get; init; } = false;
         public bool ShowNameSuggestions { get; init; } = true;
-        public bool? ShowItemsFromUnimportedNamespaces { get; init; } = null;
+        public bool? ShowItemsFromUnimportedNamespaces { get; init; } = true;
         public bool UnnamedSymbolCompletionDisabled { get; init; } = false;
         public bool TargetTypedCompletionFilter { get; init; } = false;
-        public bool TypeImportCompletion { get; init; } = false;
         public bool ProvideDateAndTimeCompletions { get; init; } = true;
         public bool ProvideRegexCompletions { get; init; } = true;
         public bool ForceExpandedCompletionIndexCreation { get; init; } = false;
@@ -43,14 +42,9 @@ public RecommendationServiceOptions ToRecommendationServiceOptions()
 
         /// <summary>
         /// Whether items from unimported namespaces should be included in the completion list.
-        /// This takes into consideration the experiment we are running in addition to the value
-        /// from user facing options.
         /// </summary>
-        public bool ShouldShowItemsFromUnimportedNamespaces()
-        {
-            // Don't trigger import completion if the option value is "default" and the experiment is disabled for the user. 
-            return ShowItemsFromUnimportedNamespaces ?? TypeImportCompletion;
-        }
+        public bool ShouldShowItemsFromUnimportedNamespaces
+            => !ShowItemsFromUnimportedNamespaces.HasValue || ShowItemsFromUnimportedNamespaces.Value;
 
         /// <summary>
         /// Whether items from new snippet experience should be included in the completion list.

src/Features/Core/Portable/Completion/Providers/ImportCompletionProvider/AbstractImportCompletionProvider.cs

@@ -41,7 +41,7 @@ public Task NotifyCommittingItemAsync(Document document, CompletionItem item, ch
 
         public override async Task ProvideCompletionsAsync(CompletionContext completionContext)
         {
-            if (!completionContext.CompletionOptions.ShouldShowItemsFromUnimportedNamespaces())
+            if (!completionContext.CompletionOptions.ShouldShowItemsFromUnimportedNamespaces)
                 return;
 
             var cancellationToken = completionContext.CancellationToken;

src/Features/LanguageServer/Protocol/Features/Options/CompletionOptionsStorage.cs

@@ -23,7 +23,6 @@ public static CompletionOptions GetCompletionOptions(this IGlobalOptionService o
             ShowNameSuggestions = options.GetOption(ShowNameSuggestions, language),
             ShowItemsFromUnimportedNamespaces = options.GetOption(ShowItemsFromUnimportedNamespaces, language),
             UnnamedSymbolCompletionDisabled = options.GetOption(UnnamedSymbolCompletionDisabledFeatureFlag),
-            TypeImportCompletion = options.GetOption(TypeImportCompletionFeatureFlag),
             ProvideDateAndTimeCompletions = options.GetOption(ProvideDateAndTimeCompletions, language),
             ProvideRegexCompletions = options.GetOption(ProvideRegexCompletions, language),
             ForceExpandedCompletionIndexCreation = options.GetOption(ForceExpandedCompletionIndexCreation),
@@ -35,10 +34,6 @@ public static CompletionOptions GetCompletionOptions(this IGlobalOptionService o
 
     // feature flags
 
-    public static readonly Option2<bool> TypeImportCompletionFeatureFlag = new(nameof(CompletionOptions), nameof(TypeImportCompletionFeatureFlag),
-        CompletionOptions.Default.TypeImportCompletion,
-        new FeatureFlagStorageLocation("Roslyn.TypeImportCompletion"));
-
     public static readonly Option2<bool> UnnamedSymbolCompletionDisabledFeatureFlag = new(nameof(CompletionOptions), nameof(UnnamedSymbolCompletionDisabledFeatureFlag),
         CompletionOptions.Default.UnnamedSymbolCompletionDisabled,
         new FeatureFlagStorageLocation("Roslyn.UnnamedSymbolCompletionDisabled"));