Skip to content

Commit

Permalink
some minor updates to theme
Browse files Browse the repository at this point in the history
-Light High Contrast - bases with VS.json
-Update to handle null includes
  • Loading branch information
Natestah committed Jun 22, 2024
1 parent 69b92f8 commit 91cc5e6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/TextMateSharp.Grammars/Resources/Themes/hc_light.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "vscode://schemas/color-theme",
"name": "Light High Contrast",
"include": "./light_vs.json",
"tokenColors": [
{
"scope": ["meta.embedded", "source.groovy.embedded"],
Expand Down
2 changes: 1 addition & 1 deletion src/TextMateSharp.Grammars/Resources/Themes/light_vs.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"string meta.image.inline.markdown"
],
"settings": {
"foreground": "#000000ff"
"foreground": "#000000"
}
},
{
Expand Down
5 changes: 4 additions & 1 deletion src/TextMateSharp/Themes/Theme.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ public static Theme CreateFromRawTheme(

// First get colors from include, then try and overwrite with local colors..
// I don't see this happening currently, but here just in case that ever happens.
ParsedTheme.ParsedGuiColors(themeInclude, guiColorsDictionary);
if (themeInclude != null)
{
ParsedTheme.ParsedGuiColors(themeInclude, guiColorsDictionary);
}
ParsedTheme.ParsedGuiColors(source, guiColorsDictionary);

return new Theme(colorMap, theme, include, guiColorsDictionary);
Expand Down

0 comments on commit 91cc5e6

Please sign in to comment.