Fix diagnostics

kzrnm · Oct 21, 2023 · 6e81c6c · 6e81c6c
1 parent 3fbe0a8
commit 6e81c6c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Source/SourceExpander.Generating.Common/CompilationExpander.cs b/Source/SourceExpander.Generating.Common/CompilationExpander.cs
@@ -105,7 +105,7 @@ static IEnumerable<string> TypeNameToNamespaces(string typeName)
 
             static void Target(StringBuilder sb, ICompilationUnitSyntax newRoot)
             {
-                using var sr = new StringReader(newRoot.ToString());
+                using var sr = new StringReader(newRoot.ToString()!);
                 var line = sr.ReadLine();
                 while (line != null)
                 {
@@ -115,7 +115,7 @@ static void Target(StringBuilder sb, ICompilationUnitSyntax newRoot)
             }
         }
 
-        public string ExpandAll(CancellationToken cancellationToken)
+        public string ExpandAllForTesting(CancellationToken cancellationToken)
         {
             var sb = new StringBuilder();
             sb.AppendLine("namespace SourceExpander.Testing{");
@@ -126,7 +126,7 @@ public string ExpandAll(CancellationToken cancellationToken)
             var files = sourceFileContainer.ToArray();
             Array.Sort(files.Select(f => f.FileName).ToArray(), files);
             Embedded(sb, files, Array.Empty<string>(), cancellationToken);
-            sb.Append("}");
+            sb.Append('}');
             return sb.ToString();
         }
 

diff --git a/Source/SourceExpander.Generating.Common/EmbeddedLoader.cs b/Source/SourceExpander.Generating.Common/EmbeddedLoader.cs
@@ -133,6 +133,9 @@ SyntaxTree Rewrited(SyntaxTree tree)
         /// </summary>
         public bool IsEmbeddedEmpty => container.Count == 0;
 
-        public string ExpandAll(CancellationToken token) => new CompilationExpander(compilation, container, config).ExpandAll(token);
+        /// <summary>
+        /// Expand all source for testing.
+        /// </summary>
+        public string ExpandAllForTesting(CancellationToken token) => new CompilationExpander(compilation, container, config).ExpandAllForTesting(token);
     }
 }
diff --git a/Source/SourceExpander.Generator/ExpandGeneratorBase.cs b/Source/SourceExpander.Generator/ExpandGeneratorBase.cs
@@ -56,7 +56,7 @@ internal void Execute(IContextWrappter ctx, CSharpCompilation compilation, Parse
                 if (config.ExpandingAll)
                 {
                     ctx.CancellationToken.ThrowIfCancellationRequested();
-                    ctx.AddSource("SourceExpander.ExpandingAll.cs", loader.ExpandAll(ctx.CancellationToken));
+                    ctx.AddSource("SourceExpander.ExpandingAll.cs", loader.ExpandAllForTesting(ctx.CancellationToken));
                 }
 
                 var expandedCode = CreateExpanded(loader.ExpandedCodes());