TagHelperCollection Part 5: Add weak cache for TagHelperDocumentContext (#12509)

DustinCampbell · web-flow · commit d4a50d974d9e · 2025-11-24T13:04:02.000-08:00
| [Prelude](#12503) | [Part 1](#12504) | [Part 2](#12505) | [Part 3](#12506) | [Part 4](#12507) | Part 5 | This change introduces a weak cache for `TagHelperDocumentContext` keyed by the tag helper prefix string and `TagHelperCollection` checksum. This helps avoid creating new `TagHelperBinders` for the same set of tag helpers, since `TagHelperBinder` is expensive to create. ---- CI Build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2842228&view=results Toolset Run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2842250&view=results
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/RazorCodeDocumentExtensionsTest.cs
@@ -52,7 +52,7 @@ public void GetAndSetTagHelperContext_ReturnsTagHelperContext()
         // Arrange
         var codeDocument = TestRazorCodeDocument.CreateEmpty();
 
-        var expected = TagHelperDocumentContext.Create(tagHelpers: []);
+        var expected = TagHelperDocumentContext.GetOrCreate(tagHelpers: []);
         codeDocument.SetTagHelperContext(expected);
 
         // Act
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorTagHelperContextDiscoveryPhase.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorTagHelperContextDiscoveryPhase.cs
@@ -51,7 +51,7 @@ protected override void ExecuteCore(RazorCodeDocument codeDocument, Cancellation
         // This will always be null for a component document.
         var tagHelperPrefix = visitor.TagHelperPrefix;
 
-        var context = TagHelperDocumentContext.Create(tagHelperPrefix, visitor.GetResults());
+        var context = TagHelperDocumentContext.GetOrCreate(tagHelperPrefix, visitor.GetResults());
         codeDocument.SetTagHelperContext(context);
         codeDocument.SetPreTagHelperSyntaxTree(syntaxTree);
     }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/TagHelperDocumentContext.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/TagHelperDocumentContext.cs
@@ -1,14 +1,18 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Razor.Utilities;
+
 namespace Microsoft.AspNetCore.Razor.Language;
 
 /// <summary>
 /// The binding information for Tag Helpers resulted to a <see cref="RazorCodeDocument"/>. Represents the
 /// Tag Helper information after processing by directives.
 /// </summary>
 internal sealed class TagHelperDocumentContext
-{
+{  
+    private static readonly CleanableWeakCache<(string? Prefix, Checksum), TagHelperDocumentContext> s_cache = new(cleanUpThreshold: 20);
+
     public string? Prefix { get; }
     public TagHelperCollection TagHelpers { get; }
 
@@ -20,22 +24,19 @@ private TagHelperDocumentContext(string? prefix, TagHelperCollection tagHelpers)
         TagHelpers = tagHelpers;
     }
 
-    public static TagHelperDocumentContext Create(TagHelperCollection tagHelpers)
-    {
-        ArgHelper.ThrowIfNull(tagHelpers);
-
-        return new(prefix: null, tagHelpers);
-    }
+    public static TagHelperDocumentContext GetOrCreate(TagHelperCollection tagHelpers)
+        => GetOrCreate(prefix: null, tagHelpers);
 
-    public static TagHelperDocumentContext Create(string? prefix, TagHelperCollection tagHelpers)
+    public static TagHelperDocumentContext GetOrCreate(string? prefix, TagHelperCollection tagHelpers)
     {
         ArgHelper.ThrowIfNull(tagHelpers);
 
-        return new(prefix, tagHelpers);
+        return s_cache.GetOrAdd(
+            key: (prefix, tagHelpers.Checksum),
+            arg: (prefix, tagHelpers),
+            arg => new(arg.prefix, arg.tagHelpers));
     }
 
     public TagHelperBinder GetBinder()
-    {
-        return _binder ?? InterlockedOperations.Initialize(ref _binder, new TagHelperBinder(Prefix, TagHelpers));
-    }
+        => _binder ?? InterlockedOperations.Initialize(ref _binder, new TagHelperBinder(Prefix, TagHelpers));
 }
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/TagHelperCompletionBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/TagHelperCompletionBenchmark.cs
@@ -31,7 +31,7 @@ public object GetAttributeCompletions()
     {
         var tagHelperCompletionService = new TagHelperCompletionService();
         var context = new AttributeCompletionContext(
-            TagHelperDocumentContext.Create([.. CommonResources.TelerikTagHelpers]),
+            TagHelperDocumentContext.GetOrCreate([.. CommonResources.TelerikTagHelpers]),
             existingCompletions: [],
             currentTagName: "PageTitle",
             currentAttributeName: null,
@@ -48,7 +48,7 @@ public object GetElementCompletions()
     {
         var tagHelperCompletionService = new TagHelperCompletionService();
         var context = new ElementCompletionContext(
-            TagHelperDocumentContext.Create([.. CommonResources.TelerikTagHelpers]),
+            TagHelperDocumentContext.GetOrCreate([.. CommonResources.TelerikTagHelpers]),
             existingCompletions: s_existingElementCompletions,
             containingTagName: null,
             attributes: [],
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Serialization/CompletionListSerializationBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Serialization/CompletionListSerializationBenchmark.cs
@@ -66,7 +66,7 @@ private CompletionList GenerateCompletionList(string documentContent, int queryI
         var sourceDocument = RazorSourceDocument.Create(documentContent, RazorSourceDocumentProperties.Default);
         var codeDocument = RazorCodeDocument.Create(sourceDocument);
         var syntaxTree = RazorSyntaxTree.Parse(sourceDocument);
-        var tagHelperDocumentContext = TagHelperDocumentContext.Create([.. CommonResources.LegacyTagHelpers]);
+        var tagHelperDocumentContext = TagHelperDocumentContext.GetOrCreate([.. CommonResources.LegacyTagHelpers]);
 
         var owner = syntaxTree.Root.FindInnermostNode(queryIndex, includeWhitespace: true, walkMarkersBack: true);
         var context = new RazorCompletionContext(codeDocument, queryIndex, owner, syntaxTree, tagHelperDocumentContext);
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/TagHelperCompletionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/TagHelperCompletionProvider.cs
@@ -116,7 +116,7 @@ private ImmutableArray<RazorCompletionItem> GetAttributeCompletions(
         var ancestors = containingAttribute.Parent.Ancestors();
         var nonDirectiveAttributeTagHelpers = tagHelperDocumentContext.TagHelpers.Where(
             static tagHelper => !tagHelper.BoundAttributes.Any(static attribute => attribute.IsDirectiveAttribute));
-        var filteredContext = TagHelperDocumentContext.Create(tagHelperDocumentContext.Prefix, nonDirectiveAttributeTagHelpers);
+        var filteredContext = TagHelperDocumentContext.GetOrCreate(tagHelperDocumentContext.Prefix, nonDirectiveAttributeTagHelpers);
         var (ancestorTagName, ancestorIsTagHelper) = TagHelperFacts.GetNearestAncestorTagInfo(ancestors);
         var attributeCompletionContext = new AttributeCompletionContext(
             filteredContext,
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DefaultRazorCompletionFactsServiceTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DefaultRazorCompletionFactsServiceTest.cs
@@ -18,7 +18,7 @@ public void GetDirectiveCompletionItems_AllProvidersCompletionItems()
         var sourceDocument = RazorSourceDocument.Create("", RazorSourceDocumentProperties.Default);
         var codeDocument = RazorCodeDocument.Create(sourceDocument);
         var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create());
-        var tagHelperDocumentContext = TagHelperDocumentContext.Create(tagHelpers: []);
+        var tagHelperDocumentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers: []);
 
         var completionItem1 = RazorCompletionItem.CreateDirective(
             displayText: "displayText1",
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveAttributeCompletionItemProviderTest.AttributeNames.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveAttributeCompletionItemProviderTest.AttributeNames.cs
@@ -180,7 +180,7 @@ public void GetCompletionItems_ExistingAttribute_Partial_ReturnsEmptyCollection(
     public void GetAttributeCompletions_NoDescriptorsForTag_ReturnsEmptyCollection()
     {
         // Arrange
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers: []);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers: []);
         var context = GetDefaultDirectivateAttributeCompletionContext("@bin");
 
         // Act
@@ -197,7 +197,7 @@ public void GetAttributeCompletions_NoDirectiveAttributesForTag_ReturnsEmptyColl
         var descriptor = TagHelperDescriptorBuilder.CreateTagHelper("CatchAll", "TestAssembly");
         descriptor.BoundAttributeDescriptor(boundAttribute => boundAttribute.Name = "Test");
         descriptor.TagMatchingRule(rule => rule.RequireTagName("*"));
-        var documentContext = TagHelperDocumentContext.Create([descriptor.Build()]);
+        var documentContext = TagHelperDocumentContext.GetOrCreate([descriptor.Build()]);
 
         var context = GetDefaultDirectivateAttributeCompletionContext("@bin");
 
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveAttributeCompletionItemProviderTest.ParameterNames.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveAttributeCompletionItemProviderTest.ParameterNames.cs
@@ -35,7 +35,7 @@ public void GetCompletionItems_OnDirectiveAttributeParameter_ReturnsCompletions(
     public void GetAttributeParameterCompletions_NoDescriptorsForTag_ReturnsEmptyCollection()
     {
         // Arrange
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers: []);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers: []);
         var context = GetDefaultDirectiveAttributeCompletionContext("@bin");
 
         // Act
@@ -52,7 +52,7 @@ public void GetAttributeParameterCompletions_NoDirectiveAttributesForTag_Returns
         var descriptor = TagHelperDescriptorBuilder.CreateTagHelper("CatchAll", "TestAssembly");
         descriptor.BoundAttributeDescriptor(boundAttribute => boundAttribute.Name = "Test");
         descriptor.TagMatchingRule(rule => rule.RequireTagName("*"));
-        var documentContext = TagHelperDocumentContext.Create([descriptor.Build()]);
+        var documentContext = TagHelperDocumentContext.GetOrCreate([descriptor.Build()]);
 
         var context = GetDefaultDirectiveAttributeCompletionContext("@bin");
 
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveAttributeTransitionCompletionItemProviderTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveAttributeTransitionCompletionItemProviderTest.cs
@@ -13,7 +13,7 @@ namespace Microsoft.CodeAnalysis.Razor.Completion;
 
 public class DirectiveAttributeTransitionCompletionItemProviderTest(ITestOutputHelper testOutput) : ToolingTestBase(testOutput)
 {
-    private readonly TagHelperDocumentContext _tagHelperDocumentContext = TagHelperDocumentContext.Create(tagHelpers: []);
+    private readonly TagHelperDocumentContext _tagHelperDocumentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers: []);
     private readonly DirectiveAttributeTransitionCompletionItemProvider _provider = new(TestLanguageServerFeatureOptions.Instance);
 
     [Fact]
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveCompletionItemProviderTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveCompletionItemProviderTest.cs
@@ -425,7 +425,7 @@ private static RazorCompletionContext CreateRazorCompletionContext(TestCode text
         var sourceDocument = RazorSourceDocument.Create("", RazorSourceDocumentProperties.Default);
         var codeDocument = RazorCodeDocument.Create(sourceDocument);
 
-        var tagHelperDocumentContext = TagHelperDocumentContext.Create(tagHelpers: []);
+        var tagHelperDocumentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers: []);
         var owner = syntaxTree.Root.FindInnermostNode(absoluteIndex);
         owner = AbstractRazorCompletionFactsService.AdjustSyntaxNodeForWordBoundary(owner, absoluteIndex);
         return new RazorCompletionContext(codeDocument, absoluteIndex, owner, syntaxTree, tagHelperDocumentContext, reason);
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/LanguageServerTagHelperCompletionServiceTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/LanguageServerTagHelperCompletionServiceTest.cs
@@ -1314,7 +1314,7 @@ private static ElementCompletionContext BuildElementCompletionContext(
     {
         attributes = attributes.NullToEmpty();
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelperPrefix, tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelperPrefix, tagHelpers);
         var completionContext = new ElementCompletionContext(
             documentContext,
             existingCompletions,
@@ -1337,7 +1337,7 @@ private static AttributeCompletionContext BuildAttributeCompletionContext(
     {
         attributes = attributes.NullToEmpty();
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelperPrefix, tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelperPrefix, tagHelpers);
         var completionContext = new AttributeCompletionContext(
             documentContext,
             existingCompletions,
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/MarkupTransitionCompletionItemProviderTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/MarkupTransitionCompletionItemProviderTest.cs
@@ -299,7 +299,7 @@ private static RazorCompletionContext CreateRazorCompletionContext(TestCode text
         var sourceDocument = RazorSourceDocument.Create("", RazorSourceDocumentProperties.Default);
         var codeDocument = RazorCodeDocument.Create(sourceDocument);
 
-        var tagHelperDocumentContext = TagHelperDocumentContext.Create(tagHelpers: []);
+        var tagHelperDocumentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers: []);
 
         var owner = syntaxTree.Root.FindInnermostNode(absoluteIndex, includeWhitespace: true, walkMarkersBack: true);
         owner = AbstractRazorCompletionFactsService.AdjustSyntaxNodeForWordBoundary(owner, absoluteIndex);
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/RazorCompletionListProviderTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/RazorCompletionListProviderTest.cs
@@ -536,7 +536,7 @@ private static RazorCodeDocument CreateCodeDocument(string text, string document
         var sourceDocument = TestRazorSourceDocument.Create(text, filePath: documentFilePath);
         var syntaxTree = RazorSyntaxTree.Parse(sourceDocument);
         codeDocument.SetSyntaxTree(syntaxTree);
-        var tagHelperDocumentContext = TagHelperDocumentContext.Create(tagHelpers ?? []);
+        var tagHelperDocumentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers ?? []);
         codeDocument.SetTagHelperContext(tagHelperDocumentContext);
         return codeDocument;
     }
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/TagHelperFactsTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/TagHelperFactsTest.cs
@@ -23,7 +23,7 @@ public void GetTagHelperBinding_DoesNotAllowOptOutCharacterPrefix()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var binding = TagHelperFacts.GetTagHelperBinding(
             documentContext,
@@ -56,7 +56,7 @@ public void GetTagHelperBinding_WorksAsExpected()
                 .Build(),
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var binding = TagHelperFacts.GetTagHelperBinding(
             documentContext,
@@ -85,7 +85,7 @@ public void GetBoundTagHelperAttributes_MatchesPrefixedAttributeName()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
         var binding = TagHelperFacts.GetTagHelperBinding(
             documentContext,
             tagName: "a",
@@ -120,7 +120,7 @@ public void GetBoundTagHelperAttributes_MatchesAttributeName()
             tagHelpers[0].BoundAttributes.First()
         };
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var binding = TagHelperFacts.GetTagHelperBinding(
             documentContext,
@@ -149,7 +149,7 @@ public void GetTagHelpersGivenTag_DoesNotAllowOptOutCharacterPrefix()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var result = TagHelperFacts.GetTagHelpersGivenTag(
             documentContext,
@@ -169,7 +169,7 @@ public void GetTagHelpersGivenTag_RequiresTagName()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var result = TagHelperFacts.GetTagHelpersGivenTag(
             documentContext,
@@ -192,7 +192,7 @@ public void GetTagHelpersGivenTag_RestrictsTagHelpersBasedOnTagName()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var result = TagHelperFacts.GetTagHelpersGivenTag(
             documentContext,
@@ -215,7 +215,7 @@ public void GetTagHelpersGivenTag_RestrictsTagHelpersBasedOnTagHelperPrefix()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(prefix: "th", tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(prefix: "th", tagHelpers);
 
         var result = TagHelperFacts.GetTagHelpersGivenTag(
             documentContext,
@@ -238,7 +238,7 @@ public void GetTagHelpersGivenTag_RestrictsTagHelpersBasedOnParent()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var result = TagHelperFacts.GetTagHelpersGivenTag(
             documentContext,
@@ -258,7 +258,7 @@ public void GetTagHelpersGivenParent_AllowsRootParentTag()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var result = TagHelperFacts.GetTagHelpersGivenParent(
             documentContext,
@@ -280,7 +280,7 @@ public void GetTagHelpersGivenParent_AllowsRootParentTagForParentRestrictedTagHe
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var result = TagHelperFacts.GetTagHelpersGivenParent(
             documentContext,
@@ -299,7 +299,7 @@ public void GetTagHelpersGivenParent_AllowsUnspecifiedParentTagHelpers()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var result = TagHelperFacts.GetTagHelpersGivenParent(
             documentContext,
@@ -321,7 +321,7 @@ public void GetTagHelpersGivenParent_RestrictsTagHelpersBasedOnParent()
                 .Build()
         ];
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers);
 
         var result = TagHelperFacts.GetTagHelpersGivenParent(
             documentContext,
diff --git a/src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Completion/LegacyTagHelperCompletionServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Completion/LegacyTagHelperCompletionServiceTest.cs
@@ -1282,7 +1282,7 @@ private static ElementCompletionContext BuildElementCompletionContext(
         bool containingParentIsTagHelper = false,
         string? tagHelperPrefix = null)
     {
-        var documentContext = TagHelperDocumentContext.Create(tagHelperPrefix, tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelperPrefix, tagHelpers);
         var completionContext = new ElementCompletionContext(
             documentContext,
             existingCompletions,
@@ -1305,7 +1305,7 @@ private static AttributeCompletionContext BuildAttributeCompletionContext(
     {
         attributes = attributes.NullToEmpty();
 
-        var documentContext = TagHelperDocumentContext.Create(tagHelperPrefix, tagHelpers);
+        var documentContext = TagHelperDocumentContext.GetOrCreate(tagHelperPrefix, tagHelpers);
         var completionContext = new AttributeCompletionContext(
             documentContext,
             existingCompletions,
diff --git a/src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs b/src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs
@@ -211,7 +211,7 @@ private static IVisualStudioRazorParser CreateParser(string text, params Directi
         var syntaxTree = RazorSyntaxTree.Parse(source, codeDocument.ParserOptions);
         codeDocument.SetSyntaxTree(syntaxTree);
 
-        codeDocument.SetTagHelperContext(TagHelperDocumentContext.Create(tagHelpers: []));
+        codeDocument.SetTagHelperContext(TagHelperDocumentContext.GetOrCreate(tagHelpers: []));
 
         var parserMock = new StrictMock<IVisualStudioRazorParser>();
         parserMock
diff --git a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostRenameEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostRenameEndpointTest.cs
@@ -17,6 +17,8 @@
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
+[CollectionDefinition(nameof(CohostRenameEndpointTest), DisableParallelization = true)]
+[Collection(nameof(CohostRenameEndpointTest))]
 public class CohostRenameEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper)
 {
     [Fact]

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected override void ExecuteCore(RazorCodeDocument codeDocument, Cancellation`
`51`	`51`	`// This will always be null for a component document.`
`52`	`52`	`var tagHelperPrefix = visitor.TagHelperPrefix;`
`53`	`53`
`54`		`- var context = TagHelperDocumentContext.Create(tagHelperPrefix, visitor.GetResults());`
	`54`	`+ var context = TagHelperDocumentContext.GetOrCreate(tagHelperPrefix, visitor.GetResults());`
`55`	`55`	`codeDocument.SetTagHelperContext(context);`
`56`	`56`	`codeDocument.SetPreTagHelperSyntaxTree(syntaxTree);`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Microsoft.CodeAnalysis.Razor.Completion;`
`13`	`13`
`14`	`14`	`public class DirectiveAttributeTransitionCompletionItemProviderTest(ITestOutputHelper testOutput) : ToolingTestBase(testOutput)`
`15`	`15`	`{`
`16`		`- private readonly TagHelperDocumentContext _tagHelperDocumentContext = TagHelperDocumentContext.Create(tagHelpers: []);`
	`16`	`+ private readonly TagHelperDocumentContext _tagHelperDocumentContext = TagHelperDocumentContext.GetOrCreate(tagHelpers: []);`
`17`	`17`	`private readonly DirectiveAttributeTransitionCompletionItemProvider _provider = new(TestLanguageServerFeatureOptions.Instance);`
`18`	`18`
`19`	`19`	`[Fact]`