Tab complete compatibilty fix with non-interactive mode

0xbadjuju · Mar 20, 2018 · f7bc6a8 · f7bc6a8
1 parent 389f62f
commit f7bc6a8
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 47 deletions.
diff --git a/Tokenvator/Program.cs b/Tokenvator/Program.cs
@@ -26,21 +26,28 @@ static void Main(string[] args)
                 {
                     using (System.IO.StreamWriter streamWriter = new System.IO.StreamWriter(memeoryStream))
                     {
-                        streamWriter.Write(String.Join(" ", args));
-                        streamWriter.Flush();
                         using (System.IO.StreamReader streamReader = new System.IO.StreamReader(memeoryStream))
                         {
-                            memeoryStream.Seek(0, System.IO.SeekOrigin.Begin);
-                            Console.SetIn(streamReader);
+                            String[] commands = String.Join(" ", args).Split(new String[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+                            Int32 offset = 0;
+                            foreach (String command in commands)
+                            {
+                                streamWriter.Write(command.Trim());
+                                streamWriter.Flush();
+
+                                memeoryStream.Seek(offset, System.IO.SeekOrigin.Begin);
+                                Console.SetIn(streamReader);
 
-                            new MainLoop().Run();
+                                new MainLoop(false).Run();
+                                offset += command.Trim().Length;
+                            }
                         }
                     }
                 }
                 return;
             }
 
-            MainLoop mainLoop = new MainLoop();
+            MainLoop mainLoop = new MainLoop(true);
             while (true)
             {
                 mainLoop.Run();
@@ -74,18 +81,31 @@ class MainLoop
         private String command;
 
         private TabComplete console;
+        private Boolean activateTabs;
 
-        public MainLoop()
+        public MainLoop(Boolean activateTabs)
         {
-            console = new TabComplete(context, options);
+            this.activateTabs = activateTabs;
+            if (activateTabs)
+            {
+                console = new TabComplete(context, options);
+            }
         }
 
         internal void Run()
         {
             try
             {
                 Console.Write(context);
-                String input = console.ReadLine();//Console.ReadLine();
+                String input;
+                if (activateTabs)
+                {
+                    input = console.ReadLine();
+                }
+                else
+                {
+                    input = Console.ReadLine();
+                }
 
                 switch (NextItem(ref input))
                 {

diff --git a/Tokenvator/Resources/TabComplete.cs b/Tokenvator/Resources/TabComplete.cs
@@ -16,7 +16,7 @@ class TabComplete
         private List<String> namespaces;
 
         private List<String> scrollback = new List<string>();
-        private Int32 scollbackPosition = 0;
+        private Int32 scrollbackPosition = 0;
 
         private List<String> options = new List<String>();
 
@@ -62,43 +62,17 @@ public String ReadLine()
                         }
                         break;
                     case ConsoleKey.UpArrow:
-                        try
+                        if (scrollbackPosition > 0 && scrollback.Count > 0)
                         {
-                            if (scollbackPosition > 0)
-                            {
-                                scollbackPosition--;
-                                stringBuilder.Remove(0, stringBuilder.Length);
-                                stringBuilder.Append(scrollback[scollbackPosition]);
-                                ResetLine();
-                                Console.Write(stringBuilder.ToString());
-                            }
-                        }
-                        catch (Exception)
-                        {
-                            if (scollbackPosition < scrollback.Count)
-                            {
-                                scollbackPosition++;
-                            }
+                            stringBuilder.Remove(0, stringBuilder.Length);
+                            stringBuilder.Append(scrollback[scrollbackPosition--]);
                         }
                         break;
                     case ConsoleKey.DownArrow:
-                        try
+                        if (scrollbackPosition + 1 < scrollback.Count)
                         {
-                            if (scollbackPosition < scrollback.Count)
-                            {
-                                scollbackPosition++;
-                                stringBuilder.Remove(0, stringBuilder.Length);
-                                stringBuilder.Append(scrollback[scollbackPosition]);
-                                ResetLine();
-                                Console.Write(stringBuilder.ToString());
-                            }
-                        }
-                        catch (Exception)
-                        {
-                            if (scollbackPosition > 0)
-                            {
-                                scollbackPosition--;
-                            }
+                            stringBuilder.Remove(0, stringBuilder.Length);
+                            stringBuilder.Append(scrollback[scrollbackPosition++]);
                         }
                         break;
                     case ConsoleKey.LeftArrow:
@@ -150,12 +124,11 @@ private void TabInput(StringBuilder stringBuilder, Boolean doubleTab)
         ////////////////////////////////////////////////////////////////////////////////
         private void ResetLine()
         {
-            Int32 line = Console.CursorTop;
             Console.SetCursorPosition(context.Length, Console.CursorTop);
-            Console.Write(new string(' ', Console.WindowWidth - context.Length));
-            Console.SetCursorPosition(0, line);
+            //Console.Write(new string(' ', Console.WindowWidth));
+            Console.SetCursorPosition(0, Console.CursorTop);
             Console.Write(context);
-            Console.SetCursorPosition(context.Length, line);
+            Console.SetCursorPosition(context.Length, Console.CursorTop);
         }
 
         ////////////////////////////////////////////////////////////////////////////////
@@ -184,7 +157,7 @@ private void KeyInput(StringBuilder stringBuilder, ConsoleKeyInfo keyDown)
             }
             else
             {
-                var key = keyDown.KeyChar;
+                Char key = keyDown.KeyChar;
                 stringBuilder.Append(key);
             }
         }