diff --git a/src/SharpIDE.Godot/Features/CodeEditor/EditorThemeColours.cs b/src/SharpIDE.Godot/Features/CodeEditor/EditorThemeColours.cs index a6ce6ba..89f851b 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/EditorThemeColours.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/EditorThemeColours.cs @@ -27,23 +27,23 @@ public static class EditorThemeColours 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, + Orange = TextEditorDotnetColoursDark.Orange, + White = TextEditorDotnetColoursDark.White, + Yellow = TextEditorDotnetColoursDark.Yellow, + CommentGreen = TextEditorDotnetColoursDark.CommentGreen, + KeywordBlue = TextEditorDotnetColoursDark.KeywordBlue, + LightOrangeBrown = TextEditorDotnetColoursDark.LightOrangeBrown, + NumberGreen = TextEditorDotnetColoursDark.NumberGreen, + InterfaceGreen = TextEditorDotnetColoursDark.InterfaceGreen, + ClassGreen = TextEditorDotnetColoursDark.ClassGreen, + VariableBlue = TextEditorDotnetColoursDark.VariableBlue, + Gray = TextEditorDotnetColoursDark.Gray, + Pink = TextEditorDotnetColoursDark.Pink, + ErrorRed = TextEditorDotnetColoursDark.ErrorRed, - RazorComponentGreen = CachedColors.RazorComponentGreen, - RazorMetaCodePurple = CachedColors.RazorMetaCodePurple, - HtmlDelimiterGray = CachedColors.HtmlDelimiterGray + RazorComponentGreen = TextEditorDotnetColoursDark.RazorComponentGreen, + RazorMetaCodePurple = TextEditorDotnetColoursDark.RazorMetaCodePurple, + HtmlDelimiterGray = TextEditorDotnetColoursDark.HtmlDelimiterGray }; } @@ -68,7 +68,7 @@ public class EditorThemeColorSet public required Color HtmlDelimiterGray; } -public static class CachedColors +public static class TextEditorDotnetColoursDark { public static readonly Color Orange = new("f27718"); public static readonly Color White = new("dcdcdc"); diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/Common.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/Common.cs index 2571381..4965416 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/Common.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/Common.cs @@ -13,7 +13,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetUnknownTooltip(ISymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddText($"UNHANDLED SYMBOL TYPE: {symbol.GetType().Name} - please create an issue!"); label.Newline(); @@ -44,7 +44,7 @@ public static partial class SymbolInfoComponents private static void AddAccessibilityModifier(this RichTextLabel label, ISymbol methodSymbol) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText(methodSymbol.DeclaredAccessibility.GetAccessibilityString()); label.Pop(); } @@ -53,7 +53,7 @@ public static partial class SymbolInfoComponents { if (symbol.IsSealed) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("sealed"); label.Pop(); label.AddText(" "); @@ -64,7 +64,7 @@ public static partial class SymbolInfoComponents { if (methodSymbol.IsOverride) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("override"); label.Pop(); label.AddText(" "); @@ -76,7 +76,7 @@ public static partial class SymbolInfoComponents if (symbol is INamedTypeSymbol { TypeKind: TypeKind.Interface }) return; if (symbol.IsAbstract) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("abstract"); label.Pop(); label.AddText(" "); @@ -87,7 +87,7 @@ public static partial class SymbolInfoComponents { if (methodSymbol.IsVirtual) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("virtual"); label.Pop(); label.AddText(" "); @@ -141,7 +141,7 @@ public static partial class SymbolInfoComponents foreach (var (index, ns) in namespaces.Index()) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText(ns); label.Pop(); if (index < namespaces.Length - 1) label.AddText("."); @@ -151,7 +151,7 @@ public static partial class SymbolInfoComponents private static void AddAttribute(this RichTextLabel label, AttributeData attribute, bool newLines) { label.AddText("["); - label.PushColor(CachedColors.ClassGreen); + label.PushColor(TextEditorDotnetColoursDark.ClassGreen); var displayString = attribute.AttributeClass?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat); if (displayString?.EndsWith("Attribute") is true) displayString = displayString[..^9]; // remove last 9 chars label.AddText(displayString ?? "unknown"); @@ -167,13 +167,13 @@ public static partial class SymbolInfoComponents var typeChar = metadataName[0]; var typeColour = typeChar switch { - 'N' => CachedColors.KeywordBlue, - 'T' => CachedColors.ClassGreen, - 'F' => CachedColors.White, - 'P' => CachedColors.White, - 'M' => CachedColors.Yellow, - 'E' => CachedColors.White, - _ => CachedColors.Orange + 'N' => TextEditorDotnetColoursDark.KeywordBlue, + 'T' => TextEditorDotnetColoursDark.ClassGreen, + 'F' => TextEditorDotnetColoursDark.White, + 'P' => TextEditorDotnetColoursDark.White, + 'M' => TextEditorDotnetColoursDark.Yellow, + 'E' => TextEditorDotnetColoursDark.White, + _ => TextEditorDotnetColoursDark.Orange }; var minimalTypeName = (typeChar, metadataName) switch { @@ -222,7 +222,7 @@ public static partial class SymbolInfoComponents var name = reader.GetAttribute(DocumentationCommentXmlNames.NameAttributeName); if (name is not null) { - label.PushColor(CachedColors.ClassGreen); + label.PushColor(TextEditorDotnetColoursDark.ClassGreen); label.AddText(name); label.Pop(); } @@ -232,7 +232,7 @@ public static partial class SymbolInfoComponents var name = reader.GetAttribute(DocumentationCommentXmlNames.NameAttributeName); if (name is not null) { - label.PushColor(CachedColors.VariableBlue); + label.PushColor(TextEditorDotnetColoursDark.VariableBlue); label.AddText(name); label.Pop(); } @@ -242,7 +242,7 @@ public static partial class SymbolInfoComponents var nameOrCref = reader.GetAttribute(DocumentationCommentXmlNames.CrefAttributeName) ?? reader.GetAttribute(DocumentationCommentXmlNames.NameAttributeName); if (nameOrCref is not null) { - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(nameOrCref); label.Pop(); } @@ -270,7 +270,7 @@ public static partial class SymbolInfoComponents if (docComment.ParameterNames.Length is not 0) { label.PushCell(); - label.PushColor(CachedColors.Gray); + label.PushColor(TextEditorDotnetColoursDark.Gray); label.AddText("Params: "); label.Pop(); label.Pop(); @@ -279,7 +279,7 @@ public static partial class SymbolInfoComponents var parameterText = docComment.GetParameterText(parameterName); if (parameterText is null) continue; label.PushCell(); - label.PushColor(CachedColors.VariableBlue); + label.PushColor(TextEditorDotnetColoursDark.VariableBlue); label.AddText(parameterName); label.Pop(); label.AddText(" - "); @@ -296,7 +296,7 @@ public static partial class SymbolInfoComponents if (docComment.TypeParameterNames.Length is not 0) { label.PushCell(); - label.PushColor(CachedColors.Gray); + label.PushColor(TextEditorDotnetColoursDark.Gray); label.AddText("Type Params: "); label.Pop(); label.Pop(); @@ -305,7 +305,7 @@ public static partial class SymbolInfoComponents var typeParameterText = docComment.GetTypeParameterText(typeParameterName); if (typeParameterText is null) continue; label.PushCell(); - label.PushColor(CachedColors.ClassGreen); + label.PushColor(TextEditorDotnetColoursDark.ClassGreen); label.AddText(typeParameterName); label.Pop(); label.AddText(" - "); @@ -321,7 +321,7 @@ public static partial class SymbolInfoComponents if (docComment.ReturnsText is not null) { label.PushCell(); - label.PushColor(CachedColors.Gray); + label.PushColor(TextEditorDotnetColoursDark.Gray); label.AddText("Returns: "); label.Pop(); label.Pop(); @@ -333,7 +333,7 @@ public static partial class SymbolInfoComponents if (docComment.ExceptionTypes.Length is not 0) { label.PushCell(); - label.PushColor(CachedColors.Gray); + label.PushColor(TextEditorDotnetColoursDark.Gray); label.AddText("Exceptions: "); label.Pop(); label.Pop(); @@ -342,7 +342,7 @@ public static partial class SymbolInfoComponents var exceptionText = docComment.GetExceptionTexts(exceptionTypeName).FirstOrDefault(); if (exceptionText is null) continue; label.PushCell(); - label.PushColor(CachedColors.ClassGreen); + label.PushColor(TextEditorDotnetColoursDark.ClassGreen); label.AddText(exceptionTypeName.Split('.').Last()); label.Pop(); label.AddText(" - "); @@ -359,7 +359,7 @@ public static partial class SymbolInfoComponents if (docComment.RemarksText is not null) { label.PushCell(); - label.PushColor(CachedColors.Gray); + label.PushColor(TextEditorDotnetColoursDark.Gray); label.AddText("Remarks: "); label.Pop(); label.Pop(); @@ -389,7 +389,7 @@ public static partial class SymbolInfoComponents private static RichTextLabel AddUnknownType(this RichTextLabel label, ITypeSymbol symbol) { - label.PushColor(CachedColors.Orange); + label.PushColor(TextEditorDotnetColoursDark.Orange); label.AddText("[UNKNOWN TYPE]"); label.AddText(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat)); label.Pop(); @@ -443,7 +443,7 @@ public static partial class SymbolInfoComponents private static RichTextLabel AddTypeParameter(this RichTextLabel label, ITypeParameterSymbol symbol) { - label.PushColor(CachedColors.ClassGreen); + label.PushColor(TextEditorDotnetColoursDark.ClassGreen); label.AddText(symbol.Name); label.Pop(); return label; @@ -451,7 +451,7 @@ public static partial class SymbolInfoComponents private static RichTextLabel AddDynamicType(this RichTextLabel label, IDynamicTypeSymbol symbol) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText(symbol.Name); label.Pop(); return label; @@ -464,29 +464,29 @@ public static partial class SymbolInfoComponents { {SpecialType: not SpecialType.None} => symbol.SpecialType switch { - SpecialType.System_Collections_IEnumerable => CachedColors.InterfaceGreen, - SpecialType.System_Collections_Generic_IEnumerable_T => CachedColors.InterfaceGreen, - SpecialType.System_Collections_Generic_IList_T => CachedColors.InterfaceGreen, - SpecialType.System_Collections_Generic_ICollection_T => CachedColors.InterfaceGreen, - SpecialType.System_Collections_IEnumerator => CachedColors.InterfaceGreen, - SpecialType.System_Collections_Generic_IEnumerator_T => CachedColors.InterfaceGreen, - SpecialType.System_Collections_Generic_IReadOnlyList_T => CachedColors.InterfaceGreen, - SpecialType.System_Collections_Generic_IReadOnlyCollection_T => CachedColors.InterfaceGreen, - SpecialType.System_IDisposable => CachedColors.InterfaceGreen, - SpecialType.System_IAsyncResult => CachedColors.InterfaceGreen, - _ => CachedColors.KeywordBlue + SpecialType.System_Collections_IEnumerable => TextEditorDotnetColoursDark.InterfaceGreen, + SpecialType.System_Collections_Generic_IEnumerable_T => TextEditorDotnetColoursDark.InterfaceGreen, + SpecialType.System_Collections_Generic_IList_T => TextEditorDotnetColoursDark.InterfaceGreen, + SpecialType.System_Collections_Generic_ICollection_T => TextEditorDotnetColoursDark.InterfaceGreen, + SpecialType.System_Collections_IEnumerator => TextEditorDotnetColoursDark.InterfaceGreen, + SpecialType.System_Collections_Generic_IEnumerator_T => TextEditorDotnetColoursDark.InterfaceGreen, + SpecialType.System_Collections_Generic_IReadOnlyList_T => TextEditorDotnetColoursDark.InterfaceGreen, + SpecialType.System_Collections_Generic_IReadOnlyCollection_T => TextEditorDotnetColoursDark.InterfaceGreen, + SpecialType.System_IDisposable => TextEditorDotnetColoursDark.InterfaceGreen, + SpecialType.System_IAsyncResult => TextEditorDotnetColoursDark.InterfaceGreen, + _ => TextEditorDotnetColoursDark.KeywordBlue }, INamedTypeSymbol namedTypeSymbol => namedTypeSymbol.TypeKind switch { - TypeKind.Class => CachedColors.ClassGreen, - TypeKind.Interface => CachedColors.InterfaceGreen, - TypeKind.Struct => CachedColors.ClassGreen, - TypeKind.Enum => CachedColors.InterfaceGreen, - TypeKind.Delegate => CachedColors.ClassGreen, - TypeKind.Dynamic => CachedColors.KeywordBlue, - _ => CachedColors.Orange + TypeKind.Class => TextEditorDotnetColoursDark.ClassGreen, + TypeKind.Interface => TextEditorDotnetColoursDark.InterfaceGreen, + TypeKind.Struct => TextEditorDotnetColoursDark.ClassGreen, + TypeKind.Enum => TextEditorDotnetColoursDark.InterfaceGreen, + TypeKind.Delegate => TextEditorDotnetColoursDark.ClassGreen, + TypeKind.Dynamic => TextEditorDotnetColoursDark.KeywordBlue, + _ => TextEditorDotnetColoursDark.Orange }, - _ => CachedColors.Orange + _ => TextEditorDotnetColoursDark.Orange }; return colour; } diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiagnosticTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiagnosticTooltip.cs index 029f7ed..9c00d8a 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiagnosticTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiagnosticTooltip.cs @@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetDiagnostic(SharpIdeDiagnostic diagnostic) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFontSize(14); label.AddText(diagnostic.Diagnostic.GetMessage()); label.Pop(); diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiscardTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiscardTooltip.cs index 23a7d95..62619d1 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiscardTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiscardTooltip.cs @@ -9,7 +9,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetDiscardSymbolInfo(IDiscardSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddText("discard "); label.AddType(symbol.Type); @@ -22,7 +22,7 @@ public static partial class SymbolInfoComponents private static void AddDiscard(this RichTextLabel label, IDiscardSymbol _) { - label.PushColor(CachedColors.VariableBlue); + label.PushColor(TextEditorDotnetColoursDark.VariableBlue); label.AddText("_"); label.Pop(); } diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DynamicTypeTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DynamicTypeTooltip.cs index 41a6461..52ce246 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DynamicTypeTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DynamicTypeTooltip.cs @@ -9,9 +9,9 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetDynamicTypeSymbolInfo(IDynamicTypeSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText(symbol.ToDisplayString()); label.Pop(); label.Pop(); diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EnumValueTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EnumValueTooltip.cs index 712e7ff..3d377f7 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EnumValueTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EnumValueTooltip.cs @@ -15,12 +15,12 @@ public static partial class SymbolInfoComponents } var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddAttributes(symbol); label.AddFieldName(symbol); label.AddText(" = "); - label.PushColor(CachedColors.NumberGreen); + label.PushColor(TextEditorDotnetColoursDark.NumberGreen); label.AddText($"{symbol.ConstantValue}"); label.Pop(); label.AddText(";"); diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EventTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EventTooltip.cs index 554a525..d07ee49 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EventTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EventTooltip.cs @@ -9,7 +9,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetEventSymbolInfo(IEventSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddAccessibilityModifier(symbol); label.AddEventKeyword(symbol); @@ -26,7 +26,7 @@ public static partial class SymbolInfoComponents private static void AddEventKeyword(this RichTextLabel label, IEventSymbol symbol) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("event "); label.Pop(); } @@ -39,7 +39,7 @@ public static partial class SymbolInfoComponents private static void AddEventName(this RichTextLabel label, IEventSymbol symbol) { - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(symbol.Name); label.Pop(); } @@ -47,11 +47,11 @@ public static partial class SymbolInfoComponents private static void AddEventMethods(this RichTextLabel label, IEventSymbol symbol) { label.AddText(" { "); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("add"); label.Pop(); label.AddText("; "); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("remove"); label.Pop(); label.AddText("; }"); diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/FieldTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/FieldTooltip.cs index d71584c..f70a26d 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/FieldTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/FieldTooltip.cs @@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetFieldSymbolInfo(IFieldSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddAttributes(symbol); label.AddAccessibilityModifier(symbol); @@ -35,7 +35,7 @@ public static partial class SymbolInfoComponents { if (symbol.IsStatic) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("static"); label.Pop(); label.AddText(" "); @@ -46,7 +46,7 @@ public static partial class SymbolInfoComponents { if (fieldSymbol.IsReadOnly) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("readonly"); label.Pop(); label.AddText(" "); @@ -57,7 +57,7 @@ public static partial class SymbolInfoComponents { if (symbol.IsRequired) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("required"); label.Pop(); label.AddText(" "); @@ -72,7 +72,7 @@ public static partial class SymbolInfoComponents private static void AddFieldName(this RichTextLabel label, IFieldSymbol fieldSymbol) { - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(fieldSymbol.Name); label.Pop(); } diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LabelTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LabelTooltip.cs index 9bb5c79..d4b275f 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LabelTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LabelTooltip.cs @@ -9,7 +9,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetLabelSymbolInfo(ILabelSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddText("label "); label.AddLabelName(symbol); @@ -20,7 +20,7 @@ public static partial class SymbolInfoComponents private static void AddLabelName(this RichTextLabel label, ILabelSymbol symbol) { - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(symbol.Name); label.Pop(); } diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LocalVariableTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LocalVariableTooltip.cs index 5d9d57d..e2aaf32 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LocalVariableTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LocalVariableTooltip.cs @@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetLocalVariableSymbolInfo(ILocalSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddAttributes(symbol); label.AddText("local variable "); @@ -35,7 +35,7 @@ public static partial class SymbolInfoComponents private static void AddLocalVariableName(this RichTextLabel label, ILocalSymbol symbol) { - label.PushColor(CachedColors.VariableBlue); + label.PushColor(TextEditorDotnetColoursDark.VariableBlue); label.AddText(symbol.Name); label.Pop(); } diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/MethodTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/MethodTooltip.cs index ff22ba0..d226693 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/MethodTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/MethodTooltip.cs @@ -10,7 +10,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetMethodSymbolInfo(IMethodSymbol methodSymbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddAttributes(methodSymbol); label.AddAccessibilityModifier(methodSymbol); @@ -41,7 +41,7 @@ public static partial class SymbolInfoComponents { if (methodSymbol.IsStatic || methodSymbol.ReducedFrom?.IsStatic is true) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("static"); label.Pop(); label.AddText(" "); @@ -52,7 +52,7 @@ public static partial class SymbolInfoComponents { if (methodSymbol.IsAsync) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("async"); label.Pop(); label.AddText(" "); @@ -63,7 +63,7 @@ public static partial class SymbolInfoComponents { if (methodSymbol.ReturnsVoid) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("void"); label.Pop(); return; @@ -74,7 +74,7 @@ public static partial class SymbolInfoComponents private static void AddMethodName(this RichTextLabel label, IMethodSymbol methodSymbol) { - label.PushColor(CachedColors.Yellow); + label.PushColor(TextEditorDotnetColoursDark.Yellow); label.AddText(methodSymbol.Name); label.Pop(); } @@ -82,12 +82,12 @@ public static partial class SymbolInfoComponents private static void AddTypeParameters(this RichTextLabel label, IMethodSymbol methodSymbol) { if (methodSymbol.TypeParameters.Length == 0) return; - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText("<"); label.Pop(); foreach (var (index, typeParameter) in methodSymbol.TypeParameters.Index()) { - label.PushColor(CachedColors.ClassGreen); + label.PushColor(TextEditorDotnetColoursDark.ClassGreen); label.AddText(typeParameter.Name); label.Pop(); if (index < methodSymbol.TypeParameters.Length - 1) @@ -95,7 +95,7 @@ public static partial class SymbolInfoComponents label.AddText(", "); } } - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(">"); label.Pop(); } @@ -104,7 +104,7 @@ public static partial class SymbolInfoComponents { if (methodSymbol.IsExtensionMethod) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("this"); label.Pop(); label.AddText(" "); @@ -123,21 +123,21 @@ public static partial class SymbolInfoComponents } if (parameterSymbol.RefKind != RefKind.None) // ref, in, out { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText(parameterSymbol.RefKind.ToString().ToLower()); label.Pop(); label.AddText(" "); } else if (parameterSymbol.IsParams) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("params"); label.Pop(); label.AddText(" "); } label.AddType(parameterSymbol.Type); label.AddText(" "); - label.PushColor(CachedColors.VariableBlue); + label.PushColor(TextEditorDotnetColoursDark.VariableBlue); label.AddText(parameterSymbol.Name); label.Pop(); // default value @@ -146,7 +146,7 @@ public static partial class SymbolInfoComponents label.AddText(" = "); if (parameterSymbol.ExplicitDefaultValue is null) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("null"); label.Pop(); } @@ -160,19 +160,19 @@ public static partial class SymbolInfoComponents if (enumMember != null) { - label.PushColor(CachedColors.InterfaceGreen); + label.PushColor(TextEditorDotnetColoursDark.InterfaceGreen); label.AddText(parameterSymbol.Type.Name); label.Pop(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText("."); label.Pop(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(enumMember.Name); label.Pop(); } else { - label.PushColor(CachedColors.InterfaceGreen); + label.PushColor(TextEditorDotnetColoursDark.InterfaceGreen); label.AddText(parameterSymbol.Type.Name); label.Pop(); label.AddText($"({explicitDefaultValue})"); @@ -180,7 +180,7 @@ public static partial class SymbolInfoComponents } else if (parameterSymbol.ExplicitDefaultValue is string str) { - label.PushColor(CachedColors.LightOrangeBrown); + label.PushColor(TextEditorDotnetColoursDark.LightOrangeBrown); label.AddText($""" "{str}" """); @@ -188,7 +188,7 @@ public static partial class SymbolInfoComponents } else if (parameterSymbol.ExplicitDefaultValue is bool b) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText(b ? "true" : "false"); label.Pop(); } @@ -214,7 +214,7 @@ public static partial class SymbolInfoComponents if (typeParameters.Length != typeArguments.Length) throw new Exception("Type parameters and type arguments length mismatch."); foreach (var (index, (typeArgument, typeParameter)) in methodSymbol.TypeArguments.Zip(typeParameters).Index()) { - label.PushColor(CachedColors.ClassGreen); + label.PushColor(TextEditorDotnetColoursDark.ClassGreen); label.AddType(typeParameter); label.Pop(); label.AddText(" is "); @@ -234,7 +234,7 @@ public static partial class SymbolInfoComponents if (hasConstraints is false) continue; label.AddText(" "); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("where"); label.Pop(); label.AddText(" "); @@ -244,7 +244,7 @@ public static partial class SymbolInfoComponents if (typeParameter.HasReferenceTypeConstraint) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("class"); label.Pop(); } @@ -252,7 +252,7 @@ public static partial class SymbolInfoComponents if (typeParameter.HasValueTypeConstraint) { MaybeAddComma(); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("struct"); label.Pop(); } @@ -260,7 +260,7 @@ public static partial class SymbolInfoComponents if (typeParameter.HasUnmanagedTypeConstraint) { MaybeAddComma(); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("unmanaged"); label.Pop(); } @@ -268,7 +268,7 @@ public static partial class SymbolInfoComponents if (typeParameter.HasNotNullConstraint) { MaybeAddComma(); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("notnull"); label.Pop(); } @@ -282,7 +282,7 @@ public static partial class SymbolInfoComponents if (typeParameter.HasConstructorConstraint) { MaybeAddComma(); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("new"); label.Pop(); label.AddText("()"); @@ -291,7 +291,7 @@ public static partial class SymbolInfoComponents if (typeParameter.AllowsRefLikeType) { MaybeAddComma(); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("allows ref struct"); label.Pop(); } diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamedTypeTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamedTypeTooltip.cs index eef3c3a..c94637b 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamedTypeTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamedTypeTooltip.cs @@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetNamedTypeSymbolInfo(INamedTypeSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddAttributes(symbol); label.AddAccessibilityModifier(symbol); @@ -39,7 +39,7 @@ public static partial class SymbolInfoComponents private static void AddNamedTypeSymbolType(this RichTextLabel label, INamedTypeSymbol symbol) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText(GetNamedTypeSymbolTypeName(symbol)); label.Pop(); label.AddText(" "); @@ -80,7 +80,7 @@ public static partial class SymbolInfoComponents if (containingModule is not null) { label.Newline(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText($"from module {containingModule.Name}"); label.Pop(); } @@ -90,7 +90,7 @@ public static partial class SymbolInfoComponents { if (symbol.IsReadOnly) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("readonly"); label.Pop(); label.AddText(" "); diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamespaceTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamespaceTooltip.cs index 8684a23..69c2ea3 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamespaceTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamespaceTooltip.cs @@ -9,9 +9,9 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetNamespaceSymbolInfo(INamespaceSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("namespace"); label.Pop(); // color label.AddText(" "); diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/ParameterTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/ParameterTooltip.cs index 653e9dd..9a3ee04 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/ParameterTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/ParameterTooltip.cs @@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetParameterSymbolInfo(IParameterSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddAttributes(symbol); label.AddText("parameter "); @@ -37,7 +37,7 @@ public static partial class SymbolInfoComponents private static void AddParameterName(this RichTextLabel label, IParameterSymbol symbol) { - label.PushColor(CachedColors.VariableBlue); + label.PushColor(TextEditorDotnetColoursDark.VariableBlue); label.AddText(symbol.Name); label.Pop(); } diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/PropertyTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/PropertyTooltip.cs index 6930e12..f3cb0b6 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/PropertyTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/PropertyTooltip.cs @@ -8,7 +8,7 @@ public partial class SymbolInfoComponents public static RichTextLabel GetPropertySymbolInfo(IPropertySymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddAttributes(symbol); label.AddAccessibilityModifier(symbol); @@ -35,7 +35,7 @@ public partial class SymbolInfoComponents { if (symbol.IsReadOnly) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("readonly"); label.Pop(); label.AddText(" "); @@ -46,7 +46,7 @@ public partial class SymbolInfoComponents { if (symbol.IsRequired) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("required"); label.Pop(); label.AddText(" "); @@ -61,7 +61,7 @@ public partial class SymbolInfoComponents private static void AddPropertyName(this RichTextLabel label, IPropertySymbol symbol) { - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(symbol.Name); label.Pop(); } @@ -72,10 +72,10 @@ public partial class SymbolInfoComponents if (symbol.GetMethod is not null) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("get"); label.Pop(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(";"); label.Pop(); label.AddText(" "); @@ -84,7 +84,7 @@ public partial class SymbolInfoComponents { if (setMethod.DeclaredAccessibility != symbol.DeclaredAccessibility) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText(setMethod.DeclaredAccessibility.ToString().ToLower()); label.Pop(); label.AddText(" "); @@ -92,19 +92,19 @@ public partial class SymbolInfoComponents if (setMethod.IsInitOnly) { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("init"); label.Pop(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(";"); label.Pop(); } else { - label.PushColor(CachedColors.KeywordBlue); + label.PushColor(TextEditorDotnetColoursDark.KeywordBlue); label.AddText("set"); label.Pop(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.AddText(";"); label.Pop(); } diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/TypeParameterTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/TypeParameterTooltip.cs index 14209d0..c11d247 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/TypeParameterTooltip.cs +++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/TypeParameterTooltip.cs @@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents public static RichTextLabel GetTypeParameterSymbolInfo(ITypeParameterSymbol symbol) { var label = new RichTextLabel(); - label.PushColor(CachedColors.White); + label.PushColor(TextEditorDotnetColoursDark.White); label.PushFont(MonospaceFont); label.AddTypeParameter(symbol); label.AddText(" in "); diff --git a/src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.DebuggerVariableCustomDraw.cs b/src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.DebuggerVariableCustomDraw.cs index 6e0f62d..848ea18 100644 --- a/src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.DebuggerVariableCustomDraw.cs +++ b/src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.DebuggerVariableCustomDraw.cs @@ -34,12 +34,12 @@ public partial class ThreadsVariablesSubTab var variableValueDisplayColour = variable switch { - _ when variable.PresentationHint?.Attributes is { } attrs && (attrs & VariablePresentationHint.AttributesValue.FailedEvaluation) != 0 => CachedColors.ErrorRed, - { Value: "null" } => CachedColors.KeywordBlue, - { Value: "true" or "false" } => CachedColors.KeywordBlue, - { Type: "string" or "char" } => CachedColors.LightOrangeBrown, - { Type: "byte" or "sbyte" or "short" or "ushort" or "int" or "uint" or "long" or "ulong" or "nint" or "nuint" or "float" or "double" or "decimal" } => CachedColors.NumberGreen, - { Type: "byte?" or "sbyte?" or "short?" or "ushort?" or "int?" or "uint?" or "long?" or "ulong?" or "nint?" or "nuint?" or "float?" or "double?" or "decimal?" } => CachedColors.NumberGreen, // value here will never actually be null, as we handled "null" value above + _ when variable.PresentationHint?.Attributes is { } attrs && (attrs & VariablePresentationHint.AttributesValue.FailedEvaluation) != 0 => TextEditorDotnetColoursDark.ErrorRed, + { Value: "null" } => TextEditorDotnetColoursDark.KeywordBlue, + { Value: "true" or "false" } => TextEditorDotnetColoursDark.KeywordBlue, + { Type: "string" or "char" } => TextEditorDotnetColoursDark.LightOrangeBrown, + { Type: "byte" or "sbyte" or "short" or "ushort" or "int" or "uint" or "long" or "ulong" or "nint" or "nuint" or "float" or "double" or "decimal" } => TextEditorDotnetColoursDark.NumberGreen, + { Type: "byte?" or "sbyte?" or "short?" or "ushort?" or "int?" or "uint?" or "long?" or "ulong?" or "nint?" or "nuint?" or "float?" or "double?" or "decimal?" } => TextEditorDotnetColoursDark.NumberGreen, // value here will never actually be null, as we handled "null" value above _ => VariableWhiteColor };