Update NatashaExceptionAnalyzer.cs

dotnetcore · Jul 1, 2024 · ae62595 · ae62595
1 parent 77dc858
commit ae62595
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/Component/Exception/NatashaExceptionAnalyzer.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/Component/Exception/NatashaExceptionAnalyzer.cs
@@ -13,9 +13,13 @@ internal sealed class NatashaExceptionAnalyzer
 
             var diagnostics = tree.GetDiagnostics();
             var errors = diagnostics.Where(item => !item.IsSuppressed).ToArray();
-            if (errors.Length>0)
+            if (errors.Length > 0)
             {
-                var first = errors[0];
+                var first = errors.FirstOrDefault(item => item.DefaultSeverity == DiagnosticSeverity.Error);
+                if (first == null)
+                {
+                    first = errors[0];
+                }
                 var exception = new NatashaException(first.GetMessage());
                 exception.Diagnostics.AddRange(errors);
                 exception.Formatter = tree.ToString();
@@ -28,14 +32,18 @@ internal sealed class NatashaExceptionAnalyzer
 
         internal static NatashaException GetCompileException(CSharpCompilation compilation, ImmutableArray<Diagnostic> errors)
         {
-            var first = errors[0];
+            var first = errors.FirstOrDefault(item=>item.DefaultSeverity == DiagnosticSeverity.Error);
+            if (first == null)
+            {
+                first = errors[0];
+            }   
             var exception = new NatashaException(first.GetMessage());
             exception.Diagnostics.AddRange(errors);
-            if (first.Location.SourceTree!=null)
+            if (first.Location.SourceTree != null)
             {
                 exception.Formatter = first.Location.SourceTree.ToString();
             }
-            else if(compilation.SyntaxTrees.Length > 0)
+            else if (compilation.SyntaxTrees.Length > 0)
             {
                 exception.Formatter = compilation.SyntaxTrees[0].ToString();
             }