From 2efce9eb0e159ad1e5f2253a11c83d392fe605a3 Mon Sep 17 00:00:00 2001
From: Sinai <outlander.sinai@gmail.com>
Date: Mon, 10 May 2021 23:24:52 +1000
Subject: [PATCH] Simplify keyword highlighting

---
 src/UI/CSConsole/Lexer/KeywordLexer.cs | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/UI/CSConsole/Lexer/KeywordLexer.cs b/src/UI/CSConsole/Lexer/KeywordLexer.cs
index c0d7a93..eeca41f 100644
--- a/src/UI/CSConsole/Lexer/KeywordLexer.cs
+++ b/src/UI/CSConsole/Lexer/KeywordLexer.cs
@@ -6,7 +6,8 @@ namespace UnityExplorer.UI.CSharpConsole.Lexers
 {
     public class KeywordLexer : Lexer
     {
-        private readonly string[] Keywords = new[] { "add", "as", "ascending", "await", "bool", "break", "by", "byte",
+        private readonly HashSet<string> keywords = new HashSet<string> 
+        { "add", "as", "ascending", "await", "bool", "break", "by", "byte",
 "case", "catch", "char", "checked", "const", "continue", "decimal", "default", "descending", "do", "dynamic",
 "else", "equals", "false", "finally", "float", "for", "foreach", "from", "global", "goto", "group", "if", "in",
 "int", "into", "is", "join", "let", "lock", "long", "new", "null", "object", "on", "orderby", "out", "ref",
@@ -16,19 +17,6 @@ namespace UnityExplorer.UI.CSharpConsole.Lexers
 "namespace", "operator", "override", "params", "private", "protected", "public", "using", "partial", "readonly",
 "sealed", "set", "static", "struct", "this", "unchecked", "unsafe", "value", "virtual", "volatile", "void" };
 
-        private readonly Dictionary<int, HashSet<string>> keywordsByLength = new Dictionary<int, HashSet<string>>();
-
-        public KeywordLexer()
-        {
-            foreach (var kw in Keywords)
-            {
-                if (!keywordsByLength.ContainsKey(kw.Length))
-                    keywordsByLength.Add(kw.Length, new HashSet<string>());
-
-                keywordsByLength[kw.Length].Add(kw);
-            }
-        }
-
         protected override Color HighlightColor => new Color(0.33f, 0.61f, 0.83f, 1.0f);
 
         public override bool TryMatchCurrent(LexerBuilder lexer)
@@ -36,12 +24,10 @@ namespace UnityExplorer.UI.CSharpConsole.Lexers
             if (!lexer.IsDelimiter(lexer.Previous, true))
                 return false;
 
-            int len = 0;
             var sb = new StringBuilder();
             while (!lexer.EndOfInput)
             {
                 sb.Append(lexer.Current);
-                len++;
                 var next = lexer.PeekNext();
                 if (lexer.IsDelimiter(next, true))
                 {
@@ -49,7 +35,8 @@ namespace UnityExplorer.UI.CSharpConsole.Lexers
                     break;
                 }
             }
-            if (keywordsByLength.TryGetValue(len, out var keywords) && keywords.Contains(sb.ToString()))
+
+            if (keywords.Contains(sb.ToString()))
             {
                 lexer.Commit();
                 return true;