code beautification

chrisjbreisch · Jun 22, 2022 · 7819ed3 · 7819ed3
1 parent 170fc75
commit 7819ed3
Show file tree

Hide file tree

Showing 101 changed files with 562 additions and 636 deletions.
diff --git a/Trs80.Level1Basic.Application/Bootstrapper.cs b/Trs80.Level1Basic.Application/Bootstrapper.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.Logging;
 
 using NLog.Extensions.Logging;
+
 using Trs80.Level1Basic.Command;
 using Trs80.Level1Basic.Command.Commands;
 using Trs80.Level1Basic.CommandModels;
@@ -19,6 +20,7 @@
 using Trs80.Level1Basic.VirtualMachine.Parser;
 using Trs80.Level1Basic.VirtualMachine.Scanner;
 using Trs80.Level1Basic.Workflow;
+
 using WorkflowCore.Interface;
 using WorkflowCore.Models;
 using WorkflowCore.Services.DefinitionStorage;
@@ -55,7 +57,7 @@ public Bootstrapper()
         CreateServiceProvider();
 
         GetAppSettings();
-        
+
         GetApplicationName();
 
         LogConfiguredServices();

diff --git a/Trs80.Level1Basic.Application/ConsoleApp.cs b/Trs80.Level1Basic.Application/ConsoleApp.cs
@@ -2,6 +2,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+
 using Trs80.Level1Basic.CommandModels;
 using Trs80.Level1Basic.VirtualMachine.Machine;
 

diff --git a/Trs80.Level1Basic.Command/Commands/InputCommand.cs b/Trs80.Level1Basic.Command/Commands/InputCommand.cs
@@ -1,9 +1,12 @@
-using Trs80.Level1Basic.CommandModels;
+using System.Diagnostics.CodeAnalysis;
+
+using Trs80.Level1Basic.CommandModels;
 using Trs80.Level1Basic.Common;
 using Trs80.Level1Basic.VirtualMachine.Machine;
 
 namespace Trs80.Level1Basic.Command.Commands;
 
+[SuppressMessage("ReSharper", "UnusedMember.Global")]
 public class InputCommand : ICommand<InputModel>
 {
     private readonly ITrs80 _trs80;
@@ -28,6 +31,7 @@ private SourceLine GetInputLine()
         char[] line = new char[1024];
         int charCount = 0;
         bool inQuote = false;
+        bool inCommand = true;
 
         while (true)
         {
@@ -36,14 +40,12 @@ private SourceLine GetInputLine()
             if (key.Key == ConsoleKey.Enter)
             {
                 _trs80.WriteLine();
-                inQuote = false;
                 break;
             }
 
-            if (key.KeyChar == '"')
-            {
+            if (key.KeyChar == '"' && inCommand) 
                 inQuote = !inQuote;
-            }
+
             if (key.Key == ConsoleKey.Backspace)
             {
                 if (charCount > 0)
@@ -58,10 +60,13 @@ private SourceLine GetInputLine()
             }
             else
             {
+                if (inCommand && char.IsDigit(key.KeyChar) && (charCount <= 0 || original.All(char.IsWhiteSpace)))
+                    inCommand = false;
+
                 original[charCount] = key.KeyChar;
                 char upper = Upper(key.KeyChar);
                 line[charCount++] = upper;
-                if (!inQuote)
+                if (!inQuote || !inCommand)
                     _trs80.Write($"\b{upper}");
             }
         }
@@ -70,7 +75,7 @@ private SourceLine GetInputLine()
             ? new SourceLine()
             : new SourceLine
             {
-                Line = new string(line, 0, charCount), 
+                Line = new string(line, 0, charCount),
                 Original = new string(original, 0, charCount)
             };
     }

diff --git a/Trs80.Level1Basic.Command/Commands/InterpretCommand.cs b/Trs80.Level1Basic.Command/Commands/InterpretCommand.cs
@@ -1,19 +1,17 @@
 using Trs80.Level1Basic.CommandModels;
 using Trs80.Level1Basic.VirtualMachine.Interpreter;
-using Trs80.Level1Basic.VirtualMachine.Machine;
 using Trs80.Level1Basic.VirtualMachine.Parser.Statements;
 
 namespace Trs80.Level1Basic.Command.Commands;
 
+// ReSharper disable once UnusedMember.Global
 public class InterpretCommand : ICommand<InterpretModel>
 {
     private readonly IInterpreter _interpreter;
-    private readonly ITrs80 _trs80;
 
-    public InterpretCommand(IInterpreter interpreter, ITrs80 trs80)
+    public InterpretCommand(IInterpreter interpreter)
     {
         _interpreter = interpreter ?? throw new ArgumentNullException(nameof(interpreter));
-        _trs80 = trs80 ?? throw new ArgumentNullException(nameof(trs80));
     }
 
     public void Execute(InterpretModel parameterObject)

diff --git a/Trs80.Level1Basic.Command/Commands/ParseCommand.cs b/Trs80.Level1Basic.Command/Commands/ParseCommand.cs
@@ -1,10 +1,13 @@
-using Trs80.Level1Basic.CommandModels;
+using System.Diagnostics.CodeAnalysis;
+
+using Trs80.Level1Basic.CommandModels;
 using Trs80.Level1Basic.VirtualMachine.Parser;
 using Trs80.Level1Basic.VirtualMachine.Parser.Statements;
 using Trs80.Level1Basic.VirtualMachine.Scanner;
 
 namespace Trs80.Level1Basic.Command.Commands;
 
+[SuppressMessage("ReSharper", "UnusedMember.Global")]
 public class ParseCommand : ICommand<ParseModel>
 {
     private readonly IParser _parser;

diff --git a/Trs80.Level1Basic.Command/Commands/SetupTrs80Command.cs b/Trs80.Level1Basic.Command/Commands/SetupTrs80Command.cs
@@ -1,8 +1,11 @@
-using Trs80.Level1Basic.CommandModels;
+using System.Diagnostics.CodeAnalysis;
+
+using Trs80.Level1Basic.CommandModels;
 using Trs80.Level1Basic.VirtualMachine.Machine;
 
 namespace Trs80.Level1Basic.Command.Commands;
 
+[SuppressMessage("ReSharper", "UnusedMember.Global")]
 public class SetupTrs80Command : ICommand<SetupTrs80Model>
 {
     private readonly ITrs80 _trs80;

diff --git a/Trs80.Level1Basic.Command/Commands/ShutdownTrs80Command.cs b/Trs80.Level1Basic.Command/Commands/ShutdownTrs80Command.cs
@@ -1,8 +1,11 @@
-using Trs80.Level1Basic.CommandModels;
+using System.Diagnostics.CodeAnalysis;
+
+using Trs80.Level1Basic.CommandModels;
 using Trs80.Level1Basic.VirtualMachine.Machine;
 
 namespace Trs80.Level1Basic.Command.Commands;
 
+[SuppressMessage("ReSharper", "UnusedMember.Global")]
 public class ShutdownTrs80Command : ICommand<ShutdownTrs80Model>
 {
     private readonly ITrs80 _trs80;

diff --git a/Trs80.Level1Basic.CommandModels/WorkflowDataModel.cs b/Trs80.Level1Basic.CommandModels/WorkflowDataModel.cs
@@ -1,11 +1,13 @@
 using System.Diagnostics.CodeAnalysis;
+
 using Trs80.Level1Basic.Common;
 using Trs80.Level1Basic.VirtualMachine.Parser.Statements;
 using Trs80.Level1Basic.VirtualMachine.Scanner;
 
 namespace Trs80.Level1Basic.CommandModels;
 
 [SuppressMessage("ReSharper", "EmptyConstructor")]
+[SuppressMessage("ReSharper", "UnusedMember.Global")]
 public sealed class WorkflowDataModel
 {
     public bool WritePrompt { get; set; } = false;