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

rename class

Browse Source
This commit is contained in:
Matt Parker
2026-01-31 14:24:48 +10:00
parent ac9462586d
commit 826fc851c3
17 changed files with 139 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/SharpIDE.Godot/Features/CodeEditor/EditorThemeColours.cs
View File

@@ -27,23 +27,23 @@ public static class EditorThemeColours
public static readonly EditorThemeColorSet Dark = new EditorThemeColorSet public static readonly EditorThemeColorSet Dark = new EditorThemeColorSet
{ {
Orange = CachedColors.Orange, Orange = TextEditorDotnetColoursDark.Orange,
White = CachedColors.White, White = TextEditorDotnetColoursDark.White,
Yellow = CachedColors.Yellow, Yellow = TextEditorDotnetColoursDark.Yellow,
CommentGreen = CachedColors.CommentGreen, CommentGreen = TextEditorDotnetColoursDark.CommentGreen,
KeywordBlue = CachedColors.KeywordBlue, KeywordBlue = TextEditorDotnetColoursDark.KeywordBlue,
LightOrangeBrown = CachedColors.LightOrangeBrown, LightOrangeBrown = TextEditorDotnetColoursDark.LightOrangeBrown,
NumberGreen = CachedColors.NumberGreen, NumberGreen = TextEditorDotnetColoursDark.NumberGreen,
InterfaceGreen = CachedColors.InterfaceGreen, InterfaceGreen = TextEditorDotnetColoursDark.InterfaceGreen,
ClassGreen = CachedColors.ClassGreen, ClassGreen = TextEditorDotnetColoursDark.ClassGreen,
VariableBlue = CachedColors.VariableBlue, VariableBlue = TextEditorDotnetColoursDark.VariableBlue,
Gray = CachedColors.Gray, Gray = TextEditorDotnetColoursDark.Gray,
Pink = CachedColors.Pink, Pink = TextEditorDotnetColoursDark.Pink,
ErrorRed = CachedColors.ErrorRed, ErrorRed = TextEditorDotnetColoursDark.ErrorRed,
RazorComponentGreen = CachedColors.RazorComponentGreen, RazorComponentGreen = TextEditorDotnetColoursDark.RazorComponentGreen,
RazorMetaCodePurple = CachedColors.RazorMetaCodePurple, RazorMetaCodePurple = TextEditorDotnetColoursDark.RazorMetaCodePurple,
HtmlDelimiterGray = CachedColors.HtmlDelimiterGray HtmlDelimiterGray = TextEditorDotnetColoursDark.HtmlDelimiterGray
}; };
} }
@@ -68,7 +68,7 @@ public class EditorThemeColorSet
public required Color HtmlDelimiterGray; public required Color HtmlDelimiterGray;
} }
public static class CachedColors public static class TextEditorDotnetColoursDark
{ {
public static readonly Color Orange = new("f27718"); public static readonly Color Orange = new("f27718");
public static readonly Color White = new("dcdcdc"); public static readonly Color White = new("dcdcdc");

96
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/Common.cs
View File

@@ -13,7 +13,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetUnknownTooltip(ISymbol symbol) public static RichTextLabel GetUnknownTooltip(ISymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddText($"UNHANDLED SYMBOL TYPE: {symbol.GetType().Name} - please create an issue!"); label.AddText($"UNHANDLED SYMBOL TYPE: {symbol.GetType().Name} - please create an issue!");
label.Newline(); label.Newline();
@@ -44,7 +44,7 @@ public static partial class SymbolInfoComponents
private static void AddAccessibilityModifier(this RichTextLabel label, ISymbol methodSymbol) private static void AddAccessibilityModifier(this RichTextLabel label, ISymbol methodSymbol)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText(methodSymbol.DeclaredAccessibility.GetAccessibilityString()); label.AddText(methodSymbol.DeclaredAccessibility.GetAccessibilityString());
label.Pop(); label.Pop();
} }
@@ -53,7 +53,7 @@ public static partial class SymbolInfoComponents
{ {
if (symbol.IsSealed) if (symbol.IsSealed)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("sealed"); label.AddText("sealed");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -64,7 +64,7 @@ public static partial class SymbolInfoComponents
{ {
if (methodSymbol.IsOverride) if (methodSymbol.IsOverride)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("override"); label.AddText("override");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -76,7 +76,7 @@ public static partial class SymbolInfoComponents
if (symbol is INamedTypeSymbol { TypeKind: TypeKind.Interface }) return; if (symbol is INamedTypeSymbol { TypeKind: TypeKind.Interface }) return;
if (symbol.IsAbstract) if (symbol.IsAbstract)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("abstract"); label.AddText("abstract");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -87,7 +87,7 @@ public static partial class SymbolInfoComponents
{ {
if (methodSymbol.IsVirtual) if (methodSymbol.IsVirtual)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("virtual"); label.AddText("virtual");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -141,7 +141,7 @@ public static partial class SymbolInfoComponents
foreach (var (index, ns) in namespaces.Index()) foreach (var (index, ns) in namespaces.Index())
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText(ns); label.AddText(ns);
label.Pop(); label.Pop();
if (index < namespaces.Length - 1) label.AddText("."); 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) private static void AddAttribute(this RichTextLabel label, AttributeData attribute, bool newLines)
{ {
label.AddText("["); label.AddText("[");
label.PushColor(CachedColors.ClassGreen); label.PushColor(TextEditorDotnetColoursDark.ClassGreen);
var displayString = attribute.AttributeClass?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat); var displayString = attribute.AttributeClass?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat);
if (displayString?.EndsWith("Attribute") is true) displayString = displayString[..^9]; // remove last 9 chars if (displayString?.EndsWith("Attribute") is true) displayString = displayString[..^9]; // remove last 9 chars
label.AddText(displayString ?? "unknown"); label.AddText(displayString ?? "unknown");
@@ -167,13 +167,13 @@ public static partial class SymbolInfoComponents
var typeChar = metadataName[0]; var typeChar = metadataName[0];
var typeColour = typeChar switch var typeColour = typeChar switch
{ {
'N' => CachedColors.KeywordBlue, 'N' => TextEditorDotnetColoursDark.KeywordBlue,
'T' => CachedColors.ClassGreen, 'T' => TextEditorDotnetColoursDark.ClassGreen,
'F' => CachedColors.White, 'F' => TextEditorDotnetColoursDark.White,
'P' => CachedColors.White, 'P' => TextEditorDotnetColoursDark.White,
'M' => CachedColors.Yellow, 'M' => TextEditorDotnetColoursDark.Yellow,
'E' => CachedColors.White, 'E' => TextEditorDotnetColoursDark.White,
_ => CachedColors.Orange _ => TextEditorDotnetColoursDark.Orange
}; };
var minimalTypeName = (typeChar, metadataName) switch var minimalTypeName = (typeChar, metadataName) switch
{ {
@@ -222,7 +222,7 @@ public static partial class SymbolInfoComponents
var name = reader.GetAttribute(DocumentationCommentXmlNames.NameAttributeName); var name = reader.GetAttribute(DocumentationCommentXmlNames.NameAttributeName);
if (name is not null) if (name is not null)
{ {
label.PushColor(CachedColors.ClassGreen); label.PushColor(TextEditorDotnetColoursDark.ClassGreen);
label.AddText(name); label.AddText(name);
label.Pop(); label.Pop();
} }
@@ -232,7 +232,7 @@ public static partial class SymbolInfoComponents
var name = reader.GetAttribute(DocumentationCommentXmlNames.NameAttributeName); var name = reader.GetAttribute(DocumentationCommentXmlNames.NameAttributeName);
if (name is not null) if (name is not null)
{ {
label.PushColor(CachedColors.VariableBlue); label.PushColor(TextEditorDotnetColoursDark.VariableBlue);
label.AddText(name); label.AddText(name);
label.Pop(); label.Pop();
} }
@@ -242,7 +242,7 @@ public static partial class SymbolInfoComponents
var nameOrCref = reader.GetAttribute(DocumentationCommentXmlNames.CrefAttributeName) ?? reader.GetAttribute(DocumentationCommentXmlNames.NameAttributeName); var nameOrCref = reader.GetAttribute(DocumentationCommentXmlNames.CrefAttributeName) ?? reader.GetAttribute(DocumentationCommentXmlNames.NameAttributeName);
if (nameOrCref is not null) if (nameOrCref is not null)
{ {
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(nameOrCref); label.AddText(nameOrCref);
label.Pop(); label.Pop();
} }
@@ -270,7 +270,7 @@ public static partial class SymbolInfoComponents
if (docComment.ParameterNames.Length is not 0) if (docComment.ParameterNames.Length is not 0)
{ {
label.PushCell(); label.PushCell();
label.PushColor(CachedColors.Gray); label.PushColor(TextEditorDotnetColoursDark.Gray);
label.AddText("Params: "); label.AddText("Params: ");
label.Pop(); label.Pop();
label.Pop(); label.Pop();
@@ -279,7 +279,7 @@ public static partial class SymbolInfoComponents
var parameterText = docComment.GetParameterText(parameterName); var parameterText = docComment.GetParameterText(parameterName);
if (parameterText is null) continue; if (parameterText is null) continue;
label.PushCell(); label.PushCell();
label.PushColor(CachedColors.VariableBlue); label.PushColor(TextEditorDotnetColoursDark.VariableBlue);
label.AddText(parameterName); label.AddText(parameterName);
label.Pop(); label.Pop();
label.AddText(" - "); label.AddText(" - ");
@@ -296,7 +296,7 @@ public static partial class SymbolInfoComponents
if (docComment.TypeParameterNames.Length is not 0) if (docComment.TypeParameterNames.Length is not 0)
{ {
label.PushCell(); label.PushCell();
label.PushColor(CachedColors.Gray); label.PushColor(TextEditorDotnetColoursDark.Gray);
label.AddText("Type Params: "); label.AddText("Type Params: ");
label.Pop(); label.Pop();
label.Pop(); label.Pop();
@@ -305,7 +305,7 @@ public static partial class SymbolInfoComponents
var typeParameterText = docComment.GetTypeParameterText(typeParameterName); var typeParameterText = docComment.GetTypeParameterText(typeParameterName);
if (typeParameterText is null) continue; if (typeParameterText is null) continue;
label.PushCell(); label.PushCell();
label.PushColor(CachedColors.ClassGreen); label.PushColor(TextEditorDotnetColoursDark.ClassGreen);
label.AddText(typeParameterName); label.AddText(typeParameterName);
label.Pop(); label.Pop();
label.AddText(" - "); label.AddText(" - ");
@@ -321,7 +321,7 @@ public static partial class SymbolInfoComponents
if (docComment.ReturnsText is not null) if (docComment.ReturnsText is not null)
{ {
label.PushCell(); label.PushCell();
label.PushColor(CachedColors.Gray); label.PushColor(TextEditorDotnetColoursDark.Gray);
label.AddText("Returns: "); label.AddText("Returns: ");
label.Pop(); label.Pop();
label.Pop(); label.Pop();
@@ -333,7 +333,7 @@ public static partial class SymbolInfoComponents
if (docComment.ExceptionTypes.Length is not 0) if (docComment.ExceptionTypes.Length is not 0)
{ {
label.PushCell(); label.PushCell();
label.PushColor(CachedColors.Gray); label.PushColor(TextEditorDotnetColoursDark.Gray);
label.AddText("Exceptions: "); label.AddText("Exceptions: ");
label.Pop(); label.Pop();
label.Pop(); label.Pop();
@@ -342,7 +342,7 @@ public static partial class SymbolInfoComponents
var exceptionText = docComment.GetExceptionTexts(exceptionTypeName).FirstOrDefault(); var exceptionText = docComment.GetExceptionTexts(exceptionTypeName).FirstOrDefault();
if (exceptionText is null) continue; if (exceptionText is null) continue;
label.PushCell(); label.PushCell();
label.PushColor(CachedColors.ClassGreen); label.PushColor(TextEditorDotnetColoursDark.ClassGreen);
label.AddText(exceptionTypeName.Split('.').Last()); label.AddText(exceptionTypeName.Split('.').Last());
label.Pop(); label.Pop();
label.AddText(" - "); label.AddText(" - ");
@@ -359,7 +359,7 @@ public static partial class SymbolInfoComponents
if (docComment.RemarksText is not null) if (docComment.RemarksText is not null)
{ {
label.PushCell(); label.PushCell();
label.PushColor(CachedColors.Gray); label.PushColor(TextEditorDotnetColoursDark.Gray);
label.AddText("Remarks: "); label.AddText("Remarks: ");
label.Pop(); label.Pop();
label.Pop(); label.Pop();
@@ -389,7 +389,7 @@ public static partial class SymbolInfoComponents
private static RichTextLabel AddUnknownType(this RichTextLabel label, ITypeSymbol symbol) private static RichTextLabel AddUnknownType(this RichTextLabel label, ITypeSymbol symbol)
{ {
label.PushColor(CachedColors.Orange); label.PushColor(TextEditorDotnetColoursDark.Orange);
label.AddText("[UNKNOWN TYPE]"); label.AddText("[UNKNOWN TYPE]");
label.AddText(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat)); label.AddText(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
label.Pop(); label.Pop();
@@ -443,7 +443,7 @@ public static partial class SymbolInfoComponents
private static RichTextLabel AddTypeParameter(this RichTextLabel label, ITypeParameterSymbol symbol) private static RichTextLabel AddTypeParameter(this RichTextLabel label, ITypeParameterSymbol symbol)
{ {
label.PushColor(CachedColors.ClassGreen); label.PushColor(TextEditorDotnetColoursDark.ClassGreen);
label.AddText(symbol.Name); label.AddText(symbol.Name);
label.Pop(); label.Pop();
return label; return label;
@@ -451,7 +451,7 @@ public static partial class SymbolInfoComponents
private static RichTextLabel AddDynamicType(this RichTextLabel label, IDynamicTypeSymbol symbol) private static RichTextLabel AddDynamicType(this RichTextLabel label, IDynamicTypeSymbol symbol)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText(symbol.Name); label.AddText(symbol.Name);
label.Pop(); label.Pop();
return label; return label;
@@ -464,29 +464,29 @@ public static partial class SymbolInfoComponents
{ {
{SpecialType: not SpecialType.None} => symbol.SpecialType switch {SpecialType: not SpecialType.None} => symbol.SpecialType switch
{ {
SpecialType.System_Collections_IEnumerable => CachedColors.InterfaceGreen, SpecialType.System_Collections_IEnumerable => TextEditorDotnetColoursDark.InterfaceGreen,
SpecialType.System_Collections_Generic_IEnumerable_T => CachedColors.InterfaceGreen, SpecialType.System_Collections_Generic_IEnumerable_T => TextEditorDotnetColoursDark.InterfaceGreen,
SpecialType.System_Collections_Generic_IList_T => CachedColors.InterfaceGreen, SpecialType.System_Collections_Generic_IList_T => TextEditorDotnetColoursDark.InterfaceGreen,
SpecialType.System_Collections_Generic_ICollection_T => CachedColors.InterfaceGreen, SpecialType.System_Collections_Generic_ICollection_T => TextEditorDotnetColoursDark.InterfaceGreen,
SpecialType.System_Collections_IEnumerator => CachedColors.InterfaceGreen, SpecialType.System_Collections_IEnumerator => TextEditorDotnetColoursDark.InterfaceGreen,
SpecialType.System_Collections_Generic_IEnumerator_T => CachedColors.InterfaceGreen, SpecialType.System_Collections_Generic_IEnumerator_T => TextEditorDotnetColoursDark.InterfaceGreen,
SpecialType.System_Collections_Generic_IReadOnlyList_T => CachedColors.InterfaceGreen, SpecialType.System_Collections_Generic_IReadOnlyList_T => TextEditorDotnetColoursDark.InterfaceGreen,
SpecialType.System_Collections_Generic_IReadOnlyCollection_T => CachedColors.InterfaceGreen, SpecialType.System_Collections_Generic_IReadOnlyCollection_T => TextEditorDotnetColoursDark.InterfaceGreen,
SpecialType.System_IDisposable => CachedColors.InterfaceGreen, SpecialType.System_IDisposable => TextEditorDotnetColoursDark.InterfaceGreen,
SpecialType.System_IAsyncResult => CachedColors.InterfaceGreen, SpecialType.System_IAsyncResult => TextEditorDotnetColoursDark.InterfaceGreen,
_ => CachedColors.KeywordBlue _ => TextEditorDotnetColoursDark.KeywordBlue
}, },
INamedTypeSymbol namedTypeSymbol => namedTypeSymbol.TypeKind switch INamedTypeSymbol namedTypeSymbol => namedTypeSymbol.TypeKind switch
{ {
TypeKind.Class => CachedColors.ClassGreen, TypeKind.Class => TextEditorDotnetColoursDark.ClassGreen,
TypeKind.Interface => CachedColors.InterfaceGreen, TypeKind.Interface => TextEditorDotnetColoursDark.InterfaceGreen,
TypeKind.Struct => CachedColors.ClassGreen, TypeKind.Struct => TextEditorDotnetColoursDark.ClassGreen,
TypeKind.Enum => CachedColors.InterfaceGreen, TypeKind.Enum => TextEditorDotnetColoursDark.InterfaceGreen,
TypeKind.Delegate => CachedColors.ClassGreen, TypeKind.Delegate => TextEditorDotnetColoursDark.ClassGreen,
TypeKind.Dynamic => CachedColors.KeywordBlue, TypeKind.Dynamic => TextEditorDotnetColoursDark.KeywordBlue,
_ => CachedColors.Orange _ => TextEditorDotnetColoursDark.Orange
}, },
_ => CachedColors.Orange _ => TextEditorDotnetColoursDark.Orange
}; };
return colour; return colour;
} }

2
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiagnosticTooltip.cs
View File

@@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetDiagnostic(SharpIdeDiagnostic diagnostic) public static RichTextLabel GetDiagnostic(SharpIdeDiagnostic diagnostic)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFontSize(14); label.PushFontSize(14);
label.AddText(diagnostic.Diagnostic.GetMessage()); label.AddText(diagnostic.Diagnostic.GetMessage());
label.Pop(); label.Pop();

4
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DiscardTooltip.cs
View File

@@ -9,7 +9,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetDiscardSymbolInfo(IDiscardSymbol symbol) public static RichTextLabel GetDiscardSymbolInfo(IDiscardSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddText("discard "); label.AddText("discard ");
label.AddType(symbol.Type); label.AddType(symbol.Type);
@@ -22,7 +22,7 @@ public static partial class SymbolInfoComponents
private static void AddDiscard(this RichTextLabel label, IDiscardSymbol _) private static void AddDiscard(this RichTextLabel label, IDiscardSymbol _)
{ {
label.PushColor(CachedColors.VariableBlue); label.PushColor(TextEditorDotnetColoursDark.VariableBlue);
label.AddText("_"); label.AddText("_");
label.Pop(); label.Pop();
} }

4
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/DynamicTypeTooltip.cs
View File

@@ -9,9 +9,9 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetDynamicTypeSymbolInfo(IDynamicTypeSymbol symbol) public static RichTextLabel GetDynamicTypeSymbolInfo(IDynamicTypeSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText(symbol.ToDisplayString()); label.AddText(symbol.ToDisplayString());
label.Pop(); label.Pop();
label.Pop(); label.Pop();

4
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EnumValueTooltip.cs
View File

@@ -15,12 +15,12 @@ public static partial class SymbolInfoComponents
} }
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddAttributes(symbol); label.AddAttributes(symbol);
label.AddFieldName(symbol); label.AddFieldName(symbol);
label.AddText(" = "); label.AddText(" = ");
label.PushColor(CachedColors.NumberGreen); label.PushColor(TextEditorDotnetColoursDark.NumberGreen);
label.AddText($"{symbol.ConstantValue}"); label.AddText($"{symbol.ConstantValue}");
label.Pop(); label.Pop();
label.AddText(";"); label.AddText(";");

10
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/EventTooltip.cs
View File

@@ -9,7 +9,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetEventSymbolInfo(IEventSymbol symbol) public static RichTextLabel GetEventSymbolInfo(IEventSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddAccessibilityModifier(symbol); label.AddAccessibilityModifier(symbol);
label.AddEventKeyword(symbol); label.AddEventKeyword(symbol);
@@ -26,7 +26,7 @@ public static partial class SymbolInfoComponents
private static void AddEventKeyword(this RichTextLabel label, IEventSymbol symbol) private static void AddEventKeyword(this RichTextLabel label, IEventSymbol symbol)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("event "); label.AddText("event ");
label.Pop(); label.Pop();
} }
@@ -39,7 +39,7 @@ public static partial class SymbolInfoComponents
private static void AddEventName(this RichTextLabel label, IEventSymbol symbol) private static void AddEventName(this RichTextLabel label, IEventSymbol symbol)
{ {
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(symbol.Name); label.AddText(symbol.Name);
label.Pop(); label.Pop();
} }
@@ -47,11 +47,11 @@ public static partial class SymbolInfoComponents
private static void AddEventMethods(this RichTextLabel label, IEventSymbol symbol) private static void AddEventMethods(this RichTextLabel label, IEventSymbol symbol)
{ {
label.AddText(" { "); label.AddText(" { ");
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("add"); label.AddText("add");
label.Pop(); label.Pop();
label.AddText("; "); label.AddText("; ");
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("remove"); label.AddText("remove");
label.Pop(); label.Pop();
label.AddText("; }"); label.AddText("; }");

10
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/FieldTooltip.cs
View File

@@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetFieldSymbolInfo(IFieldSymbol symbol) public static RichTextLabel GetFieldSymbolInfo(IFieldSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddAttributes(symbol); label.AddAttributes(symbol);
label.AddAccessibilityModifier(symbol); label.AddAccessibilityModifier(symbol);
@@ -35,7 +35,7 @@ public static partial class SymbolInfoComponents
{ {
if (symbol.IsStatic) if (symbol.IsStatic)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("static"); label.AddText("static");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -46,7 +46,7 @@ public static partial class SymbolInfoComponents
{ {
if (fieldSymbol.IsReadOnly) if (fieldSymbol.IsReadOnly)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("readonly"); label.AddText("readonly");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -57,7 +57,7 @@ public static partial class SymbolInfoComponents
{ {
if (symbol.IsRequired) if (symbol.IsRequired)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("required"); label.AddText("required");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -72,7 +72,7 @@ public static partial class SymbolInfoComponents
private static void AddFieldName(this RichTextLabel label, IFieldSymbol fieldSymbol) private static void AddFieldName(this RichTextLabel label, IFieldSymbol fieldSymbol)
{ {
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(fieldSymbol.Name); label.AddText(fieldSymbol.Name);
label.Pop(); label.Pop();
} }

4
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LabelTooltip.cs
View File

@@ -9,7 +9,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetLabelSymbolInfo(ILabelSymbol symbol) public static RichTextLabel GetLabelSymbolInfo(ILabelSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddText("label "); label.AddText("label ");
label.AddLabelName(symbol); label.AddLabelName(symbol);
@@ -20,7 +20,7 @@ public static partial class SymbolInfoComponents
private static void AddLabelName(this RichTextLabel label, ILabelSymbol symbol) private static void AddLabelName(this RichTextLabel label, ILabelSymbol symbol)
{ {
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(symbol.Name); label.AddText(symbol.Name);
label.Pop(); label.Pop();
} }

4
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/LocalVariableTooltip.cs
View File

@@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetLocalVariableSymbolInfo(ILocalSymbol symbol) public static RichTextLabel GetLocalVariableSymbolInfo(ILocalSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddAttributes(symbol); label.AddAttributes(symbol);
label.AddText("local variable "); label.AddText("local variable ");
@@ -35,7 +35,7 @@ public static partial class SymbolInfoComponents
private static void AddLocalVariableName(this RichTextLabel label, ILocalSymbol symbol) private static void AddLocalVariableName(this RichTextLabel label, ILocalSymbol symbol)
{ {
label.PushColor(CachedColors.VariableBlue); label.PushColor(TextEditorDotnetColoursDark.VariableBlue);
label.AddText(symbol.Name); label.AddText(symbol.Name);
label.Pop(); label.Pop();
} }

54
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/MethodTooltip.cs
View File

@@ -10,7 +10,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetMethodSymbolInfo(IMethodSymbol methodSymbol) public static RichTextLabel GetMethodSymbolInfo(IMethodSymbol methodSymbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddAttributes(methodSymbol); label.AddAttributes(methodSymbol);
label.AddAccessibilityModifier(methodSymbol); label.AddAccessibilityModifier(methodSymbol);
@@ -41,7 +41,7 @@ public static partial class SymbolInfoComponents
{ {
if (methodSymbol.IsStatic || methodSymbol.ReducedFrom?.IsStatic is true) if (methodSymbol.IsStatic || methodSymbol.ReducedFrom?.IsStatic is true)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("static"); label.AddText("static");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -52,7 +52,7 @@ public static partial class SymbolInfoComponents
{ {
if (methodSymbol.IsAsync) if (methodSymbol.IsAsync)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("async"); label.AddText("async");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -63,7 +63,7 @@ public static partial class SymbolInfoComponents
{ {
if (methodSymbol.ReturnsVoid) if (methodSymbol.ReturnsVoid)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("void"); label.AddText("void");
label.Pop(); label.Pop();
return; return;
@@ -74,7 +74,7 @@ public static partial class SymbolInfoComponents
private static void AddMethodName(this RichTextLabel label, IMethodSymbol methodSymbol) private static void AddMethodName(this RichTextLabel label, IMethodSymbol methodSymbol)
{ {
label.PushColor(CachedColors.Yellow); label.PushColor(TextEditorDotnetColoursDark.Yellow);
label.AddText(methodSymbol.Name); label.AddText(methodSymbol.Name);
label.Pop(); label.Pop();
} }
@@ -82,12 +82,12 @@ public static partial class SymbolInfoComponents
private static void AddTypeParameters(this RichTextLabel label, IMethodSymbol methodSymbol) private static void AddTypeParameters(this RichTextLabel label, IMethodSymbol methodSymbol)
{ {
if (methodSymbol.TypeParameters.Length == 0) return; if (methodSymbol.TypeParameters.Length == 0) return;
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText("<"); label.AddText("<");
label.Pop(); label.Pop();
foreach (var (index, typeParameter) in methodSymbol.TypeParameters.Index()) foreach (var (index, typeParameter) in methodSymbol.TypeParameters.Index())
{ {
label.PushColor(CachedColors.ClassGreen); label.PushColor(TextEditorDotnetColoursDark.ClassGreen);
label.AddText(typeParameter.Name); label.AddText(typeParameter.Name);
label.Pop(); label.Pop();
if (index < methodSymbol.TypeParameters.Length - 1) if (index < methodSymbol.TypeParameters.Length - 1)
@@ -95,7 +95,7 @@ public static partial class SymbolInfoComponents
label.AddText(", "); label.AddText(", ");
} }
} }
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(">"); label.AddText(">");
label.Pop(); label.Pop();
} }
@@ -104,7 +104,7 @@ public static partial class SymbolInfoComponents
{ {
if (methodSymbol.IsExtensionMethod) if (methodSymbol.IsExtensionMethod)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("this"); label.AddText("this");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -123,21 +123,21 @@ public static partial class SymbolInfoComponents
} }
if (parameterSymbol.RefKind != RefKind.None) // ref, in, out if (parameterSymbol.RefKind != RefKind.None) // ref, in, out
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText(parameterSymbol.RefKind.ToString().ToLower()); label.AddText(parameterSymbol.RefKind.ToString().ToLower());
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
} }
else if (parameterSymbol.IsParams) else if (parameterSymbol.IsParams)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("params"); label.AddText("params");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
} }
label.AddType(parameterSymbol.Type); label.AddType(parameterSymbol.Type);
label.AddText(" "); label.AddText(" ");
label.PushColor(CachedColors.VariableBlue); label.PushColor(TextEditorDotnetColoursDark.VariableBlue);
label.AddText(parameterSymbol.Name); label.AddText(parameterSymbol.Name);
label.Pop(); label.Pop();
// default value // default value
@@ -146,7 +146,7 @@ public static partial class SymbolInfoComponents
label.AddText(" = "); label.AddText(" = ");
if (parameterSymbol.ExplicitDefaultValue is null) if (parameterSymbol.ExplicitDefaultValue is null)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("null"); label.AddText("null");
label.Pop(); label.Pop();
} }
@@ -160,19 +160,19 @@ public static partial class SymbolInfoComponents
if (enumMember != null) if (enumMember != null)
{ {
label.PushColor(CachedColors.InterfaceGreen); label.PushColor(TextEditorDotnetColoursDark.InterfaceGreen);
label.AddText(parameterSymbol.Type.Name); label.AddText(parameterSymbol.Type.Name);
label.Pop(); label.Pop();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText("."); label.AddText(".");
label.Pop(); label.Pop();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(enumMember.Name); label.AddText(enumMember.Name);
label.Pop(); label.Pop();
} }
else else
{ {
label.PushColor(CachedColors.InterfaceGreen); label.PushColor(TextEditorDotnetColoursDark.InterfaceGreen);
label.AddText(parameterSymbol.Type.Name); label.AddText(parameterSymbol.Type.Name);
label.Pop(); label.Pop();
label.AddText($"({explicitDefaultValue})"); label.AddText($"({explicitDefaultValue})");
@@ -180,7 +180,7 @@ public static partial class SymbolInfoComponents
} }
else if (parameterSymbol.ExplicitDefaultValue is string str) else if (parameterSymbol.ExplicitDefaultValue is string str)
{ {
label.PushColor(CachedColors.LightOrangeBrown); label.PushColor(TextEditorDotnetColoursDark.LightOrangeBrown);
label.AddText($""" label.AddText($"""
"{str}" "{str}"
"""); """);
@@ -188,7 +188,7 @@ public static partial class SymbolInfoComponents
} }
else if (parameterSymbol.ExplicitDefaultValue is bool b) else if (parameterSymbol.ExplicitDefaultValue is bool b)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText(b ? "true" : "false"); label.AddText(b ? "true" : "false");
label.Pop(); 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."); 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()) foreach (var (index, (typeArgument, typeParameter)) in methodSymbol.TypeArguments.Zip(typeParameters).Index())
{ {
label.PushColor(CachedColors.ClassGreen); label.PushColor(TextEditorDotnetColoursDark.ClassGreen);
label.AddType(typeParameter); label.AddType(typeParameter);
label.Pop(); label.Pop();
label.AddText(" is "); label.AddText(" is ");
@@ -234,7 +234,7 @@ public static partial class SymbolInfoComponents
if (hasConstraints is false) continue; if (hasConstraints is false) continue;
label.AddText(" "); label.AddText(" ");
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("where"); label.AddText("where");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -244,7 +244,7 @@ public static partial class SymbolInfoComponents
if (typeParameter.HasReferenceTypeConstraint) if (typeParameter.HasReferenceTypeConstraint)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("class"); label.AddText("class");
label.Pop(); label.Pop();
} }
@@ -252,7 +252,7 @@ public static partial class SymbolInfoComponents
if (typeParameter.HasValueTypeConstraint) if (typeParameter.HasValueTypeConstraint)
{ {
MaybeAddComma(); MaybeAddComma();
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("struct"); label.AddText("struct");
label.Pop(); label.Pop();
} }
@@ -260,7 +260,7 @@ public static partial class SymbolInfoComponents
if (typeParameter.HasUnmanagedTypeConstraint) if (typeParameter.HasUnmanagedTypeConstraint)
{ {
MaybeAddComma(); MaybeAddComma();
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("unmanaged"); label.AddText("unmanaged");
label.Pop(); label.Pop();
} }
@@ -268,7 +268,7 @@ public static partial class SymbolInfoComponents
if (typeParameter.HasNotNullConstraint) if (typeParameter.HasNotNullConstraint)
{ {
MaybeAddComma(); MaybeAddComma();
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("notnull"); label.AddText("notnull");
label.Pop(); label.Pop();
} }
@@ -282,7 +282,7 @@ public static partial class SymbolInfoComponents
if (typeParameter.HasConstructorConstraint) if (typeParameter.HasConstructorConstraint)
{ {
MaybeAddComma(); MaybeAddComma();
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("new"); label.AddText("new");
label.Pop(); label.Pop();
label.AddText("()"); label.AddText("()");
@@ -291,7 +291,7 @@ public static partial class SymbolInfoComponents
if (typeParameter.AllowsRefLikeType) if (typeParameter.AllowsRefLikeType)
{ {
MaybeAddComma(); MaybeAddComma();
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("allows ref struct"); label.AddText("allows ref struct");
label.Pop(); label.Pop();
} }

8
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamedTypeTooltip.cs
View File

@@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetNamedTypeSymbolInfo(INamedTypeSymbol symbol) public static RichTextLabel GetNamedTypeSymbolInfo(INamedTypeSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddAttributes(symbol); label.AddAttributes(symbol);
label.AddAccessibilityModifier(symbol); label.AddAccessibilityModifier(symbol);
@@ -39,7 +39,7 @@ public static partial class SymbolInfoComponents
private static void AddNamedTypeSymbolType(this RichTextLabel label, INamedTypeSymbol symbol) private static void AddNamedTypeSymbolType(this RichTextLabel label, INamedTypeSymbol symbol)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText(GetNamedTypeSymbolTypeName(symbol)); label.AddText(GetNamedTypeSymbolTypeName(symbol));
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -80,7 +80,7 @@ public static partial class SymbolInfoComponents
if (containingModule is not null) if (containingModule is not null)
{ {
label.Newline(); label.Newline();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText($"from module {containingModule.Name}"); label.AddText($"from module {containingModule.Name}");
label.Pop(); label.Pop();
} }
@@ -90,7 +90,7 @@ public static partial class SymbolInfoComponents
{ {
if (symbol.IsReadOnly) if (symbol.IsReadOnly)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("readonly"); label.AddText("readonly");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");

4
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/NamespaceTooltip.cs
View File

@@ -9,9 +9,9 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetNamespaceSymbolInfo(INamespaceSymbol symbol) public static RichTextLabel GetNamespaceSymbolInfo(INamespaceSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("namespace"); label.AddText("namespace");
label.Pop(); // color label.Pop(); // color
label.AddText(" "); label.AddText(" ");

4
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/ParameterTooltip.cs
View File

@@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetParameterSymbolInfo(IParameterSymbol symbol) public static RichTextLabel GetParameterSymbolInfo(IParameterSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddAttributes(symbol); label.AddAttributes(symbol);
label.AddText("parameter "); label.AddText("parameter ");
@@ -37,7 +37,7 @@ public static partial class SymbolInfoComponents
private static void AddParameterName(this RichTextLabel label, IParameterSymbol symbol) private static void AddParameterName(this RichTextLabel label, IParameterSymbol symbol)
{ {
label.PushColor(CachedColors.VariableBlue); label.PushColor(TextEditorDotnetColoursDark.VariableBlue);
label.AddText(symbol.Name); label.AddText(symbol.Name);
label.Pop(); label.Pop();
} }

22
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/PropertyTooltip.cs
View File

@@ -8,7 +8,7 @@ public partial class SymbolInfoComponents
public static RichTextLabel GetPropertySymbolInfo(IPropertySymbol symbol) public static RichTextLabel GetPropertySymbolInfo(IPropertySymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddAttributes(symbol); label.AddAttributes(symbol);
label.AddAccessibilityModifier(symbol); label.AddAccessibilityModifier(symbol);
@@ -35,7 +35,7 @@ public partial class SymbolInfoComponents
{ {
if (symbol.IsReadOnly) if (symbol.IsReadOnly)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("readonly"); label.AddText("readonly");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -46,7 +46,7 @@ public partial class SymbolInfoComponents
{ {
if (symbol.IsRequired) if (symbol.IsRequired)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("required"); label.AddText("required");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -61,7 +61,7 @@ public partial class SymbolInfoComponents
private static void AddPropertyName(this RichTextLabel label, IPropertySymbol symbol) private static void AddPropertyName(this RichTextLabel label, IPropertySymbol symbol)
{ {
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(symbol.Name); label.AddText(symbol.Name);
label.Pop(); label.Pop();
} }
@@ -72,10 +72,10 @@ public partial class SymbolInfoComponents
if (symbol.GetMethod is not null) if (symbol.GetMethod is not null)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("get"); label.AddText("get");
label.Pop(); label.Pop();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(";"); label.AddText(";");
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -84,7 +84,7 @@ public partial class SymbolInfoComponents
{ {
if (setMethod.DeclaredAccessibility != symbol.DeclaredAccessibility) if (setMethod.DeclaredAccessibility != symbol.DeclaredAccessibility)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText(setMethod.DeclaredAccessibility.ToString().ToLower()); label.AddText(setMethod.DeclaredAccessibility.ToString().ToLower());
label.Pop(); label.Pop();
label.AddText(" "); label.AddText(" ");
@@ -92,19 +92,19 @@ public partial class SymbolInfoComponents
if (setMethod.IsInitOnly) if (setMethod.IsInitOnly)
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("init"); label.AddText("init");
label.Pop(); label.Pop();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(";"); label.AddText(";");
label.Pop(); label.Pop();
} }
else else
{ {
label.PushColor(CachedColors.KeywordBlue); label.PushColor(TextEditorDotnetColoursDark.KeywordBlue);
label.AddText("set"); label.AddText("set");
label.Pop(); label.Pop();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.AddText(";"); label.AddText(";");
label.Pop(); label.Pop();
} }

2
src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/TypeParameterTooltip.cs
View File

@@ -8,7 +8,7 @@ public static partial class SymbolInfoComponents
public static RichTextLabel GetTypeParameterSymbolInfo(ITypeParameterSymbol symbol) public static RichTextLabel GetTypeParameterSymbolInfo(ITypeParameterSymbol symbol)
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.PushColor(CachedColors.White); label.PushColor(TextEditorDotnetColoursDark.White);
label.PushFont(MonospaceFont); label.PushFont(MonospaceFont);
label.AddTypeParameter(symbol); label.AddTypeParameter(symbol);
label.AddText(" in "); label.AddText(" in ");

12
src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.DebuggerVariableCustomDraw.cs
View File

@@ -34,12 +34,12 @@ public partial class ThreadsVariablesSubTab
var variableValueDisplayColour = variable switch var variableValueDisplayColour = variable switch
{ {
_ when variable.PresentationHint?.Attributes is { } attrs && (attrs & VariablePresentationHint.AttributesValue.FailedEvaluation) != 0 => CachedColors.ErrorRed, _ when variable.PresentationHint?.Attributes is { } attrs && (attrs & VariablePresentationHint.AttributesValue.FailedEvaluation) != 0 => TextEditorDotnetColoursDark.ErrorRed,
{ Value: "null" } => CachedColors.KeywordBlue, { Value: "null" } => TextEditorDotnetColoursDark.KeywordBlue,
{ Value: "true" or "false" } => CachedColors.KeywordBlue, { Value: "true" or "false" } => TextEditorDotnetColoursDark.KeywordBlue,
{ Type: "string" or "char" } => CachedColors.LightOrangeBrown, { 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" } => 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" } => 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?" } => CachedColors.NumberGreen, // value here will never actually be null, as we handled "null" value above { 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 _ => VariableWhiteColor
}; };