Moved SRC and Test folders to root directory.

Refactored static ReadLine class to a true singleton. Changed unit tests to use NUnit instead of XUnit. Fixed Ctrl+C issue #59 (Add option to return CTRL+C) Updated version.
tonerdo · Mar 18, 2020 · f734a8a · f734a8a
1 parent efef308
commit f734a8a
Show file tree

Hide file tree

Showing 23 changed files with 618 additions and 584 deletions.
diff --git a/Artifacts/ReadLine.2.1.3.nupkg b/Artifacts/ReadLine.2.1.3.nupkg
diff --git a/src/ReadLine.Demo/AutoCompleteHandler.cs → ReadLine.Demo/AutoCompleteHandler.cs b/src/ReadLine.Demo/AutoCompleteHandler.cs → ReadLine.Demo/AutoCompleteHandler.cs
@@ -1,28 +1,28 @@
-namespace ReadLine.Demo
-{
-    internal class AutoCompletionHandler : IAutoCompleteHandler
-    {
-        public char[] Separators { get; set; } =
-        {
-            ' ',
-            '.',
-            '/',
-            '\\',
-            ':'
-        };
-
-
-        public string[] GetSuggestions(string text, int index)
-        {
-            return text.StartsWith("git ")
-                ? new[]
-                {
-                    "init",
-                    "clone",
-                    "pull",
-                    "push"
-                }
-                : null;
-        }
-    }
-}
+namespace ReadLine.Demo
+{
+    internal class AutoCompletionHandler : IAutoCompleteHandler
+    {
+        public char[] Separators { get; set; } =
+        {
+            ' ',
+            '.',
+            '/',
+            '\\',
+            ':'
+        };
+
+
+        public string[] GetSuggestions(string text, int index)
+        {
+            return text.StartsWith("git ")
+                ? new[]
+                {
+                    "init",
+                    "clone",
+                    "pull",
+                    "push"
+                }
+                : null;
+        }
+    }
+}
diff --git a/src/ReadLine.Demo/Program.cs → ReadLine.Demo/Program.cs b/src/ReadLine.Demo/Program.cs → ReadLine.Demo/Program.cs
@@ -1,31 +1,33 @@
-using System;
-
-
-namespace ReadLine.Demo
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            Console.WriteLine("ReadLine Library Demo");
-            Console.WriteLine("---------------------");
-            Console.WriteLine();
-
-            string[] history =
-            {
-                "ls -a",
-                "dotnet run",
-                "git init"
-            };
-            ReadLine.AddHistory(history);
-
-            ReadLine.AutoCompletionHandler = new AutoCompletionHandler();
-
-            var input = ReadLine.Read("(prompt)> ");
-            Console.WriteLine(input);
-
-            input = ReadLine.ReadPassword("Enter Password> ");
-            Console.WriteLine(input);
-        }
-    }
+using System;
+
+
+namespace ReadLine.Demo
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("ReadLine Library Demo");
+            Console.WriteLine("---------------------");
+            Console.WriteLine();
+
+            string[] history =
+            {
+                "ls -a",
+                "dotnet run",
+                "git init"
+            };
+
+            IReadLine readLine = ReadLine.Instance;
+            readLine.AddHistory(history);
+
+            readLine.AutoCompletionHandler = new AutoCompletionHandler();
+
+            var input = readLine.Read("(prompt)> ");
+            Console.WriteLine(input);
+
+            input = readLine.ReadPassword("Enter Password> ");
+            Console.WriteLine(input);
+        }
+    }
 }
diff --git a/src/ReadLine.Demo/ReadLine.Demo.csproj → ReadLine.Demo/ReadLine.Demo.csproj b/src/ReadLine.Demo/ReadLine.Demo.csproj → ReadLine.Demo/ReadLine.Demo.csproj
@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <DebugType>portable</DebugType>
-    <AssemblyName>ReadLine.Demo</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>ReadLine.Demo</PackageId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../ReadLine/ReadLine.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <DebugType>portable</DebugType>
+    <AssemblyName>ReadLine.Demo</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>ReadLine.Demo</PackageId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../ReadLine/ReadLine.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/ReadLine.Tests/Abstractions/Console2.cs → ReadLine.Tests/Abstractions/Console2.cs b/test/ReadLine.Tests/Abstractions/Console2.cs → ReadLine.Tests/Abstractions/Console2.cs
diff --git a/test/ReadLine.Tests/AutoCompleteHandler.cs → ReadLine.Tests/AutoCompleteHandler.cs b/test/ReadLine.Tests/AutoCompleteHandler.cs → ReadLine.Tests/AutoCompleteHandler.cs
diff --git a/test/ReadLine.Tests/CharExtensions.cs → ReadLine.Tests/CharExtensions.cs b/test/ReadLine.Tests/CharExtensions.cs → ReadLine.Tests/CharExtensions.cs
@@ -11,6 +11,7 @@ public static class CharExtensions
 
         public const char CtrlA = '\u0001';
         public const char CtrlB = '\u0002';
+        public const char CtrlC = '\u0003';
         public const char CtrlD = '\u0004';
         public const char CtrlE = '\u0005';
         public const char CtrlF = '\u0006';
@@ -29,6 +30,7 @@ public static class CharExtensions
             {Space, Tuple.Create(ConsoleKey.Spacebar,  NoModifiers())},
             {CtrlA, Tuple.Create(ConsoleKey.A, ConsoleModifiers.Control)},
             {CtrlB, Tuple.Create(ConsoleKey.B, ConsoleModifiers.Control)},
+            {CtrlC, Tuple.Create(ConsoleKey.C, ConsoleModifiers.Control)},
             {CtrlD, Tuple.Create(ConsoleKey.D, ConsoleModifiers.Control)},
             {CtrlE, Tuple.Create(ConsoleKey.E, ConsoleModifiers.Control)},
             {CtrlF, Tuple.Create(ConsoleKey.F, ConsoleModifiers.Control)},

diff --git a/...eadLine.Tests/ConsoleKeyInfoExtensions.cs → ReadLine.Tests/ConsoleKeyInfoExtensions.cs b/...eadLine.Tests/ConsoleKeyInfoExtensions.cs → ReadLine.Tests/ConsoleKeyInfoExtensions.cs
@@ -23,6 +23,7 @@ public static class ConsoleKeyInfoExtensions
         public static readonly ConsoleKeyInfo Space = CharExtensions.Space.ToConsoleKeyInfo();
         public static readonly ConsoleKeyInfo CtrlA = CharExtensions.CtrlA.ToConsoleKeyInfo();
         public static readonly ConsoleKeyInfo CtrlB = CharExtensions.CtrlB.ToConsoleKeyInfo();
+        public static readonly ConsoleKeyInfo CtrlC = CharExtensions.CtrlC.ToConsoleKeyInfo();
         public static readonly ConsoleKeyInfo CtrlD = CharExtensions.CtrlD.ToConsoleKeyInfo();
         public static readonly ConsoleKeyInfo CtrlE = CharExtensions.CtrlE.ToConsoleKeyInfo();
         public static readonly ConsoleKeyInfo CtrlF = CharExtensions.CtrlF.ToConsoleKeyInfo();