Add call CancellationToken.ThrowIfCancellationRequested

kzrnm · Mar 20, 2021 · 80f49ad · 80f49ad
1 parent a761011
commit 80f49ad
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/Source/SourceExpander.Embedder/EmbedderGenerator.cs b/Source/SourceExpander.Embedder/EmbedderGenerator.cs
@@ -44,6 +44,7 @@ public void Execute(GeneratorExecutionContext context)
                         .FirstOrDefault(a =>
                         StringComparer.OrdinalIgnoreCase.Compare(Path.GetFileName(a.Path), CONFIG_FILE_NAME) == 0);
 
+                context.CancellationToken.ThrowIfCancellationRequested();
                 EmbedderConfig config;
                 if (configFile?.GetText(context.CancellationToken) is { } configText)
                 {
@@ -63,6 +64,7 @@ public void Execute(GeneratorExecutionContext context)
                 if (!config.Enabled)
                     return;
 
+                context.CancellationToken.ThrowIfCancellationRequested();
                 var embeddingContext = new EmbeddingContext(
                     compilation,
                     (CSharpParseOptions)context.ParseOptions,

diff --git a/Source/SourceExpander.Embedder/EmbeddingResolver.cs b/Source/SourceExpander.Embedder/EmbeddingResolver.cs
@@ -79,9 +79,11 @@ private EmbeddingAssemblyMetadata ParseEmbeddingAssemblyMetadata()
             if (!config.Enabled)
                 return result;
             var infos = ResolveFiles();
+            cancellationToken.ThrowIfCancellationRequested();
             if (infos.Length == 0)
                 return result;
             var json = JsonUtil.ToJson(infos);
+            cancellationToken.ThrowIfCancellationRequested();
 
             result.IsEnabled = true;
             result.EmbeddedAllowUnsafe = compilation.Options.AllowUnsafe;

diff --git a/Source/SourceExpander.Generator/CompilationExpander.cs b/Source/SourceExpander.Generator/CompilationExpander.cs
@@ -30,7 +30,6 @@ public CompilationExpander(CSharpCompilation compilation, SourceFileContainer so
 
         public string ExpandCode(SyntaxTree origTree, CancellationToken cancellationToken)
         {
-            var sb = new StringBuilder();
             var semanticModel = Compilation.GetSemanticModel(origTree, true);
             var origRoot = origTree.GetCompilationUnitRoot(cancellationToken);
 
@@ -44,6 +43,7 @@ public string ExpandCode(SyntaxTree origTree, CancellationToken cancellationToke
                 .Union(requiedFiles.SelectMany(s => s.Usings))
                 .ToArray();
 
+            var sb = new StringBuilder();
             foreach (var u in SourceFileInfoUtil.SortUsings(usings))
                 sb.AppendLine(u);
 

diff --git a/Source/SourceExpander.Generator/EmbeddedLoader.cs b/Source/SourceExpander.Generator/EmbeddedLoader.cs
@@ -42,7 +42,6 @@ void UpdateCompilation()
             if (compilationUpdated) return;
             compilationUpdated = true;
 
-
             IEnumerable<SyntaxTree> newTrees;
             if (ConcurrentBuild)
                 newTrees = compilation.SyntaxTrees.AsParallel(cancellationToken)
@@ -63,7 +62,7 @@ SyntaxTree Rewrited(SyntaxTree tree)
             if (!_cacheExpandedCodes.IsDefault) return _cacheExpandedCodes;
             if (!config.Enabled) return ImmutableArray<(string filePath, string expandedCode)>.Empty;
             UpdateCompilation();
-
+            cancellationToken.ThrowIfCancellationRequested();
             var expander = new CompilationExpander(compilation, container, config);
             if (ConcurrentBuild)
                 return compilation.SyntaxTrees.AsParallel(cancellationToken)

diff --git a/Source/SourceExpander.Generator/ExpandGenerator.cs b/Source/SourceExpander.Generator/ExpandGenerator.cs
@@ -44,6 +44,7 @@ public void Execute(GeneratorExecutionContext context)
                         .FirstOrDefault(a =>
                             StringComparer.OrdinalIgnoreCase.Compare(Path.GetFileName(a.Path), CONFIG_FILE_NAME) == 0);
 
+                context.CancellationToken.ThrowIfCancellationRequested();
                 ExpandConfig config;
                 if (configFile?.GetText(context.CancellationToken) is { } configText)
                 {
@@ -70,12 +71,13 @@ public void Execute(GeneratorExecutionContext context)
                        SourceText.From(EmbeddingCore.SourceCodeClassCode, Encoding.UTF8));
                 }
 
+                context.CancellationToken.ThrowIfCancellationRequested();
                 var loader = new EmbeddedLoader(compilation, opts, new DiagnosticReporter(context), config, context.CancellationToken);
                 if (loader.IsEmbeddedEmpty)
                     context.ReportDiagnostic(DiagnosticDescriptors.EXPAND0003_NotFoundEmbedded());
-
                 var expandedCode = CreateExpanded(loader.ExpandedCodes());
 
+                context.CancellationToken.ThrowIfCancellationRequested();
                 context.AddSource("SourceExpander.Expanded.cs",
                     SourceText.From(expandedCode, Encoding.UTF8));
             }