github/SharpIDE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor text editor colours

Browse Source
This commit is contained in:
Matt Parker
2026-01-31 14:21:07 +10:00
parent ccf55440ed
commit c7118e4b8c
3 changed files with 163 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/SharpIDE.Godot/Features/CodeEditor/CustomSyntaxHighlighter.cs
View File

@@ -6,6 +6,7 @@ using Microsoft.CodeAnalysis.Classification;
using SharpIDE.Application.Features.Analysis; using SharpIDE.Application.Features.Analysis;
using SharpIDE.Application.Features.Analysis.Razor; using SharpIDE.Application.Features.Analysis.Razor;
using SharpIDE.Godot.Features.CodeEditor; using SharpIDE.Godot.Features.CodeEditor;
using SharpIDE.Godot.Features.IdeSettings;
namespace SharpIDE.Godot; namespace SharpIDE.Godot;
@@ -15,6 +16,18 @@ public partial class CustomHighlighter : SyntaxHighlighter
private System.Collections.Generic.Dictionary<int, ImmutableArray<SharpIdeRazorClassifiedSpan>> _razorClassifiedSpansByLine = []; private System.Collections.Generic.Dictionary<int, ImmutableArray<SharpIdeRazorClassifiedSpan>> _razorClassifiedSpansByLine = [];
private System.Collections.Generic.Dictionary<int, ImmutableArray<SharpIdeClassifiedSpan>> _classifiedSpansByLine = []; private System.Collections.Generic.Dictionary<int, ImmutableArray<SharpIdeClassifiedSpan>> _classifiedSpansByLine = [];
private EditorThemeColorSet _colourSetForTheme = null!;
public void UpdateThemeColorCache(LightOrDarkTheme themeType)
{
_colourSetForTheme = themeType switch
{
LightOrDarkTheme.Light => EditorThemeColours.Light,
LightOrDarkTheme.Dark => EditorThemeColours.Dark,
_ => throw new NotImplementedException("Unknown theme type")
};
}
public void SetHighlightingData(ImmutableArray<SharpIdeClassifiedSpan> classifiedSpans, ImmutableArray<SharpIdeRazorClassifiedSpan> razorClassifiedSpans) public void SetHighlightingData(ImmutableArray<SharpIdeClassifiedSpan> classifiedSpans, ImmutableArray<SharpIdeRazorClassifiedSpan> razorClassifiedSpans)
@@ -156,34 +169,34 @@ public partial class CustomHighlighter : SyntaxHighlighter
return highlights; return highlights;
} }
private static Color GetColorForRazorSpanKind(SharpIdeRazorSpanKind kind, string? codeClassificationType, string? vsSemanticRangeType) private Color GetColorForRazorSpanKind(SharpIdeRazorSpanKind kind, string? codeClassificationType, string? vsSemanticRangeType)
{ {
return kind switch return kind switch
{ {
SharpIdeRazorSpanKind.Code => GetColorForClassification(codeClassificationType!), SharpIdeRazorSpanKind.Code => GetColorForClassification(codeClassificationType!),
SharpIdeRazorSpanKind.Comment => CachedColors.CommentGreen, // green SharpIdeRazorSpanKind.Comment => _colourSetForTheme.CommentGreen, // green
SharpIdeRazorSpanKind.MetaCode => CachedColors.RazorMetaCodePurple, // purple SharpIdeRazorSpanKind.MetaCode => _colourSetForTheme.RazorMetaCodePurple, // purple
SharpIdeRazorSpanKind.Markup => GetColorForMarkupSpanKind(vsSemanticRangeType), SharpIdeRazorSpanKind.Markup => GetColorForMarkupSpanKind(vsSemanticRangeType),
SharpIdeRazorSpanKind.Transition => CachedColors.RazorMetaCodePurple, // purple SharpIdeRazorSpanKind.Transition => _colourSetForTheme.RazorMetaCodePurple, // purple
SharpIdeRazorSpanKind.None => CachedColors.White, SharpIdeRazorSpanKind.None => _colourSetForTheme.White,
_ => CachedColors.White _ => _colourSetForTheme.White
}; };
} }
private static Color GetColorForMarkupSpanKind(string? vsSemanticRangeType) private Color GetColorForMarkupSpanKind(string? vsSemanticRangeType)
{ {
return vsSemanticRangeType switch return vsSemanticRangeType switch
{ {
"razorDirective" or "razorTransition" => CachedColors.RazorMetaCodePurple, // purple "razorDirective" or "razorTransition" => _colourSetForTheme.RazorMetaCodePurple, // purple
"markupTagDelimiter" => CachedColors.HtmlDelimiterGray, // gray "markupTagDelimiter" => _colourSetForTheme.HtmlDelimiterGray, // gray
"markupTextLiteral" => CachedColors.White, // white "markupTextLiteral" => _colourSetForTheme.White, // white
"markupElement" => CachedColors.KeywordBlue, // blue "markupElement" => _colourSetForTheme.KeywordBlue, // blue
"razorComponentElement" => CachedColors.RazorComponentGreen, // dark green "razorComponentElement" => _colourSetForTheme.RazorComponentGreen, // dark green
"razorComponentAttribute" => CachedColors.White, // white "razorComponentAttribute" => _colourSetForTheme.White, // white
"razorComment" or "razorCommentStar" or "razorCommentTransition" => CachedColors.CommentGreen, // green "razorComment" or "razorCommentStar" or "razorCommentTransition" => _colourSetForTheme.CommentGreen, // green
"markupOperator" => CachedColors.White, // white "markupOperator" => _colourSetForTheme.White, // white
"markupAttributeQuote" => CachedColors.White, // white "markupAttributeQuote" => _colourSetForTheme.White, // white
_ => CachedColors.White // default to white _ => _colourSetForTheme.White // default to white
}; };
} }
@@ -222,68 +235,68 @@ public partial class CustomHighlighter : SyntaxHighlighter
return highlights; return highlights;
} }
private static Color GetColorForClassification(string classificationType) private Color GetColorForClassification(string classificationType)
{ {
var colour = classificationType switch var colour = classificationType switch
{ {
// Keywords // Keywords
"keyword" => CachedColors.KeywordBlue, "keyword" => _colourSetForTheme.KeywordBlue,
"keyword - control" => CachedColors.KeywordBlue, "keyword - control" => _colourSetForTheme.KeywordBlue,
"preprocessor keyword" => CachedColors.KeywordBlue, "preprocessor keyword" => _colourSetForTheme.KeywordBlue,
// Literals & comments // Literals & comments
"string" => CachedColors.LightOrangeBrown, "string" => _colourSetForTheme.LightOrangeBrown,
"string - verbatim" => CachedColors.LightOrangeBrown, "string - verbatim" => _colourSetForTheme.LightOrangeBrown,
"string - escape character" => CachedColors.Orange, "string - escape character" => _colourSetForTheme.Orange,
"comment" => CachedColors.CommentGreen, "comment" => _colourSetForTheme.CommentGreen,
"number" => CachedColors.NumberGreen, "number" => _colourSetForTheme.NumberGreen,
// Types (User Types) // Types (User Types)
"class name" => CachedColors.ClassGreen, "class name" => _colourSetForTheme.ClassGreen,
"record class name" => CachedColors.ClassGreen, "record class name" => _colourSetForTheme.ClassGreen,
"struct name" => CachedColors.ClassGreen, "struct name" => _colourSetForTheme.ClassGreen,
"record struct name" => CachedColors.ClassGreen, "record struct name" => _colourSetForTheme.ClassGreen,
"interface name" => CachedColors.InterfaceGreen, "interface name" => _colourSetForTheme.InterfaceGreen,
"enum name" => CachedColors.InterfaceGreen, "enum name" => _colourSetForTheme.InterfaceGreen,
"namespace name" => CachedColors.White, "namespace name" => _colourSetForTheme.White,
// Identifiers & members // Identifiers & members
"identifier" => CachedColors.White, "identifier" => _colourSetForTheme.White,
"constant name" => CachedColors.White, "constant name" => _colourSetForTheme.White,
"enum member name" => CachedColors.White, "enum member name" => _colourSetForTheme.White,
"method name" => CachedColors.Yellow, "method name" => _colourSetForTheme.Yellow,
"extension method name" => CachedColors.Yellow, "extension method name" => _colourSetForTheme.Yellow,
"property name" => CachedColors.White, "property name" => _colourSetForTheme.White,
"field name" => CachedColors.White, "field name" => _colourSetForTheme.White,
"static symbol" => CachedColors.Yellow, // ?? "static symbol" => _colourSetForTheme.Yellow, // ??
"parameter name" => CachedColors.VariableBlue, "parameter name" => _colourSetForTheme.VariableBlue,
"local name" => CachedColors.VariableBlue, "local name" => _colourSetForTheme.VariableBlue,
"type parameter name" => CachedColors.ClassGreen, "type parameter name" => _colourSetForTheme.ClassGreen,
"delegate name" => CachedColors.ClassGreen, "delegate name" => _colourSetForTheme.ClassGreen,
"event name" => CachedColors.White, "event name" => _colourSetForTheme.White,
"label name" => CachedColors.White, "label name" => _colourSetForTheme.White,
// Punctuation & operators // Punctuation & operators
"operator" => CachedColors.White, "operator" => _colourSetForTheme.White,
"operator - overloaded" => CachedColors.Yellow, "operator - overloaded" => _colourSetForTheme.Yellow,
"punctuation" => CachedColors.White, "punctuation" => _colourSetForTheme.White,
// Preprocessor // Preprocessor
"preprocessor text" => CachedColors.White, "preprocessor text" => _colourSetForTheme.White,
// Xml comments // Xml comments
"xml doc comment - delimiter" => CachedColors.CommentGreen, "xml doc comment - delimiter" => _colourSetForTheme.CommentGreen,
"xml doc comment - name" => CachedColors.White, "xml doc comment - name" => _colourSetForTheme.White,
"xml doc comment - text" => CachedColors.CommentGreen, "xml doc comment - text" => _colourSetForTheme.CommentGreen,
"xml doc comment - attribute name" => CachedColors.LightOrangeBrown, "xml doc comment - attribute name" => _colourSetForTheme.LightOrangeBrown,
"xml doc comment - attribute quotes" => CachedColors.LightOrangeBrown, "xml doc comment - attribute quotes" => _colourSetForTheme.LightOrangeBrown,
// Misc // Misc
"excluded code" => CachedColors.Gray, "excluded code" => _colourSetForTheme.Gray,
_ => CachedColors.Pink // pink, warning color for unhandled classifications _ => _colourSetForTheme.Pink // pink, warning color for unhandled classifications
}; };
if (colour == CachedColors.Pink) if (colour == _colourSetForTheme.Pink)
{ {
GD.PrintErr($"Unhandled classification type: '{classificationType}'"); GD.PrintErr($"Unhandled classification type: '{classificationType}'");
} }
@@ -311,3 +324,24 @@ public static class CachedColors
public static readonly Color RazorMetaCodePurple = new("a699e6"); public static readonly Color RazorMetaCodePurple = new("a699e6");
public static readonly Color HtmlDelimiterGray = new("808080"); public static readonly Color HtmlDelimiterGray = new("808080");
} }
public static class CachedColorsLight
{
public static readonly Color Orange = new("b776fb"); //
public static readonly Color White = new("000000"); //
public static readonly Color Yellow = new("74531f"); //
public static readonly Color CommentGreen = new("008000"); //
public static readonly Color KeywordBlue = new("0000ff"); //
public static readonly Color LightOrangeBrown = new("a31515"); //
public static readonly Color NumberGreen = new("000000"); //
public static readonly Color InterfaceGreen = new("2b91af"); //
public static readonly Color ClassGreen = new("2b91af"); //
public static readonly Color VariableBlue = new("1f377f"); //
public static readonly Color Gray = new("a9a9a9"); //
public static readonly Color Pink = new("c586c0"); //
public static readonly Color ErrorRed = new("da5b5a"); //
public static readonly Color RazorComponentGreen = new("0b7f7f");
public static readonly Color RazorMetaCodePurple = new("826ee6");
public static readonly Color HtmlDelimiterGray = new("808080");
}

69
src/SharpIDE.Godot/Features/CodeEditor/EditorThemeColours.cs Normal file
View File

@@ -0,0 +1,69 @@
using Godot;
namespace SharpIDE.Godot;
public static class EditorThemeColours
{
public static readonly EditorThemeColorSet Light = new EditorThemeColorSet
{
Orange = CachedColorsLight.Orange,
White = CachedColorsLight.White,
Yellow = CachedColorsLight.Yellow,
CommentGreen = CachedColorsLight.CommentGreen,
KeywordBlue = CachedColorsLight.KeywordBlue,
LightOrangeBrown = CachedColorsLight.LightOrangeBrown,
NumberGreen = CachedColorsLight.NumberGreen,
InterfaceGreen = CachedColorsLight.InterfaceGreen,
ClassGreen = CachedColorsLight.ClassGreen,
VariableBlue = CachedColorsLight.VariableBlue,
Gray = CachedColorsLight.Gray,
Pink = CachedColorsLight.Pink,
ErrorRed = CachedColorsLight.ErrorRed,
RazorComponentGreen = CachedColorsLight.RazorComponentGreen,
RazorMetaCodePurple = CachedColorsLight.RazorMetaCodePurple,
HtmlDelimiterGray = CachedColorsLight.HtmlDelimiterGray
};
public static readonly EditorThemeColorSet Dark = new EditorThemeColorSet
{
Orange = CachedColors.Orange,
White = CachedColors.White,
Yellow = CachedColors.Yellow,
CommentGreen = CachedColors.CommentGreen,
KeywordBlue = CachedColors.KeywordBlue,
LightOrangeBrown = CachedColors.LightOrangeBrown,
NumberGreen = CachedColors.NumberGreen,
InterfaceGreen = CachedColors.InterfaceGreen,
ClassGreen = CachedColors.ClassGreen,
VariableBlue = CachedColors.VariableBlue,
Gray = CachedColors.Gray,
Pink = CachedColors.Pink,
ErrorRed = CachedColors.ErrorRed,
RazorComponentGreen = CachedColors.RazorComponentGreen,
RazorMetaCodePurple = CachedColors.RazorMetaCodePurple,
HtmlDelimiterGray = CachedColors.HtmlDelimiterGray
};
}
public class EditorThemeColorSet
{
public required Color Orange;
public required Color White;
public required Color Yellow;
public required Color CommentGreen;
public required Color KeywordBlue;
public required Color LightOrangeBrown;
public required Color NumberGreen;
public required Color InterfaceGreen;
public required Color ClassGreen;
public required Color VariableBlue;
public required Color Gray;
public required Color Pink;
public required Color ErrorRed;
public required Color RazorComponentGreen;
public required Color RazorMetaCodePurple;
public required Color HtmlDelimiterGray;
}

1
src/SharpIDE.Godot/Features/CodeEditor/EditorThemeColours.cs.uid Normal file
View File

@@ -0,0 +1 @@
uid://b3kjqdx5qtq23