Merge branch 'dev'

AterDev · Apr 1, 2024 · 63a153a · 63a153a
2 parents 05e1256 + 140efb5
commit 63a153a
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 6 deletions.
diff --git a/Lib/ColorCode.Core/Common/ScopeName.cs b/Lib/ColorCode.Core/Common/ScopeName.cs
@@ -69,4 +69,6 @@ public class ScopeName
     public const string Brackets = "Brackets";
     public const string Continuation = "Continuation";
     public const string Variable = "Variable";
+    public const string Function = "Function";
+    public const string Symbol = "Symbol";
 }
diff --git a/Lib/ColorCode.Core/Compilation/Languages/CSharp.cs b/Lib/ColorCode.Core/Compilation/Languages/CSharp.cs
@@ -72,6 +72,49 @@ public IList<LanguageRule> Rules
                         { 2, ScopeName.ClassName }
                     }),
 
+                new LanguageRule(@"[\(\)\[\]\{\}]",
+                    new Dictionary<int, string>
+                        {
+                            { 0, ScopeName.ControlKeyword },
+                        }),
+                new LanguageRule(@"\b([A-Z][a-z0-9A-Z]*)<([A-Z][a-z0-9A-Z]*)>",
+                    new Dictionary<int, string>
+                        {
+                            { 1, ScopeName.ClassName },
+                            { 2, ScopeName.Symbol},
+                        }),
+                new LanguageRule(@" +\b([A-Z][a-z0-9A-Z]*) +([a-z][a-z0-9A-Z]*)\b +=",
+                    new Dictionary<int, string>
+                        {
+                            { 1, ScopeName.ClassName },
+                            { 2, ScopeName.Variable},
+                        }),
+                new LanguageRule(@"([A-Z][a-z0-9A-Z]*)\.([A-Z][a-z0-9A-Z]*)[; +]",
+                    new Dictionary<int, string>
+                        {
+                            { 1, ScopeName.ClassName },
+                            { 2, ScopeName.Variable},
+                        }),
+                new LanguageRule(@"\b([A-Z][a-z0-9A-Z]*)\.([A-Z][a-z0-9A-Z]*)(\()",
+                    new Dictionary<int, string>
+                        {
+                            { 1, ScopeName.ClassName },
+                            { 2, ScopeName.Function},
+                            { 3, ScopeName.ControlKeyword },
+                        }),
+                new LanguageRule(@"\b([a-z][a-z0-9A-Z]*)\.([A-Z][a-z0-9A-Z]*)(\()",
+                    new Dictionary<int, string>
+                        {
+                            { 1, ScopeName.Variable },
+                            { 2, ScopeName.Function },
+                            { 3, ScopeName.ControlKeyword },
+                        }),
+                new LanguageRule(@"\.([A-Z][a-z0-9A-Z]*)(\()",
+                    new Dictionary<int, string>
+                        {
+                            { 1, ScopeName.Function },
+                            { 2, ScopeName.ControlKeyword },
+                        }),
                 new LanguageRule(
                     @"\b(int|string|float|double|bool|object|var)\s+([a-zA-Z_][a-zA-Z0-9_]*)\b",
                     new Dictionary<int, string>
@@ -86,6 +129,12 @@ public IList<LanguageRule> Rules
                     {
                         { 1, ScopeName.Variable }
                     }),
+                new LanguageRule(
+                    @"\b([A-Z][a-zA-Z0-0]*)\b =",
+                    new Dictionary<int, string>
+                    {
+                        { 1, ScopeName.Variable }
+                    }),
                 new LanguageRule(
                     @"\[(assembly|module|type|return|param|method|field|property|event):[^\]""]*(""[^\n]*?(?<!\\)"")?[^\]]*\]",
                     new Dictionary<int, string>
@@ -105,18 +154,19 @@ public IList<LanguageRule> Rules
                         { 1, ScopeName.Keyword },
                         { 2, ScopeName.ClassName },
                     }),
+                new LanguageRule(@" +([A-Z][a-z0-9A-Z]*)[<\w+>]*(\()",
+                    new Dictionary<int, string>
+                    {
+                        { 1, ScopeName.Function },
+                        { 2, ScopeName.ControlKeyword },
+                    }),
                 new LanguageRule(
                     @"\b(abstract|as|ascending|base|bool|break|by|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|descending|do|double|dynamic|else|enum|equals|event|explicit|extern|false|finally|fixed|float|for|foreach|from|get|goto|group|if|implicit|in|int|into|interface|internal|is|join|let|lock|long|namespace|new|null|object|on|operator|orderby|out|override|params|partial|private|protected|public|readonly|ref|return|sbyte|sealed|select|set|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|var|virtual|void|volatile|where|while|yield|async|await|warning|disable)\b",
                     new Dictionary<int, string>
                         {
                             { 0, ScopeName.Keyword }
                         }),
 
-                new LanguageRule(@"[\(\)\[\]\{\}]",
-                    new Dictionary<int, string>
-                        {
-                            { 0, ScopeName.ControlKeyword },
-                        }),
 
                 new LanguageRule(
                     @"(?s)(""[^\n]*?(?<!\\)"")",

diff --git a/Lib/ColorCode.Core/Styling/StyleDictionary.DefaultDark.cs b/Lib/ColorCode.Core/Styling/StyleDictionary.DefaultDark.cs
@@ -337,6 +337,17 @@ public static StyleDictionary DefaultDark
                     Foreground = Teal,
                     ReferenceName = "variable"
                 },
+                new Style(ScopeName.Function)
+                {
+                    Foreground = Teal,
+                    ReferenceName = "function"
+                },
+                new Style(ScopeName.Symbol)
+                {
+                    Foreground = VSDarkKeyword,
+                    ReferenceName = "symbol"
+                }
+
             ];
         }
     }

diff --git a/Lib/ColorCode.Core/Styling/StyleDictionary.DefaultLight.cs b/Lib/ColorCode.Core/Styling/StyleDictionary.DefaultLight.cs
@@ -320,6 +320,16 @@ public static StyleDictionary DefaultLight
                     Foreground = OrangeRed,
                     ReferenceName = "variable"
                 },
+                new Style(ScopeName.Function)
+                {
+                    Foreground = Teal,
+                    ReferenceName = "function"
+                },
+                new Style(ScopeName.Symbol)
+                {
+                    Foreground = DarkCyan,
+                    ReferenceName = "symbol"
+                }
             ];
         }
     }

diff --git a/WebApp/css/markdown.css b/WebApp/css/markdown.css
@@ -113,7 +113,6 @@ h5 {
     height: fit-content;
 }
 
-ul.toc {}
 
 ul.toc li {
     list-style-type: none;