Improved syntax highlighting.

Roelant Vos · Roelant Vos · commit f7df8c6994be · 2022-11-18T11:16:52.000+10:00
diff --git a/Virtual_EDW/CustomTabPage.cs b/Virtual_EDW/CustomTabPage.cs
@@ -81,7 +81,7 @@ class CustomTabPage : TabPage
         /// </summary>
         public void ApplySyntaxHighlightingForHandlebars()
         {
-            TextHandling.SyntaxHighlightHandlebars(localRichTextBoxGenerationPattern, localRichTextBoxGenerationPattern.Text.TrimEnd());
+            localRichTextBoxGenerationPattern.Rtf = TextHandling.SyntaxHighlightHandlebars(localRichTextBoxGenerationPattern.Text.TrimEnd()).Rtf;
         }
 
         public void SetDisplayJsonFlag(bool value)
@@ -142,7 +142,7 @@ public CustomTabPage(string classification, string notes, Dictionary<string, VDW
             localButtonGenerate.Name = $"Generate{classification}";
             localButtonGenerate.Size = new Size(170, 40);
             localButtonGenerate.Text = $"Generate {_inputNiceName}";
-            localButtonGenerate.Click += new EventHandler(Generate);
+            localButtonGenerate.Click += Generate;
 
             // Add 'Processing' Label
             var localLabelProcessing = new Label();
@@ -680,8 +680,8 @@ private void GenerateFromPattern()
             RaiseOnChangeMainText($"\r\n{errorCounter} error(s) have been found.\r\n");
             RaiseOnChangeMainText($"\r\nAssociated scripts have been saved in {FormBase.VdwConfigurationSettings.VdwOutputPath}.\r\n");
 
-            // Apply syntax highlighting
-            TextHandling.SyntaxHighlightSql(localRichTextBoxGenerationOutput, localRichTextBoxGenerationOutput.Text);
+            // Apply syntax highlighting.
+            localRichTextBoxGenerationOutput.Rtf = TextHandling.SyntaxHighlightSql(localRichTextBoxGenerationOutput.Text).Rtf;
         }
 
         /// <summary>
diff --git a/Virtual_EDW/TextHandling.cs b/Virtual_EDW/TextHandling.cs
@@ -7,9 +7,9 @@ namespace Virtual_Data_Warehouse
 {
     class TextHandling
     {
-        internal static void SyntaxHighlightHandlebars(RichTextBox inputTextBox, string inputText)
+        internal static RichTextBox SyntaxHighlightHandlebars(string inputText)
         {
-            inputTextBox.Clear();
+            RichTextBox returnTextBox = new RichTextBox();
 
             // Split the text into lines, so we can parse each line for syntax highlighting
             Regex splitLineRegex = new Regex("\\n");
@@ -27,8 +27,8 @@ internal static void SyntaxHighlightHandlebars(RichTextBox inputTextBox, string
                 foreach (string token in tokens)
                 {
                     // Make sure the default colour is set
-                    inputTextBox.SelectionColor = Color.Black;
-                    inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Regular);
+                    returnTextBox.SelectionColor = Color.Black;
+                    returnTextBox.SelectionFont = new Font(returnTextBox.Font, FontStyle.Regular);
 
                     if (token == "{")
                     {
@@ -46,32 +46,33 @@ internal static void SyntaxHighlightHandlebars(RichTextBox inputTextBox, string
                         if (keywords[i] == token)
                         {
                             // Apply alternative color and font to highlight keyword.  
-                            inputTextBox.SelectionColor = Color.DarkGreen;
+                            returnTextBox.SelectionColor = Color.DarkGreen;
                             //inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);
                             break;
                         } else if (syntaxHighlightCounter>1 && token !="{" && token!="}")
                         {
-                            inputTextBox.SelectionColor = Color.Purple;
+                            returnTextBox.SelectionColor = Color.Purple;
                             //inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);
                         }
                     }
 
-                    inputTextBox.SelectedText = token;
+                    returnTextBox.SelectedText = token;
 
                     if (token == "}")
                     {
                         syntaxHighlightCounter = 0; //Reset the counter
                     }
 
                 }
-                inputTextBox.SelectedText = "\n";
+                returnTextBox.SelectedText = "\n";
             }
 
+            return returnTextBox;
         }
 
-        internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputText)
+        internal static RichTextBox SyntaxHighlightSql(string inputText)
         {
-            inputTextBox.Clear();
+            var returnTextBox = new RichTextBox();
 
             // Split the text into lines, so we can parse each line for syntax highlighting
             Regex splitLineRegex = new Regex("\\n");
@@ -89,8 +90,8 @@ internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputTe
                 foreach (string token in tokens)
                 {
                     // Make sure the default colour is set
-                    inputTextBox.SelectionColor = Color.Black;
-                    inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Regular);
+                    returnTextBox.SelectionColor = Color.Black;
+                    returnTextBox.SelectionFont = new Font(returnTextBox.Font, FontStyle.Regular);
 
                     if (token == "-")
                     {
@@ -128,7 +129,7 @@ internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputTe
                         if (keyWordSql[i] == token)
                         {
                             // Apply alternative color and font to highlight keyword.  
-                            inputTextBox.SelectionColor = Color.Blue;
+                            returnTextBox.SelectionColor = Color.Blue;
                             //inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);
                             break;
                         }
@@ -140,7 +141,7 @@ internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputTe
                         if (keyWordFunction[i] == token)
                         {
                             // Apply alternative color and font to highlight keyword.  
-                            inputTextBox.SelectionColor = Color.Purple;
+                            returnTextBox.SelectionColor = Color.Purple;
                             //inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);
                             break;
                         }
@@ -152,23 +153,25 @@ internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputTe
                         if (keyWordFunctionComment[i] == token)
                         {
                             // Apply alternative color and font to highlight keyword.  
-                            inputTextBox.SelectionColor = Color.ForestGreen;
+                            returnTextBox.SelectionColor = Color.ForestGreen;
                             //inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);
                             break;
                         }
                     }
 
-                    inputTextBox.SelectedText = token;
+                    returnTextBox.SelectedText = token;
 
                     if (token == "}")
                     {
                         syntaxHighlightCounter = 0; //Reset the counter
                     }
 
                 }
-                inputTextBox.SelectedText = "\n";
+                returnTextBox.SelectedText = "\n";
             }
 
+            return returnTextBox;
+
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ namespace Virtual_Data_Warehouse`
`7`	`7`	`{`
`8`	`8`	`class TextHandling`
`9`	`9`	`{`
`10`		`- internal static void SyntaxHighlightHandlebars(RichTextBox inputTextBox, string inputText)`
	`10`	`+ internal static RichTextBox SyntaxHighlightHandlebars(string inputText)`
`11`	`11`	`{`
`12`		`- inputTextBox.Clear();`
	`12`	`+ RichTextBox returnTextBox = new RichTextBox();`
`13`	`13`
`14`	`14`	`// Split the text into lines, so we can parse each line for syntax highlighting`
`15`	`15`	`Regex splitLineRegex = new Regex("\\n");`
`@@ -27,8 +27,8 @@ internal static void SyntaxHighlightHandlebars(RichTextBox inputTextBox, string`
`27`	`27`	`foreach (string token in tokens)`
`28`	`28`	`{`
`29`	`29`	`// Make sure the default colour is set`
`30`		`- inputTextBox.SelectionColor = Color.Black;`
`31`		`- inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Regular);`
	`30`	`+ returnTextBox.SelectionColor = Color.Black;`
	`31`	`+ returnTextBox.SelectionFont = new Font(returnTextBox.Font, FontStyle.Regular);`
`32`	`32`
`33`	`33`	`if (token == "{")`
`34`	`34`	`{`
`@@ -46,32 +46,33 @@ internal static void SyntaxHighlightHandlebars(RichTextBox inputTextBox, string`
`46`	`46`	`if (keywords[i] == token)`
`47`	`47`	`{`
`48`	`48`	`// Apply alternative color and font to highlight keyword.`
`49`		`- inputTextBox.SelectionColor = Color.DarkGreen;`
	`49`	`+ returnTextBox.SelectionColor = Color.DarkGreen;`
`50`	`50`	`//inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);`
`51`	`51`	`break;`
`52`	`52`	`} else if (syntaxHighlightCounter>1 && token !="{" && token!="}")`
`53`	`53`	`{`
`54`		`- inputTextBox.SelectionColor = Color.Purple;`
	`54`	`+ returnTextBox.SelectionColor = Color.Purple;`
`55`	`55`	`//inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- inputTextBox.SelectedText = token;`
	`59`	`+ returnTextBox.SelectedText = token;`
`60`	`60`
`61`	`61`	`if (token == "}")`
`62`	`62`	`{`
`63`	`63`	`syntaxHighlightCounter = 0; //Reset the counter`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`}`
`67`		`- inputTextBox.SelectedText = "\n";`
	`67`	`+ returnTextBox.SelectedText = "\n";`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ return returnTextBox;`
`70`	`71`	`}`
`71`	`72`
`72`		`- internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputText)`
	`73`	`+ internal static RichTextBox SyntaxHighlightSql(string inputText)`
`73`	`74`	`{`
`74`		`- inputTextBox.Clear();`
	`75`	`+ var returnTextBox = new RichTextBox();`
`75`	`76`
`76`	`77`	`// Split the text into lines, so we can parse each line for syntax highlighting`
`77`	`78`	`Regex splitLineRegex = new Regex("\\n");`
`@@ -89,8 +90,8 @@ internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputTe`
`89`	`90`	`foreach (string token in tokens)`
`90`	`91`	`{`
`91`	`92`	`// Make sure the default colour is set`
`92`		`- inputTextBox.SelectionColor = Color.Black;`
`93`		`- inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Regular);`
	`93`	`+ returnTextBox.SelectionColor = Color.Black;`
	`94`	`+ returnTextBox.SelectionFont = new Font(returnTextBox.Font, FontStyle.Regular);`
`94`	`95`
`95`	`96`	`if (token == "-")`
`96`	`97`	`{`
`@@ -128,7 +129,7 @@ internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputTe`
`128`	`129`	`if (keyWordSql[i] == token)`
`129`	`130`	`{`
`130`	`131`	`// Apply alternative color and font to highlight keyword.`
`131`		`- inputTextBox.SelectionColor = Color.Blue;`
	`132`	`+ returnTextBox.SelectionColor = Color.Blue;`
`132`	`133`	`//inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);`
`133`	`134`	`break;`
`134`	`135`	`}`
`@@ -140,7 +141,7 @@ internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputTe`
`140`	`141`	`if (keyWordFunction[i] == token)`
`141`	`142`	`{`
`142`	`143`	`// Apply alternative color and font to highlight keyword.`
`143`		`- inputTextBox.SelectionColor = Color.Purple;`
	`144`	`+ returnTextBox.SelectionColor = Color.Purple;`
`144`	`145`	`//inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);`
`145`	`146`	`break;`
`146`	`147`	`}`
`@@ -152,23 +153,25 @@ internal static void SyntaxHighlightSql(RichTextBox inputTextBox, string inputTe`
`152`	`153`	`if (keyWordFunctionComment[i] == token)`
`153`	`154`	`{`
`154`	`155`	`// Apply alternative color and font to highlight keyword.`
`155`		`- inputTextBox.SelectionColor = Color.ForestGreen;`
	`156`	`+ returnTextBox.SelectionColor = Color.ForestGreen;`
`156`	`157`	`//inputTextBox.SelectionFont = new Font(inputTextBox.Font, FontStyle.Bold);`
`157`	`158`	`break;`
`158`	`159`	`}`
`159`	`160`	`}`
`160`	`161`
`161`		`- inputTextBox.SelectedText = token;`
	`162`	`+ returnTextBox.SelectedText = token;`
`162`	`163`
`163`	`164`	`if (token == "}")`
`164`	`165`	`{`
`165`	`166`	`syntaxHighlightCounter = 0; //Reset the counter`
`166`	`167`	`}`
`167`	`168`
`168`	`169`	`}`
`169`		`- inputTextBox.SelectedText = "\n";`
	`170`	`+ returnTextBox.SelectedText = "\n";`
`170`	`171`	`}`
`171`	`172`
	`173`	`+ return returnTextBox;`
	`174`	`+`
`172`	`175`	`}`
`173`	`176`	`}`
`174`	`177`	`}`