Added the AllGrammarNames property to the ISyntaxHighlightingGuide to allow a guide to support many grammars. Also added the missing ENDTRY token to the Heuristic highlighter.

Author: wiredwiz

Common/Syntax/ISyntaxHighlightingGuide.cs

@@ -34,6 +34,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endregion
 
+using System.Collections.Generic;
 using System.Drawing;
 
 using Org.Edgerunner.ANTLR4.Tools.Common.Grammar;
@@ -48,6 +49,11 @@ public interface ISyntaxHighlightingGuide
       /// <value>The name of the grammar.</value>
       string GrammarName { get; }
 
+      /// <summary>Gets all grammar names this syntax highlighting guide supports.</summary>
+      /// <value>All grammar names.</value>
+      /// <remarks>Usually used for a cluster of grammar variants that share structure.</remarks>
+      IList<string> AllGrammarNames { get; }
+
       /// <summary>
       /// Gets the error indicator color.
       /// </summary>

Grun.Net.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.1022

GunWin/Editor/SyntaxHighlighting/HeuristicSyntaxHighlightingGuide.cs

@@ -64,6 +64,7 @@ public class HeuristicSyntaxHighlightingGuide : ISyntaxHighlightingGuide
       /// <param name="settings">The settings.</param>
       public HeuristicSyntaxHighlightingGuide(Settings settings)
       {
+         AllGrammarNames = new List<string>();
          _Settings = settings;
          _ForegroundColors = new Dictionary<string, Color>();
          _BackgroundColors = new Dictionary<string, Color>();
@@ -151,6 +152,7 @@ private bool IsKeyword(SyntaxToken token)
             case "EXCEPT":
             case "CATCH":
             case "FINALLY":
+            case "ENDTRY":
             case "THROW":
             case "RAISE":
 
@@ -308,6 +310,7 @@ private bool IsComment(SyntaxToken token)
       }
 
       public string GrammarName { get; set; }
+      public IList<string> AllGrammarNames { get; }
 
       public Color GetErrorIndicatorColor()
       {

Utilities/Syntax/SyntaxHighlighting.cs

@@ -37,7 +37,8 @@
 #endregion
 
 using System;
-
+using System.Collections;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 using Org.Edgerunner.ANTLR4.Tools.Common.Syntax;
@@ -89,7 +90,7 @@ public static Tuple<SyntaxHighlightingGuideReference, ISyntaxHighlightingGuide>
          foreach (var reference in guideReferences)
          {
             var guide = loader.LoadSyntaxGuide(reference);
-            if (guide != null && guide.GrammarName == grammar.GrammarName)
+            if (guide != null && (guide.GrammarName == grammar.GrammarName || guide.AllGrammarNames.Contains(grammar.GrammarName)))
                return new Tuple<SyntaxHighlightingGuideReference, ISyntaxHighlightingGuide>(reference, guide);
          }