Don't expose RazorTriggerCharacters set

Rather than directly exposing a set, this change adds instance methods to test for valid Razor triggers.

Author: DustinCampbell

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs

@@ -41,14 +41,14 @@ public async Task SetupAsync()
         var documentMappingService = lspServices.GetRequiredService<IDocumentMappingService>();
         var clientConnection = lspServices.GetRequiredService<IClientConnection>();
         var completionListCache = lspServices.GetRequiredService<CompletionListCache>();
-        var completionTriggerAndCommitCharacters = lspServices.GetRequiredService<CompletionTriggerAndCommitCharacters>();
+        var triggerAndCommitCharacters = lspServices.GetRequiredService<CompletionTriggerAndCommitCharacters>();
         var loggerFactory = lspServices.GetRequiredService<ILoggerFactory>();
 
-        var delegatedCompletionListProvider = new TestDelegatedCompletionListProvider(documentMappingService, clientConnection, completionListCache, completionTriggerAndCommitCharacters);
-        var completionListProvider = new CompletionListProvider(razorCompletionListProvider, delegatedCompletionListProvider);
+        var delegatedCompletionListProvider = new TestDelegatedCompletionListProvider(documentMappingService, clientConnection, completionListCache, triggerAndCommitCharacters);
+        var completionListProvider = new CompletionListProvider(razorCompletionListProvider, delegatedCompletionListProvider, triggerAndCommitCharacters);
         var configurationService = new DefaultRazorConfigurationService(clientConnection, loggerFactory);
         var optionsMonitor = new RazorLSPOptionsMonitor(configurationService, RazorLSPOptions.Default);
-        CompletionEndpoint = new RazorCompletionEndpoint(completionListProvider, completionTriggerAndCommitCharacters, telemetryReporter: null, optionsMonitor);
+        CompletionEndpoint = new RazorCompletionEndpoint(completionListProvider, triggerAndCommitCharacters, telemetryReporter: null, optionsMonitor);
 
         var clientCapabilities = new VSInternalClientCapabilities
         {

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/CompletionListProvider.cs

@@ -13,16 +13,14 @@
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion;
 
-internal class CompletionListProvider
+internal class CompletionListProvider(
+    RazorCompletionListProvider razorCompletionListProvider,
+    DelegatedCompletionListProvider delegatedCompletionListProvider,
+    CompletionTriggerAndCommitCharacters triggerAndCommitCharacters)
 {
-    private readonly RazorCompletionListProvider _razorCompletionListProvider;
-    private readonly DelegatedCompletionListProvider _delegatedCompletionListProvider;
-
-    public CompletionListProvider(RazorCompletionListProvider razorCompletionListProvider, DelegatedCompletionListProvider delegatedCompletionListProvider)
-    {
-        _razorCompletionListProvider = razorCompletionListProvider;
-        _delegatedCompletionListProvider = delegatedCompletionListProvider;
-    }
+    private readonly RazorCompletionListProvider _razorCompletionListProvider = razorCompletionListProvider;
+    private readonly DelegatedCompletionListProvider _delegatedCompletionListProvider = delegatedCompletionListProvider;
+    private readonly CompletionTriggerAndCommitCharacters _triggerAndCommitCharacters = triggerAndCommitCharacters;
 
     public async Task<VSInternalCompletionList?> GetCompletionListAsync(
         int absoluteIndex,
@@ -51,7 +49,7 @@ public CompletionListProvider(RazorCompletionListProvider razorCompletionListPro
             : null;
 
         // Now we get the Razor completion list, using information from the actual language server if necessary
-        var razorCompletionList = CompletionTriggerAndCommitCharacters.IsValidTrigger(_razorCompletionListProvider.TriggerCharacters, completionContext)
+        var razorCompletionList = _triggerAndCommitCharacters.IsValidRazorTrigger(completionContext)
             ? await _razorCompletionListProvider.GetCompletionListAsync(
                 absoluteIndex,
                 completionContext,

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/CompletionTriggerAndCommitCharacters.cs

@@ -17,7 +17,7 @@ internal class CompletionTriggerAndCommitCharacters(LanguageServerFeatureOptions
     private FrozenSet<string>? _allDelegationTriggerCharacters;
     private string[]? _allTriggerCharacters;
 
-    public static FrozenSet<string> RazorTriggerCharacters { get; } = new[] { "@", "<", ":", " " }.ToFrozenSet();
+    private static readonly FrozenSet<string> s_razorTriggerCharacters = new[] { "@", "<", ":", " " }.ToFrozenSet();
     /// <summary>
     /// Tigger characters that can trigger both Razor and Delegation completion (e.g."@" triggers Razor directives and C#)
     /// </summary>
@@ -29,7 +29,7 @@ internal class CompletionTriggerAndCommitCharacters(LanguageServerFeatureOptions
     public FrozenSet<string> AllDelegationTriggerCharacters => _allDelegationTriggerCharacters
         ??= RazorDelegationTriggerCharacters.Union(s_csharpTriggerCharacters).Union(HtmlTriggerCharacters).ToFrozenSet();
 
-    public string[] AllTriggerCharacters => _allTriggerCharacters ??= [.. RazorTriggerCharacters.Union(AllDelegationTriggerCharacters)];
+    public string[] AllTriggerCharacters => _allTriggerCharacters ??= [.. s_razorTriggerCharacters.Union(AllDelegationTriggerCharacters)];
 
     /// <summary>
     /// This is the intersection of C# and HTML commit characters.
@@ -47,6 +47,12 @@ completionContext.TriggerCharacter is null ||
     public bool IsValidCSharpTrigger(CompletionContext completionContext)
         => IsValidTrigger(s_csharpTriggerCharacters, completionContext);
 
+    public bool IsValidRazorTrigger(CompletionContext completionContext)
+        => IsValidTrigger(s_razorTriggerCharacters, completionContext);
+
     public bool IsCSharpTriggerCharacter(string ch)
         => s_csharpTriggerCharacters.Contains(ch);
+
+    public bool IsRazorTriggerCharacter(string ch)
+        => s_razorTriggerCharacters.Contains(ch);
 }

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/RazorCompletionListProvider.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
@@ -32,9 +31,6 @@ internal class RazorCompletionListProvider(
         Title = SR.ReTrigger_Completions_Title,
     };
 
-    // virtual for tests
-    public virtual FrozenSet<string> TriggerCharacters => CompletionTriggerAndCommitCharacters.RazorTriggerCharacters;
-
     // virtual for tests
     public virtual async Task<VSInternalCompletionList?> GetCompletionListAsync(
         int absoluteIndex,

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Completion/RemoteCompletionService.cs

@@ -134,7 +134,7 @@ private async ValueTask<Response> GetCompletionAsync(
             }
         }
 
-        var razorCompletionList = CompletionTriggerAndCommitCharacters.IsValidTrigger(CompletionTriggerAndCommitCharacters.RazorTriggerCharacters, completionContext)
+        var razorCompletionList = _triggerAndCommitCharacters.IsValidRazorTrigger(completionContext)
             ? await _razorCompletionListProvider.GetCompletionListAsync(
                 documentPositionInfo.HostDocumentIndex,
                 completionContext,

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/CompletionListProviderTest.cs

@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.Completion.Delegation;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
+using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
 using Microsoft.CodeAnalysis.Razor.Completion;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
@@ -31,25 +32,27 @@ public class CompletionListProviderTest : LanguageServerTestBase
     private readonly DocumentContext _documentContext;
     private readonly VSInternalClientCapabilities _clientCapabilities;
     private readonly RazorCompletionOptions _razorCompletionOptions;
+    private readonly CompletionTriggerAndCommitCharacters _triggerAndCommitCharacters;
 
     public CompletionListProviderTest(ITestOutputHelper testOutput)
         : base(testOutput)
     {
         _completionList1 = new VSInternalCompletionList() { Items = [] };
         _completionList2 = new VSInternalCompletionList() { Items = [] };
-        _razorCompletionProvider = new TestRazorCompletionListProvider(_completionList1, new[] { SharedTriggerCharacter, }, LoggerFactory);
+        _razorCompletionProvider = new TestRazorCompletionListProvider(_completionList1, LoggerFactory);
         _delegatedCompletionProvider = new TestDelegatedCompletionListProvider(_completionList2, new[] { SharedTriggerCharacter, CompletionList2OnlyTriggerCharacter });
         _completionContext = new VSInternalCompletionContext();
         _documentContext = TestDocumentContext.Create("C:/path/to/file.cshtml");
         _clientCapabilities = new VSInternalClientCapabilities();
         _razorCompletionOptions = new RazorCompletionOptions(SnippetsSupported: true, AutoInsertAttributeQuotes: true, CommitElementsWithSpace: true);
+        _triggerAndCommitCharacters = new(TestLanguageServerFeatureOptions.Instance);
     }
 
     [Fact]
     public async Task MultipleCompletionLists_Merges()
     {
         // Arrange
-        var provider = new CompletionListProvider(_razorCompletionProvider, _delegatedCompletionProvider);
+        var provider = new CompletionListProvider(_razorCompletionProvider, _delegatedCompletionProvider, _triggerAndCommitCharacters);
 
         // Act
         var completionList = await provider.GetCompletionListAsync(
@@ -64,7 +67,7 @@ public async Task MultipleCompletionLists_Merges()
     public async Task MultipleCompletionLists_DifferentCommitCharacters_OnlyCallsApplicable()
     {
         // Arrange
-        var provider = new CompletionListProvider(_razorCompletionProvider, _delegatedCompletionProvider);
+        var provider = new CompletionListProvider(_razorCompletionProvider, _delegatedCompletionProvider, _triggerAndCommitCharacters);
         _completionContext.TriggerKind = CompletionTriggerKind.TriggerCharacter;
         _completionContext.TriggerCharacter = CompletionList2OnlyTriggerCharacter;
 
@@ -108,16 +111,12 @@ private class TestRazorCompletionListProvider : RazorCompletionListProvider
 
         public TestRazorCompletionListProvider(
             VSInternalCompletionList completionList,
-            IEnumerable<string> triggerCharacters,
             ILoggerFactory loggerFactory)
             : base(completionFactsService: null, completionListCache: null, loggerFactory)
         {
             _completionList = completionList;
-            TriggerCharacters = triggerCharacters.ToFrozenSet();
         }
 
-        public override FrozenSet<string> TriggerCharacters { get; }
-
         public override Task<VSInternalCompletionList> GetCompletionListAsync(
             int absoluteIndex,
             VSInternalCompletionContext completionContext,