Allow RazorProjectEngine.Process to be cancelled

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs

@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System.Text;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Xunit;

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs

@@ -4,7 +4,6 @@
 #nullable disable
 
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Roslyn.Test.Utilities;
 using Xunit;

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs

@@ -4,7 +4,6 @@
 #nullable disable
 
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Roslyn.Test.Utilities;
 using Xunit;

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ConsolidatedMvcViewDocumentClassifierPassTest.cs

@@ -4,7 +4,6 @@
 #nullable disable
 
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Roslyn.Test.Utilities;
 using Xunit;

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs

@@ -4,7 +4,6 @@
 #nullable disable
 
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Roslyn.Test.Utilities;
 using Xunit;

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/RazorEngineTest.cs

@@ -70,7 +70,7 @@ private sealed class TestPhase : RazorEnginePhaseBase
     {
         public int CallCount;
 
-        protected override void ExecuteCore(RazorCodeDocument codeDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
         {
             Interlocked.Increment(ref CallCount);
         }

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorCSharpLoweringPhase.cs

@@ -4,14 +4,15 @@
 #nullable disable
 
 using System;
+using System.Threading;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
 internal class DefaultRazorCSharpLoweringPhase : RazorEnginePhaseBase, IRazorCSharpLoweringPhase
 {
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var documentNode = codeDocument.GetDocumentIntermediateNode();
         ThrowForMissingDocumentDependency(documentNode);

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorDirectiveClassifierPhase.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Immutable;
+using System.Threading;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
@@ -14,7 +15,7 @@ protected override void OnInitialized()
         Passes = Engine.GetFeatures<IRazorDirectiveClassifierPass>().OrderByAsArray(static x => x.Order);
     }
 
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var irDocument = codeDocument.GetDocumentIntermediateNode();
         ThrowForMissingDocumentDependency(irDocument);

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorDocumentClassifierPhase.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Immutable;
+using System.Threading;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
@@ -14,7 +15,7 @@ protected override void OnInitialized()
         Passes = Engine.GetFeatures<IRazorDocumentClassifierPass>().OrderByAsArray(p => p.Order);
     }
 
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var irDocument = codeDocument.GetDocumentIntermediateNode();
         ThrowForMissingDocumentDependency(irDocument);

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorIntermediateNodeLoweringPhase.cs

@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using System.Threading;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
@@ -28,7 +29,7 @@ protected override void OnInitialized()
         _optionsFeature = GetRequiredFeature<IRazorCodeGenerationOptionsFeature>();
     }
 
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var syntaxTree = codeDocument.GetSyntaxTree();
         ThrowForMissingDocumentDependency(syntaxTree);

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorOptimizationPhase.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Immutable;
+using System.Threading;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
@@ -14,7 +15,7 @@ protected override void OnInitialized()
         Passes = Engine.GetFeatures<IRazorOptimizationPass>().OrderByAsArray(static x => x.Order);
     }
 
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var documentNode = codeDocument.GetDocumentIntermediateNode();
         ThrowForMissingDocumentDependency(documentNode);

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorParsingPhase.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Threading;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 
 namespace Microsoft.AspNetCore.Razor.Language;
@@ -15,7 +16,7 @@ protected override void OnInitialized()
         _optionsFeature = GetRequiredFeature<IRazorParserOptionsFeature>();
     }
 
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var options = codeDocument.GetParserOptions() ?? _optionsFeature.AssumeNotNull().GetOptions();
         var syntaxTree = RazorSyntaxTree.Parse(codeDocument.Source, options);

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorSyntaxTreePhase.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Immutable;
+using System.Threading;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
@@ -14,7 +15,7 @@ protected override void OnInitialized()
         Passes = Engine.GetFeatures<IRazorSyntaxTreePass>().OrderByAsArray(static x => x.Order);
     }
 
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var syntaxTree = codeDocument.GetSyntaxTree();
         ThrowForMissingDocumentDependency(syntaxTree);

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorTagHelperContextDiscoveryPhase.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
+using System.Threading;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
@@ -15,7 +16,7 @@ namespace Microsoft.AspNetCore.Razor.Language;
 
 internal sealed partial class DefaultRazorTagHelperContextDiscoveryPhase : RazorEnginePhaseBase
 {
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var syntaxTree = codeDocument.GetPreTagHelperSyntaxTree() ?? codeDocument.GetSyntaxTree();
         ThrowForMissingDocumentDependency(syntaxTree);

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorTagHelperRewritePhase.cs

@@ -1,14 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-#nullable enable
 
+using System.Threading;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
 internal sealed class DefaultRazorTagHelperRewritePhase : RazorEnginePhaseBase
 {
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var syntaxTree = codeDocument.GetPreTagHelperSyntaxTree();
         var context = codeDocument.GetTagHelperContext();

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/IRazorEnginePhase.cs

@@ -1,12 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Threading;
+
 namespace Microsoft.AspNetCore.Razor.Language;
 
 public interface IRazorEnginePhase
 {
     RazorEngine Engine { get; }
 
     void Initialize(RazorEngine engine);
-    void Execute(RazorCodeDocument codeDocument);
+    void Execute(RazorCodeDocument codeDocument, CancellationToken cancellationToken = default);
 }

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorEngine.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
+using System.Threading;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
@@ -31,13 +32,16 @@ internal RazorEngine(ImmutableArray<IRazorEngineFeature> features, ImmutableArra
         }
     }
 
-    public void Process(RazorCodeDocument codeDocument)
+    public void Process(RazorCodeDocument codeDocument, CancellationToken cancellationToken = default)
     {
         ArgHelper.ThrowIfNull(codeDocument);
 
+        cancellationToken.ThrowIfCancellationRequested();
+
         foreach (var phase in Phases)
         {
-            phase.Execute(codeDocument);
+            phase.Execute(codeDocument, cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
         }
     }
 

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorEnginePhaseBase.cs

@@ -29,12 +29,12 @@ public void Initialize(RazorEngine engine)
         OnInitialized();
     }
 
-    public void Execute(RazorCodeDocument codeDocument)
+    public void Execute(RazorCodeDocument codeDocument, CancellationToken cancellationToken = default)
     {
         ArgHelper.ThrowIfNull(codeDocument);
         Assumed.NotNull(_engine, Resources.PhaseMustBeInitialized);
 
-        ExecuteCore(codeDocument);
+        ExecuteCore(codeDocument, cancellationToken);
     }
 
     protected T GetRequiredFeature<T>()
@@ -62,5 +62,5 @@ protected virtual void OnInitialized()
     {
     }
 
-    protected abstract void ExecuteCore(RazorCodeDocument codeDocument);
+    protected abstract void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken);
 }

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorProjectEngine.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
@@ -45,30 +46,31 @@ public ImmutableArray<TFeature> GetFeatures<TFeature>()
         where TFeature : class, IRazorProjectEngineFeature
         => _featureCache.GetFeatures<TFeature>();
 
-    public RazorCodeDocument Process(RazorProjectItem projectItem)
+    public RazorCodeDocument Process(RazorProjectItem projectItem, CancellationToken cancellationToken = default)
     {
         ArgHelper.ThrowIfNull(projectItem);
 
         var codeDocument = CreateCodeDocumentCore(projectItem);
-        ProcessCore(codeDocument);
+        ProcessCore(codeDocument, cancellationToken);
         return codeDocument;
     }
 
     public RazorCodeDocument Process(
         RazorSourceDocument source,
         string fileKind,
         ImmutableArray<RazorSourceDocument> importSources,
-        IReadOnlyList<TagHelperDescriptor>? tagHelpers)
+        IReadOnlyList<TagHelperDescriptor>? tagHelpers,
+        CancellationToken cancellationToken = default)
     {
         ArgHelper.ThrowIfNull(source);
         ArgHelper.ThrowIfNull(fileKind);
 
         var codeDocument = CreateCodeDocumentCore(source, fileKind, importSources, tagHelpers, cssScope: null, configureParser: null, configureCodeGeneration: null);
-        ProcessCore(codeDocument);
+        ProcessCore(codeDocument, cancellationToken);
         return codeDocument;
     }
 
-    public RazorCodeDocument ProcessDeclarationOnly(RazorProjectItem projectItem)
+    public RazorCodeDocument ProcessDeclarationOnly(RazorProjectItem projectItem, CancellationToken cancellationToken = default)
     {
         ArgHelper.ThrowIfNull(projectItem);
 
@@ -77,15 +79,16 @@ public RazorCodeDocument ProcessDeclarationOnly(RazorProjectItem projectItem)
             builder.SuppressPrimaryMethodBody = true;
         });
 
-        ProcessCore(codeDocument);
+        ProcessCore(codeDocument, cancellationToken);
         return codeDocument;
     }
 
     public RazorCodeDocument ProcessDeclarationOnly(
         RazorSourceDocument source,
         string fileKind,
         ImmutableArray<RazorSourceDocument> importSources,
-        IReadOnlyList<TagHelperDescriptor>? tagHelpers)
+        IReadOnlyList<TagHelperDescriptor>? tagHelpers,
+        CancellationToken cancellationToken = default)
     {
         ArgHelper.ThrowIfNull(source);
         ArgHelper.ThrowIfNull(fileKind);
@@ -95,30 +98,31 @@ public RazorCodeDocument ProcessDeclarationOnly(
             builder.SuppressPrimaryMethodBody = true;
         });
 
-        ProcessCore(codeDocument);
+        ProcessCore(codeDocument, cancellationToken);
         return codeDocument;
     }
 
-    public RazorCodeDocument ProcessDesignTime(RazorProjectItem projectItem)
+    public RazorCodeDocument ProcessDesignTime(RazorProjectItem projectItem, CancellationToken cancellationToken = default)
     {
         ArgHelper.ThrowIfNull(projectItem);
 
         var codeDocument = CreateCodeDocumentDesignTimeCore(projectItem);
-        ProcessCore(codeDocument);
+        ProcessCore(codeDocument, cancellationToken);
         return codeDocument;
     }
 
     public RazorCodeDocument ProcessDesignTime(
         RazorSourceDocument source,
         string fileKind,
         ImmutableArray<RazorSourceDocument> importSources,
-        IReadOnlyList<TagHelperDescriptor>? tagHelpers)
+        IReadOnlyList<TagHelperDescriptor>? tagHelpers,
+        CancellationToken cancellationToken = default)
     {
         ArgHelper.ThrowIfNull(source);
         ArgHelper.ThrowIfNull(fileKind);
 
         var codeDocument = CreateCodeDocumentDesignTimeCore(source, fileKind, importSources, tagHelpers, configureParser: null, configureCodeGeneration: null);
-        ProcessCore(codeDocument);
+        ProcessCore(codeDocument, cancellationToken);
         return codeDocument;
     }
 
@@ -225,11 +229,11 @@ private RazorCodeDocument CreateCodeDocumentDesignTimeCore(
         return codeDocument;
     }
 
-    private void ProcessCore(RazorCodeDocument codeDocument)
+    private void ProcessCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         ArgHelper.ThrowIfNull(codeDocument);
 
-        Engine.Process(codeDocument);
+        Engine.Process(codeDocument, cancellationToken);
     }
 
     private TFeature GetRequiredFeature<TFeature>()

src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/ProjectEngineHost/UnsupportedCSharpLoweringPhase.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System.Threading;
 using Microsoft.AspNetCore.Razor.Language;
 
 namespace Microsoft.AspNetCore.Razor.ProjectEngineHost;
@@ -9,7 +10,7 @@ internal class UnsupportedCSharpLoweringPhase : RazorEnginePhaseBase, IRazorCSha
 {
     internal const string UnsupportedDisclaimer = "// Razor CSharp output is not supported for this project's version of Razor.";
 
-    protected override void ExecuteCore(RazorCodeDocument codeDocument)
+    protected override void ExecuteCore(RazorCodeDocument codeDocument, CancellationToken cancellationToken)
     {
         var documentNode = codeDocument.GetDocumentIntermediateNode();
         ThrowForMissingDocumentDependency(documentNode);