Remove unnecessary options (#56984)

* Remove ForceRoslynLSPCompletionExperiment

* Remove CompletionServiceOptions.UsePartialSemanticForCompletion

Author: tmat

src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Completion/CompletionHandler.cs

@@ -95,10 +95,8 @@ public CompletionHandler(
             var commitCharactersRuleCache = new Dictionary<ImmutableArray<CharacterSetModificationRule>, string[]>(CommitCharacterArrayComparer.Instance);
 
             // Feature flag to enable the return of TextEdits instead of InsertTexts (will increase payload size).
-            // We check against the CompletionOption for test purposes only.
             Contract.ThrowIfNull(context.Solution);
-            var returnTextEdits = _globalOptions.GetOption(LspOptions.LspCompletionFeatureFlag) ||
-                _globalOptions.GetOption(CompletionOptions.ForceRoslynLSPCompletionExperiment, document.Project.Language);
+            var returnTextEdits = _globalOptions.GetOption(LspOptions.LspCompletionFeatureFlag);
 
             TextSpan? defaultSpan = null;
             LSP.Range? defaultRange = null;

src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb

@@ -6681,15 +6681,18 @@ namespace NS2
                     </Project>
                 </Workspace>)
 
+                Dim document = state.Workspace.CurrentSolution.GetDocument(state.Workspace.Documents.Single(Function(d) d.Name = "C.cs").Id)
+
                 If populateCache Then
                     Dim service = state.Workspace.Services.GetLanguageServices(LanguageNames.CSharp).GetRequiredService(Of ITypeImportCompletionService)()
-                    Dim document = state.Workspace.CurrentSolution.GetDocument(state.Workspace.Documents.Single(Function(d) d.Name = "C.cs").Id)
                     Await service.WarmUpCacheAsync(document.Project, CancellationToken.None)
                 End If
 
+                Dim completionService = CType(document.GetLanguageService(Of CompletionService)(), CompletionServiceWithProviders)
+                completionService.GetTestAccessor().SuppressPartialSemantics()
+
                 Dim workspace = state.Workspace
                 workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(workspace.Options _
-                    .WithChangedOption(CompletionServiceOptions.UsePartialSemanticForCompletion, False) _
                     .WithChangedOption(CompletionOptions.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp, True)))
 
                 state.SendInvokeCompletionList()
@@ -6737,15 +6740,18 @@ namespace NS2
                     </Project>
                 </Workspace>)
 
+                Dim document = state.Workspace.CurrentSolution.GetDocument(state.Workspace.Documents.Single(Function(d) d.Name = "C.cs").Id)
+
                 If populateCache Then
-                    Dim service = state.Workspace.Services.GetLanguageServices(LanguageNames.CSharp).GetRequiredService(Of ITypeImportCompletionService)()
-                    Dim document = state.Workspace.CurrentSolution.GetDocument(state.Workspace.Documents.Single(Function(d) d.Name = "C.cs").Id)
+                    Dim importCompletionService = state.Workspace.Services.GetLanguageServices(LanguageNames.CSharp).GetRequiredService(Of ITypeImportCompletionService)()
                     Await ExtensionMethodImportCompletionHelper.WarmUpCacheAsync(document, CancellationToken.None)
                 End If
 
+                Dim completionService = CType(document.GetLanguageService(Of CompletionService)(), CompletionServiceWithProviders)
+                completionService.GetTestAccessor().SuppressPartialSemantics()
+
                 Dim workspace = state.Workspace
                 workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(workspace.Options _
-                    .WithChangedOption(CompletionServiceOptions.UsePartialSemanticForCompletion, False) _
                     .WithChangedOption(CompletionServiceOptions.TimeoutInMillisecondsForExtensionMethodImportCompletion, -1) _
                     .WithChangedOption(CompletionOptions.ShowItemsFromUnimportedNamespaces, LanguageNames.CSharp, True)))
 

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

@@ -78,20 +78,6 @@ internal static class CompletionOptions
         public static readonly PerLanguageOption2<bool?> EnableArgumentCompletionSnippets =
             new(nameof(CompletionOptions), nameof(EnableArgumentCompletionSnippets), defaultValue: null,
             storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.EnableArgumentCompletionSnippets"));
-
-        // Test-only options
-
-        // This option is associated with the Roslyn.LSP.Completion flag and should be removed once the flag is removed.
-        // It is intended for testing purposes only.
-        public static readonly PerLanguageOption2<bool> ForceRoslynLSPCompletionExperiment =
-            new(nameof(CompletionOptions), nameof(ForceRoslynLSPCompletionExperiment), defaultValue: false,
-            storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.ForceRoslynLSPCompletionExperiment"));
-
-        public static IEnumerable<PerLanguageOption2<bool>> GetDev15CompletionOptions()
-        {
-            yield return ShowCompletionItemFilters;
-            yield return HighlightMatchingPortionsOfCompletionListItems;
-        }
     }
 
     internal static class CompletionControllerOptions

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

@@ -14,12 +14,6 @@ internal static class CompletionServiceOptions
         public static readonly Option2<bool> IsExpandedCompletion
             = new(nameof(CompletionServiceOptions), nameof(IsExpandedCompletion), defaultValue: false);
 
-        /// <summary>
-        /// For testing only. Changing the default value in actual product might cause perf issues.
-        /// </summary>
-        public static readonly Option2<bool> UsePartialSemanticForCompletion
-            = new(nameof(CompletionServiceOptions), nameof(UsePartialSemanticForCompletion), defaultValue: true);
-
         /// <summary>
         /// Timeout value used for time-boxing completion of unimported extension methods.
         /// Value less than 0 means no timebox; value == 0 means immediate timeout (for testing purpose)

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

@@ -49,6 +49,11 @@ private readonly ConditionalWeakTable<AnalyzerReference, ProjectCompletionProvid
 
         private IEnumerable<Lazy<CompletionProvider, CompletionProviderMetadata>>? _lazyImportedProviders;
 
+        /// <summary>
+        /// Test-only switch.
+        /// </summary>
+        private bool _suppressPartialSemantics;
+
         protected CompletionServiceWithProviders(Workspace workspace)
         {
             _workspace = workspace;
@@ -262,13 +267,12 @@ private ImmutableArray<CompletionProvider> FilterProviders(
         /// </summary>
         private async Task<(Document document, SemanticModel? semanticModel)> GetDocumentWithFrozenPartialSemanticsAsync(Document document, CancellationToken cancellationToken)
         {
-            var usePartialSemantic = _workspace.Options.GetOption(CompletionServiceOptions.UsePartialSemanticForCompletion);
-            if (usePartialSemantic)
+            if (_suppressPartialSemantics)
             {
-                return await document.GetPartialSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+                return (document, await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false));
             }
 
-            return (document, await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false));
+            return await document.GetPartialSemanticModelAsync(cancellationToken).ConfigureAwait(false);
         }
 
         private protected async Task<(CompletionList? completionList, bool expandItemsAvailable)> GetCompletionsWithAvailabilityOfExpandedItemsAsync(
@@ -764,6 +768,9 @@ internal Task<CompletionContext> GetContextAsync(
                     defaultSpan: null,
                     cancellationToken);
             }
+
+            public void SuppressPartialSemantics()
+                => _completionServiceWithProviders._suppressPartialSemantics = true;
         }
     }
 }

src/Features/LanguageServer/ProtocolUnitTests/Completion/CompletionTests.cs

@@ -12,6 +12,7 @@
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.LanguageServer.Handler;
 using Microsoft.CodeAnalysis.LanguageServer.Handler.Completion;
+using Microsoft.CodeAnalysis.Options;
 using Roslyn.Test.Utilities;
 using Xunit;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
@@ -327,8 +328,8 @@ void M()
             var document = solution.Projects.First().Documents.First();
 
             // Set to use prototype completion behavior (i.e. feature flag).
-            var options = solution.Workspace.Options.WithChangedOption(CompletionOptions.ForceRoslynLSPCompletionExperiment, LanguageNames.CSharp, true);
-            Assert.True(solution.Workspace.TryApplyChanges(solution.WithOptions(options)));
+            var globalOptions = testLspServer.TestWorkspace.GetService<IGlobalOptionService>();
+            globalOptions.SetGlobalOption(new OptionKey(LspOptions.LspCompletionFeatureFlag), true);
 
             var textEdit = GenerateTextEdit(@"\\A", startLine: 5, startChar: 19, endLine: 5, endChar: 19);
 
@@ -364,8 +365,8 @@ void M()
             var document = solution.Projects.First().Documents.First();
 
             // Set to use prototype completion behavior (i.e. feature flag).
-            var options = solution.Workspace.Options.WithChangedOption(CompletionOptions.ForceRoslynLSPCompletionExperiment, LanguageNames.CSharp, true);
-            Assert.True(solution.Workspace.TryApplyChanges(solution.WithOptions(options)));
+            var globalOptions = testLspServer.TestWorkspace.GetService<IGlobalOptionService>();
+            globalOptions.SetGlobalOption(new OptionKey(LspOptions.LspCompletionFeatureFlag), true);
 
             var textEdit = GenerateTextEdit(@"\A", startLine: 5, startChar: 20, endLine: 5, endChar: 21);
 
@@ -401,8 +402,8 @@ void M()
             var document = solution.Projects.First().Documents.First();
 
             // Set to use prototype completion behavior (i.e. feature flag).
-            var options = solution.Workspace.Options.WithChangedOption(CompletionOptions.ForceRoslynLSPCompletionExperiment, LanguageNames.CSharp, true);
-            Assert.True(solution.Workspace.TryApplyChanges(solution.WithOptions(options)));
+            var globalOptions = testLspServer.TestWorkspace.GetService<IGlobalOptionService>();
+            globalOptions.SetGlobalOption(new OptionKey(LspOptions.LspCompletionFeatureFlag), true);
 
             var textEdit = GenerateTextEdit(@"\\A", startLine: 5, startChar: 23, endLine: 5, endChar: 25);