Merge pull request #12043 from Altua/generator-cancellation-token

Use CancellationToken in AvaloniaNameGenerator
AvaloniaUI · Jul 6, 2023 · 9806f27 · 9806f27
2 parents 605c880 + f0b5220
commit 9806f27
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/tools/Avalonia.Generators/NameGenerator/AvaloniaNameGenerator.cs b/src/tools/Avalonia.Generators/NameGenerator/AvaloniaNameGenerator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using Avalonia.Generators.Common.Domain;
 using Microsoft.CodeAnalysis;
 
@@ -31,15 +32,16 @@ public AvaloniaNameGenerator(
         _code = code;
     }
 
-    public IReadOnlyList<GeneratedPartialClass> GenerateNameReferences(IEnumerable<AdditionalText> additionalFiles)
+    public IEnumerable<GeneratedPartialClass> GenerateNameReferences(IEnumerable<AdditionalText> additionalFiles, CancellationToken cancellationToken)
     {
         var resolveViews =
             from file in additionalFiles
             where (file.Path.EndsWith(".xaml") ||
                    file.Path.EndsWith(".paml") ||
                    file.Path.EndsWith(".axaml")) &&
                   _pathPattern.Matches(file.Path)
-            let xaml = file.GetText()!.ToString()
+            let xaml = file.GetText(cancellationToken)?.ToString()
+            where xaml != null
             let view = _classes.ResolveView(xaml)
             where view != null && _namespacePattern.Matches(view.Namespace)
             select view;
@@ -51,7 +53,7 @@ from view in resolveViews
             let fileName = ResolveViewFileName(view, _naming)
             select new GeneratedPartialClass(fileName, code);
 
-        return query.ToList();
+        return query;
     }
 
     private static string ResolveViewFileName(ResolvedView view, ViewFileNamingStrategy strategy) => strategy switch

diff --git a/src/tools/Avalonia.Generators/NameGenerator/AvaloniaNameSourceGenerator.cs b/src/tools/Avalonia.Generators/NameGenerator/AvaloniaNameSourceGenerator.cs
@@ -22,8 +22,19 @@ public void Execute(GeneratorExecutionContext context)
                 return;
             }
 
-            var partials = generator.GenerateNameReferences(context.AdditionalFiles);
-            foreach (var (fileName, content) in partials) context.AddSource(fileName, content);
+            var partials = generator.GenerateNameReferences(context.AdditionalFiles, context.CancellationToken);
+            foreach (var (fileName, content) in partials)
+            {
+                if(context.CancellationToken.IsCancellationRequested)
+                {
+                    break;
+                }
+
+                context.AddSource(fileName, content);
+            }
+        }
+        catch (OperationCanceledException)
+        {
         }
         catch (Exception exception)
         {

diff --git a/src/tools/Avalonia.Generators/NameGenerator/INameGenerator.cs b/src/tools/Avalonia.Generators/NameGenerator/INameGenerator.cs
@@ -1,11 +1,12 @@
 using System.Collections.Generic;
+using System.Threading;
 using Microsoft.CodeAnalysis;
 
 namespace Avalonia.Generators.NameGenerator;
 
 internal interface INameGenerator
 {
-    IReadOnlyList<GeneratedPartialClass> GenerateNameReferences(IEnumerable<AdditionalText> additionalFiles);
+    IEnumerable<GeneratedPartialClass> GenerateNameReferences(IEnumerable<AdditionalText> additionalFiles, CancellationToken cancellationToken);
 }
 
 internal record GeneratedPartialClass(string FileName, string Content);