Fix finish handler + newline handling

Author: ststeiger

sql_profiler/Code/Lexer/YukonLexer.cs

@@ -76,7 +76,7 @@ public string StandardSql(string sql)
         public string SyntaxHighlight(OutputWriter sb, string value)
         {
             Line = value;
-            
+
             System.Collections.Generic.List<TokenKind> lsTokenTypeHistory =
                 new System.Collections.Generic.List<TokenKind>();
 
@@ -137,9 +137,10 @@ public string SyntaxHighlight(OutputWriter sb, string value)
                 }
                 Next();
             }
-            
+
             sb.AppendLine();
-            
+            sb.AppendLine();
+
             lsTokenTypeHistory.Clear();
             lsTokenTypeHistory = null;
 

sql_profiler/Code/OutputWriter/ConsoleOutputWriter.cs

@@ -77,14 +77,17 @@ public override System.Drawing.Color BackColor
             {
                 // if (!s_colorDict.ContainsKey(value)) System.Console.WriteLine(value);
                 System.Console.BackgroundColor = s_colorDict[value];
-                System.Console.WriteLine(new string(' ', System.Console.BufferWidth));
+                this.AppendLine();
+                //System.Console.WriteLine(new string(' ', System.Console.BufferWidth));
             }
         }
 
 
         public override void AppendLine()
         {
-            System.Console.WriteLine();
+            // Finish the line with empty color
+            System.Console.Write(new string(' ', System.Console.BufferWidth - System.Console.CursorLeft));
+            // System.Console.WriteLine();
         }
 
 

sql_profiler/Code/SqlServerProfiler.cs

@@ -395,11 +395,7 @@ protected void NewEventArrived(ProfilerEvent evt, bool last)
             string caption = GetEventCaption(evt);
             System.Console.Write(caption);
             System.Console.Write(new string(' ', System.Console.BufferWidth - System.Console.CursorLeft));
-            System.Console.WriteLine();
 
-            
-            
-            System.Console.WriteLine();
             string td = evt.GetFormattedData(ProfilerEventColumns.TextData, null);
             // System.Console.WriteLine(td);
 

sql_profiler/Program.cs

@@ -288,7 +288,8 @@ static void MainTest(string[] args)
         {
             string instance = GetPlatformDefaultInstance();
             // dotnet run --server localhost --username MY_USER --password MY_PASSWORD --db MY_DB
-            string ar = $"--server {instance} --username WebAppWebServices --password TOP_SECRET /Db COR_Basic_Demo_V4";
+            // string ar = $"--server {instance} --username WebAppWebServices --password TOP_SECRET --Db COR_Basic_Demo_V4";
+            string ar = $"--server {instance} /db \"SwissRe_Test_V4\"";
             DoProfiling(ar.Split(' '));
         } // End Sub Main 
 
@@ -355,8 +356,12 @@ static void DoProfiling(string[] args)
             s_profiler.StartProfiling();
 
 
-            System.Console.WriteLine("--- Press any key to stop profiling --- ");
-            System.Console.ReadKey();
+            // System.Console.WriteLine("--- Press any key to stop profiling --- ");
+            //System.Console.ReadKey();
+
+            System.Console.WriteLine("--- Press ENTER to stop profiling --- ");
+            System.Console.ReadLine();
+
             OnExit();
         } // End Sub Test