Fix console coloring

Author: ststeiger

sql_profiler/Code/Lexer/YukonLexer.cs

@@ -77,6 +77,8 @@ public string SyntaxHighlight(OutputWriter sb, string value)
         {
             Line = value;
 
+            sb.AppendLine();
+
             System.Collections.Generic.List<TokenKind> lsTokenTypeHistory =
                 new System.Collections.Generic.List<TokenKind>();
 
@@ -140,12 +142,11 @@ public string SyntaxHighlight(OutputWriter sb, string value)
 
             sb.AppendLine();
             sb.AppendLine();
-            string lol = sb.ToString();
-            
+
             lsTokenTypeHistory.Clear();
             lsTokenTypeHistory = null;
 
-            return lol;
+            return sb.ToString();
         }
 
         private string Line

sql_profiler/Code/OutputWriter/ConsoleOutputWriter.cs

@@ -82,7 +82,7 @@ public override System.Drawing.Color BackColor
             {
                 // if (!s_colorDict.ContainsKey(value)) System.Console.WriteLine(value);
                 System.Console.BackgroundColor = s_colorDict[value];
-                this.AppendLine();
+                //this.AppendLine();
             }
         }
 
@@ -91,7 +91,9 @@ public override void AppendLine()
         {   
             // Finish the line with empty color
             System.Console.Write(new string(' ', System.Console.BufferWidth - System.Console.CursorLeft));
-            System.Console.Write(System.Environment.NewLine);
+
+            if(!s_isWindows)
+                System.Console.Write(System.Environment.NewLine);
             //else System.Console.WriteLine();
         }
 

sql_profiler/Code/SqlServerProfiler.cs

@@ -18,8 +18,9 @@ protected enum ProfilingStateEnum { psStopped, psProfiling, psPaused }
         protected System.Collections.Concurrent.ConcurrentQueue<ProfilerEvent> m_events;
         protected readonly System.Collections.Generic.List<PerfColumn> m_columns;
         protected readonly YukonLexer m_Lex;
-            
-        
+        protected readonly bool m_isWindows;
+
+
         protected readonly ProfilerEvent m_EventStarted = new ProfilerEvent();
         protected readonly ProfilerEvent m_EventStopped = new ProfilerEvent();
         protected readonly ProfilerEvent m_EventPaused = new ProfilerEvent();
@@ -54,11 +55,11 @@ public SqlServerProfiler(string server, string database
             this.m_password = password;
             this.m_integrated_security = string.IsNullOrWhiteSpace(username);
 
-            bool isWindows = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(
+            this.m_isWindows = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(
                    System.Runtime.InteropServices.OSPlatform.Windows
                );
 
-            if (this.m_integrated_security && !isWindows)
+            if (this.m_integrated_security && !this.m_isWindows)
             {
                 throw new System.ArgumentException($"Username is NULL or empty. Cannot use integrated-security on non-windows platform.");
             }
@@ -399,8 +400,12 @@ 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.Write(System.Environment.NewLine);
+
+            if(!this.m_isWindows)
+                System.Console.Write(System.Environment.NewLine);
 
+            
+
             string td = evt.GetFormattedData(ProfilerEventColumns.TextData, null);
             // System.Console.WriteLine(td);
 
@@ -417,9 +422,12 @@ protected void NewEventArrived(ProfilerEvent evt, bool last)
             };
 
 
-            // var lex = new YukonLexer(); lex.SyntaxHighlight(cw, td);
-            this.m_Lex.SyntaxHighlight(cw, td);
-            // rich.Rtf = this.m_Lex.SyntaxHighlight(rb, td);
+            if (!string.IsNullOrEmpty(td))
+            {
+                // var lex = new YukonLexer(); lex.SyntaxHighlight(cw, td);
+                this.m_Lex.SyntaxHighlight(cw, td);
+                // rich.Rtf = this.m_Lex.SyntaxHighlight(rb, td);
+            }
 
             // for(int i = 0; i < 65; ++i) // 65 is size of array
             // System.Console.WriteLine(evt.GetFormattedData(i, null));

sql_profiler/Program.cs

@@ -280,23 +280,31 @@ public static string GetPlatformDefaultInstance()
 
         static void Main(string[] args)
         {
-            // MainTest(args);
-            DoProfiling(args);
+            MainTest(args);
+            // DoProfiling(args);
         }
-        
-        
+
+
         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} /db \"COR_Basic_Demo_V4\"";
-            
-            string un = TestPlotly.SecretManager.GetSecret<string>("DefaultDbUser");
-            string pw = TestPlotly.SecretManager.GetSecret<string>("DefaultDbPassword");
-            
-            string ar = $"--server {instance} --username {un} --password {pw} --db \"Redmine\"";
-            
+
+            string ar = $"--server {instance} /db \"COR_Basic_Demo_V4\"";
+            ar = $"--server {instance} /db \"SwissRe_Test_V4\"";
+
+            bool isWindows = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(
+                    System.Runtime.InteropServices.OSPlatform.Windows
+            );
+
+            if(!isWindows)
+            {
+                string un = TestPlotly.SecretManager.GetSecret<string>("DefaultDbUser");
+                string pw = TestPlotly.SecretManager.GetSecret<string>("DefaultDbPassword");
+                ar = $"--server {instance} --username {un} --password {pw} --db \"Redmine\"";
+            }
+
             DoProfiling(ar.Split(' '));
         } // End Sub Main 
 
@@ -360,8 +368,10 @@ static void DoProfiling(string[] args)
             s_profiler = new ExpressProfiler.SqlServerProfiler(server, db, username, password);
 
             s_profiler.StartProfiling();
-            
-            
+
+
+            System.Console.ResetColor();
+
             // System.Console.WriteLine("--- Press ENTER to stop profiling --- ");
             // System.Console.ReadLine();
 
@@ -383,8 +393,12 @@ static void DoProfiling(string[] args)
         ]
         private static void OnExit()
         {
-            if(s_profiler != null) // Is there any chance this could happen ? 
+            System.Console.ResetColor();
+
+            if (s_profiler != null) // Is there any chance this could happen ? 
                 s_profiler.StopProfiling();
+
+            System.Console.ResetColor();
         } // End Sub OnExit