Merge pull request #8859 from DustinCampbell/tweak-disposable-action

Change DisposableAction to ref struct

Author: DustinCampbell

src/Compiler/Microsoft.AspNetCore.Razor.Language/src/Legacy/DisposableAction.cs

@@ -1,25 +1,18 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy;
 
-internal class DisposableAction : IDisposable
+internal ref struct DisposableAction
 {
     private readonly Action _action;
     private bool _invoked;
 
     public DisposableAction(Action action)
     {
-        if (action == null)
-        {
-            throw new ArgumentNullException(nameof(action));
-        }
-
-        _action = action;
+        _action = action ?? throw new ArgumentNullException(nameof(action));
     }
 
     public void Dispose()

src/Compiler/Microsoft.AspNetCore.Razor.Language/src/Legacy/TokenizerBackedParser.cs

@@ -626,17 +626,17 @@ protected TNode GetNodeWithEditHandler<TNode>(TNode node) where TNode : Syntax.G
         return (TNode)node.SetAnnotations(new[] { annotation });
     }
 
-    protected IDisposable PushSpanContextConfig()
+    protected DisposableAction PushSpanContextConfig()
     {
         return PushSpanContextConfig(newConfig: (SpanContextConfigActionWithPreviousConfig)null);
     }
 
-    protected IDisposable PushSpanContextConfig(SpanContextConfigAction newConfig)
+    protected DisposableAction PushSpanContextConfig(SpanContextConfigAction newConfig)
     {
         return PushSpanContextConfig(newConfig == null ? null : (SpanEditHandlerBuilder span, ref ISpanChunkGenerator chunkGenerator, SpanContextConfigAction _) => newConfig(span, ref chunkGenerator));
     }
 
-    protected IDisposable PushSpanContextConfig(SpanContextConfigActionWithPreviousConfig  newConfig)
+    protected DisposableAction PushSpanContextConfig(SpanContextConfigActionWithPreviousConfig  newConfig)
     {
         var old = SpanContextConfig;
         ConfigureSpanContext(newConfig);

src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BackgroundParser.cs

@@ -58,7 +58,7 @@ public void Dispose()
         _main.Dispose();
     }
 
-    public IDisposable SynchronizeMainThreadState()
+    public DisposableAction SynchronizeMainThreadState()
     {
         return _main.Lock();
     }
@@ -147,7 +147,7 @@ public void Cancel()
             _cancelSource.Cancel();
         }
 
-        public IDisposable Lock()
+        public DisposableAction Lock()
         {
             Monitor.Enter(_stateLock);
             return new DisposableAction(() => Monitor.Exit(_stateLock));

src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParser.cs

@@ -8,6 +8,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.CodeAnalysis.Razor;
@@ -326,7 +327,7 @@ private void TextBuffer_OnChanged(object sender, TextContentChangedEventArgs arg
         var change = new SourceChange(changeInformation.firstChange.OldPosition, changeInformation.oldText.Length, changeInformation.newText);
         var result = PartialParseResultInternal.Rejected;
         RazorSyntaxTree? partialParseSyntaxTree = null;
-        using (_parser!.SynchronizeMainThreadState())
+        using (_parser.AssumeNotNull().SynchronizeMainThreadState())
         {
             // Check if we can partial-parse
             if (_partialParser is not null && _parser.IsIdle)