Code cleanup

YesNt.CodeEditor/Editor.cs

@@ -399,4 +399,4 @@ internal enum Mode
     Edit,
     Command,
     Debug
-}
+}

YesNt.CodeEditor/InputHandler.cs

@@ -387,4 +387,4 @@ internal class InputHandler(TextEditor textEditor)
         textEditor.IsStepDebugMode = false;
         textEditor.EditMode = previousMode;
     }
-}
+}

YesNt.CodeEditor/SyntaxHighlighter.cs

@@ -173,4 +173,4 @@ internal partial class SyntaxHighlighter(ReadOnlyCollection<StatementInformation
     // This regex matches the color information embedded in the string, which is in the format \x01{colorIndex}\x01{base64EncodedValue}.
     [GeneratedRegex(@"(?<=(\x01))(.*)(?=\x01)")]
     private static partial Regex StringColorRegex();
-}
+}

YesNt.Interpreter.App/Program.cs

@@ -10,4 +10,4 @@ if (args.Length == 1)
 else
 {
     Console.WriteLine("No path specified!");
-}
+}

YesNt.Interpreter.Tests/AddStatementTests.cs

@@ -333,4 +333,4 @@ public class AddStatementTests
             interpreter.AddStatement("var", SearchMode.StartOfLine, SpaceAround.End, _ => { });
         });
     }
-}
+}

YesNt.Interpreter.Tests/CodeFlowStatementsTests.cs

@@ -77,5 +77,4 @@ public class CodeFlowStatementsTests
 
         YesNtAssert.ContainsTerminationMessage(lines, "Function \"nowhere\" not found");
     }
-}
+}
-

YesNt.Interpreter.Tests/CodeFlowTests.cs

@@ -285,5 +285,4 @@ public class CodeFlowTests
 
         YesNtAssert.ContainsTerminationMessage(lines, "No matching while found");
     }
-}
+}
-

YesNt.Interpreter.Tests/ConsoleStatementsTests.cs

@@ -106,5 +106,4 @@ public class ConsoleStatementsTests
 
         StringAssert.Contains(output.ToString(), "Terminated by external process");
     }
-}
+}
-

YesNt.Interpreter.Tests/FunctionStatementsTests.cs

@@ -223,5 +223,4 @@ public class FunctionStatementsTests
 
         YesNtAssert.IsLastLineEqual(lines, "outer_val");
     }
-}
+}
-

YesNt.Interpreter.Tests/ListStatementsTests.cs

@@ -158,4 +158,4 @@ public class ListStatementsTests
 
         YesNtAssert.IsLastLineEqual(lines, "hello world");
     }
-}
+}

YesNt.Interpreter.Tests/PredefinedVariableStatementsTests.cs

@@ -104,4 +104,4 @@ public class PredefinedVariableStatementsTests
         Assert.IsTrue(int.TryParse(parts[0], out _));
         Assert.IsTrue(int.TryParse(parts[1], out _));
     }
-}
+}

YesNt.Interpreter.Tests/ProcessingStatementsTests.cs

@@ -198,5 +198,4 @@ public class ProcessingStatementsTests
 
         YesNtAssert.IsLastLineEqual(lines, "2", timeout: 3000);
     }
-}
+}
-

YesNt.Interpreter.Tests/StringLiteralStatementsTests.cs

@@ -110,4 +110,4 @@ public class StringLiteralStatementsTests
 
         YesNtAssert.ContainsTerminationMessage(lines, "Invalid string literal");
     }
-}
+}

YesNt.Interpreter.Tests/SystemStatementsTests.cs

@@ -45,5 +45,4 @@ public class SystemStatementsTests
 
         YesNtAssert.ContainsTerminationMessage(lines, "Failed to start \"does_not_exist_abc_xyz\"");
     }
-}
+}
-

YesNt.Interpreter.Tests/VariableStatementsTests.cs

@@ -128,5 +128,4 @@ public class VariableStatementsTests
 
         YesNtAssert.ContainsTerminationMessage(lines, "Variable \"missing\" not found");
     }
-}
+}
-

YesNt.Interpreter.Tests/YesNtAssert.cs

@@ -123,4 +123,4 @@ internal static class YesNtAssert
 
         return (debugEventArgs, outputBuilder.ToString());
     }
-}
+}

YesNt.Interpreter/Attributes/StatementAttribute.cs

@@ -107,4 +107,4 @@ public class StatementAttribute : Attribute
         SpaceAround = spaceAround;
         IgnoreSyntaxHighlighting = true;
     }
-}
+}

YesNt.Interpreter/Runtime/ExitMessages.cs

@@ -80,4 +80,4 @@ internal static class ExitMessages
     {
         return $"Failed to start \"{program}\". {message}";
     }
-}
+}

YesNt.Interpreter/Runtime/FunctionScope.cs

@@ -25,4 +25,4 @@ internal class FunctionScope(int callerLine, Stack<string> arguments)
 
     /// <summary>Gets the stack of output values pushed via <c>push_out</c>, consumed by the caller via <c>%out</c>.</summary>
     public Stack<string> Results { get; } = new();
-}
+}

YesNt.Interpreter/Runtime/Line.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
+namespace YesNt.Interpreter.Runtime;
-
-namespace YesNt.Interpreter.Runtime;
 
 /// <summary>
 /// Represents a single source line together with its location metadata.

YesNt.Interpreter/Runtime/RuntimeInformation.cs

@@ -197,4 +197,4 @@ internal sealed class RuntimeInformation
     {
         Exit(ExitMessages.TerminatedByParentTask, stopAllTasks);
     }
-}
+}

YesNt.Interpreter/Runtime/StatementHandler.cs

@@ -1,4 +1,5 @@
 using System;
+
 using YesNt.Interpreter.Attributes;
 
 namespace YesNt.Interpreter.Runtime;
@@ -6,4 +7,4 @@ namespace YesNt.Interpreter.Runtime;
 /// <summary>
 /// Pre-calculated statement handler information for faster matching.
 /// </summary>
-internal record StatementHandler(StatementAttribute Attribute, Action<string> Handler, string FullName);
+internal record StatementHandler(StatementAttribute Attribute, Action<string> Handler, string FullName);

YesNt.Interpreter/Runtime/YesNtInterpreter.cs

@@ -430,9 +430,9 @@ public class YesNtInterpreter
     {
         runtimeInfo.BlockBoundaries.Clear();
         lineMatchingHandlers = new List<List<StatementHandler>>(runtimeInfo.Lines.Count);
-        
+
         // Dictionary to track open blocks by their expected end statement name
-        var openBlocks = new Dictionary<string, Stack<int>>();
+        Dictionary<string, Stack<int>> openBlocks = [];
 
         for (int i = 0; i < runtimeInfo.Lines.Count; i++)
         {
@@ -449,7 +449,7 @@ public class YesNtInterpreter
                     string blockPair = handler.Attribute.BlockPair;
                     if (!string.IsNullOrEmpty(blockPair) && !handler.Attribute.IsBlockIntermediate)
                     {
-                        if (!openBlocks.TryGetValue(blockPair, out var stack))
+                        if (!openBlocks.TryGetValue(blockPair, out Stack<int> stack))
                         {
                             stack = new Stack<int>();
                             openBlocks[blockPair] = stack;
@@ -460,7 +460,7 @@ public class YesNtInterpreter
                     // Track block ends
                     if (handler.Attribute.IsBlockEnd)
                     {
-                        if (openBlocks.TryGetValue(handler.Attribute.Name, out var stack) && stack.Count > 0)
+                        if (openBlocks.TryGetValue(handler.Attribute.Name, out Stack<int> stack) && stack.Count > 0)
                         {
                             int startLine = stack.Pop();
                             runtimeInfo.BlockBoundaries[startLine] = i;
@@ -474,7 +474,7 @@ public class YesNtInterpreter
                         string intermediatePair = handler.Attribute.BlockPair;
                         if (!string.IsNullOrEmpty(intermediatePair))
                         {
-                            if (!openBlocks.TryGetValue(intermediatePair, out var stack))
+                            if (!openBlocks.TryGetValue(intermediatePair, out Stack<int> stack))
                             {
                                 stack = new Stack<int>();
                                 openBlocks[intermediatePair] = stack;
@@ -507,4 +507,4 @@ public class YesNtInterpreter
             _ => false
         };
     }
-}
+}

YesNt.Interpreter/Statements/CodeFlowStatements.cs

@@ -279,4 +279,4 @@ internal class CodeFlowStatements : StatementRuntimeInformation
     {
         return RuntimeInfo.BlockBoundaries.TryGetValue(currentLine, out int cached) ? cached : -1;
     }
-}
+}

YesNt.Interpreter/Statements/ConsoleStatements.cs

@@ -63,4 +63,4 @@ internal class ConsoleStatements : StatementRuntimeInformation
     {
         Console.Clear();
     }
-}
+}

YesNt.Interpreter/Statements/FunctionStatements.cs

@@ -173,4 +173,4 @@ internal class FunctionStatements : StatementRuntimeInformation
     {
         RuntimeInfo.FunctionCallStack.Clear();
     }
-}
+}

YesNt.Interpreter/Statements/ListStatements.cs

@@ -271,4 +271,4 @@ internal class ListStatements : StatementRuntimeInformation
 
         return true;
     }
-}
+}

YesNt.Interpreter/Statements/PredefinedVariableStatements.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
 
 using YesNt.Interpreter.Attributes;
 using YesNt.Interpreter.Enums;
@@ -47,4 +46,4 @@ internal class PredefinedVariableStatements : StatementRuntimeInformation
     {
         RuntimeInfo.CurrentLine = TemplateProcessor.ProcessDynamicPlaceholders(args, "%rand", () => random.Next(32767, int.MaxValue).ToString()).TrimEnd();
     }
-}
+}

YesNt.Interpreter/Statements/ProcessingStatements.cs

@@ -103,4 +103,4 @@ internal partial class ProcessingStatements : StatementRuntimeInformation
 
     [GeneratedRegex("[0-9*+().,^%/-]+[0-9*+ ().,^%/-]+[0-9*+().,^%/-]+")]
     private static partial Regex CalculationRegex();
-}
+}

YesNt.Interpreter/Statements/StringLiteralStatements.cs

@@ -79,4 +79,4 @@ internal class StringLiteralStatements : StatementRuntimeInformation
             _ => escapeChar
         };
     }
-}
+}

YesNt.Interpreter/Statements/SystemStatements.cs

@@ -116,4 +116,4 @@ internal class SystemStatements : StatementRuntimeInformation
         RuntimeInfo.OutParametersStack = new(outputStack);
         RuntimeInfo.OutParametersStack.Push(process.ExitCode.ToString());
     }
-}
+}

YesNt.Interpreter/Statements/VariableStatements.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 using YesNt.Interpreter.Attributes;
@@ -65,4 +64,4 @@ internal partial class VariableStatements : StatementRuntimeInformation
     {
         RuntimeInfo.CurrentLine = TemplateProcessor.ProcessVariables(RuntimeInfo.CurrentLine, RuntimeInfo);
     }
-}
+}

YesNt.Interpreter/Utilities/Evaluator.cs

@@ -214,4 +214,4 @@ internal static partial class Evaluator
 
     [GeneratedRegex("(\\+ +\\-)+")]
     private static partial Regex PlusMinusRegex();
-}
+}

YesNt.Interpreter/Utilities/TemplateProcessor.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
+
 using YesNt.Interpreter.Runtime;
 
 namespace YesNt.Interpreter.Utilities;
@@ -16,33 +17,39 @@ internal static class TemplateProcessor
     /// </summary>
     public static string ProcessVariables(string input, RuntimeInformation runtimeInfo)
     {
-        if (string.IsNullOrEmpty(input)) return input;
+        if (string.IsNullOrEmpty(input))
+        {
+            return input;
+        }
 
         int startIdx = input.IndexOf("${", StringComparison.Ordinal);
-        if (startIdx == -1) return input;
+        if (startIdx == -1)
+        {
+            return input;
+        }
 
         StringBuilder sb = new StringBuilder(input.Length);
         int lastIdx = 0;
 
         while (startIdx != -1)
         {
-            sb.Append(input, lastIdx, startIdx - lastIdx);
+            _ = sb.Append(input, lastIdx, startIdx - lastIdx);
             int endIdx = input.IndexOf('}', startIdx + 2);
             if (endIdx == -1)
             {
-                sb.Append("${");
+                _ = sb.Append("${");
                 lastIdx = startIdx + 2;
             }
             else
             {
-                string varName = input.Substring(startIdx + 2, endIdx - (startIdx + 2));
+                string varName = input[(startIdx + 2)..endIdx];
                 if (runtimeInfo.Variables.TryGetValue(varName, out string value))
                 {
-                    sb.Append(value);
+                    _ = sb.Append(value);
                 }
                 else if (runtimeInfo.GlobalVariables.TryGetValue(varName, out value))
                 {
-                    sb.Append(value);
+                    _ = sb.Append(value);
                 }
                 else if (!runtimeInfo.IsSearching)
                 {
@@ -51,9 +58,9 @@ internal static class TemplateProcessor
                 }
                 else
                 {
-                    sb.Append("${");
+                    _ = sb.Append("${");
-                    sb.Append(varName);
+                    _ = sb.Append(varName);
-                    sb.Append('}');
+                    _ = sb.Append('}');
                 }
 
                 lastIdx = endIdx + 1;
@@ -62,7 +69,7 @@ internal static class TemplateProcessor
             startIdx = input.IndexOf("${", lastIdx, StringComparison.Ordinal);
         }
 
-        sb.Append(input, lastIdx, input.Length - lastIdx);
+        _ = sb.Append(input, lastIdx, input.Length - lastIdx);
         return sb.ToString();
     }
 
@@ -71,10 +78,16 @@ internal static class TemplateProcessor
     /// </summary>
     public static string ProcessStackParameters(string input, string placeholder, Stack<string> stack, RuntimeInformation runtimeInfo, string emptyStackMessage)
     {
-        if (string.IsNullOrEmpty(input)) return input;
+        if (string.IsNullOrEmpty(input))
+        {
+            return input;
+        }
 
         int startIdx = input.IndexOf(placeholder, StringComparison.Ordinal);
-        if (startIdx == -1) return input;
+        if (startIdx == -1)
+        {
+            return input;
+        }
 
         StringBuilder sb = new StringBuilder(input.Length);
         int lastIdx = 0;
@@ -82,18 +95,18 @@ internal static class TemplateProcessor
 
         while (startIdx != -1)
         {
-            sb.Append(input, lastIdx, startIdx - lastIdx);
+            _ = sb.Append(input, lastIdx, startIdx - lastIdx);
             if (stack.Count == 0)
             {
                 runtimeInfo.Exit(emptyStackMessage, true);
                 return input;
             }
-            sb.Append(stack.Pop());
+            _ = sb.Append(stack.Pop());
             lastIdx = startIdx + placeholderLen;
             startIdx = input.IndexOf(placeholder, lastIdx, StringComparison.Ordinal);
         }
 
-        sb.Append(input, lastIdx, input.Length - lastIdx);
+        _ = sb.Append(input, lastIdx, input.Length - lastIdx);
         return sb.ToString();
     }
 
@@ -102,9 +115,7 @@ internal static class TemplateProcessor
     /// </summary>
     public static string ProcessSimplePlaceholders(string input, string placeholder, string value)
     {
-        if (string.IsNullOrEmpty(input)) return input;
+        return string.IsNullOrEmpty(input) ? input : input.Replace(placeholder, value, StringComparison.Ordinal);
-
-        return input.Replace(placeholder, value, StringComparison.Ordinal);
     }
 
     /// <summary>
@@ -112,10 +123,16 @@ internal static class TemplateProcessor
     /// </summary>
     public static string ProcessDynamicPlaceholders(string input, string placeholder, Func<string> valueProvider)
     {
-        if (string.IsNullOrEmpty(input)) return input;
+        if (string.IsNullOrEmpty(input))
+        {
+            return input;
+        }
 
         int startIdx = input.IndexOf(placeholder, StringComparison.Ordinal);
-        if (startIdx == -1) return input;
+        if (startIdx == -1)
+        {
+            return input;
+        }
 
         StringBuilder sb = new StringBuilder(input.Length);
         int lastIdx = 0;
@@ -123,13 +140,13 @@ internal static class TemplateProcessor
 
         while (startIdx != -1)
         {
-            sb.Append(input, lastIdx, startIdx - lastIdx);
+            _ = sb.Append(input, lastIdx, startIdx - lastIdx);
-            sb.Append(valueProvider());
+            _ = sb.Append(valueProvider());
             lastIdx = startIdx + placeholderLen;
             startIdx = input.IndexOf(placeholder, lastIdx, StringComparison.Ordinal);
         }
 
-        sb.Append(input, lastIdx, input.Length - lastIdx);
+        _ = sb.Append(input, lastIdx, input.Length - lastIdx);
         return sb.ToString();
     }
 
@@ -138,10 +155,16 @@ internal static class TemplateProcessor
     /// </summary>
     public static string ProcessCalculations(string input, RuntimeInformation runtimeInfo, Regex calculationRegex)
     {
-        if (string.IsNullOrEmpty(input)) return input;
+        if (string.IsNullOrEmpty(input))
+        {
+            return input;
+        }
 
         MatchCollection matches = calculationRegex.Matches(input);
-        if (matches.Count == 0) return input;
+        if (matches.Count == 0)
+        {
+            return input;
+        }
 
         StringBuilder sb = new StringBuilder(input.Length);
         int lastIdx = 0;
@@ -149,19 +172,19 @@ internal static class TemplateProcessor
         for (int i = 0; i < matches.Count; i++)
         {
             Match match = matches[i];
-            sb.Append(input, lastIdx, match.Index - lastIdx);
+            _ = sb.Append(input, lastIdx, match.Index - lastIdx);
-            
+
             string res = Evaluator.Calculate(match.Value);
             if (res is null)
             {
                 runtimeInfo.Exit(ExitMessages.InvalidOperation, true);
                 return input;
             }
-            sb.Append(res);
+            _ = sb.Append(res);
             lastIdx = match.Index + match.Length;
         }
 
-        sb.Append(input, lastIdx, input.Length - lastIdx);
+        _ = sb.Append(input, lastIdx, input.Length - lastIdx);
         return sb.ToString();
     }
-}
+}

YesNt.Interpreter/YesNt.Interpreter.csproj

@@ -47,6 +47,13 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="10.20.0.135146">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\YesNt.Interpreter.Generator\YesNt.Interpreter.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>