Merge pull request #340 from dotnetcore/any

fixed code
dotnetcore · Jul 1, 2024 · f4a08a4 · f4a08a4
2 parents 14334f9 + 0ebb0f1
commit f4a08a4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/...atasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.SG/HotExecutorGenerator.cs b/...atasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.SG/HotExecutorGenerator.cs
@@ -1,7 +1,5 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using System;
-using System.Diagnostics;
 using System.Linq;
 
 namespace Natasha.CSharp.Extension.HotExecutor.SG

diff --git a/...p/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/ConsoleWriter.cs b/...p/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/ConsoleWriter.cs
@@ -12,7 +12,7 @@ internal static class ConsoleWriter
                 var node = blockSyntax.Statements.Last();
                 if (node.IsKind(Microsoft.CodeAnalysis.CSharp.SyntaxKind.ExpressionStatement))
                 {
-                    if (node.ToString() == "Console.ReadKey();")
+                    if (node.ToString().StartsWith("Console.Read"))
                     {
                         return blockSyntax.RemoveNode(node, SyntaxRemoveOptions.KeepExteriorTrivia);
                     }

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/Component/Exception/NatashaExceptionAnalyzer.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/Component/Exception/NatashaExceptionAnalyzer.cs
@@ -12,22 +12,24 @@ internal sealed class NatashaExceptionAnalyzer
         {
 
             var diagnostics = tree.GetDiagnostics();
-            var errors = diagnostics.Where(item => !item.IsSuppressed).ToArray();
-            if (errors.Length > 0)
+            if (diagnostics.Any())
             {
-                var first = errors.FirstOrDefault(item => item.DefaultSeverity == DiagnosticSeverity.Error);
-                if (first == null)
+                var errors = diagnostics.Where(item => !item.IsSuppressed).ToArray();
+                if (errors != null && errors.Length > 0)
                 {
-                    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();
+                    exception.ErrorKind = NatashaExceptionKind.Syntax;
+                    return exception;
                 }
-                var exception = new NatashaException(first.GetMessage());
-                exception.Diagnostics.AddRange(errors);
-                exception.Formatter = tree.ToString();
-                exception.ErrorKind = NatashaExceptionKind.Syntax;
-                return exception;
             }
             return null;
-
         }
 
         internal static NatashaException GetCompileException(CSharpCompilation compilation, ImmutableArray<Diagnostic> errors)