shiki-themes - npm Package Compare versions

Comparing version 0.1.5 to 0.1.7

data/vscode/dark_plus.json

 {
-	"name": "Dark+",
+	"$schema": "vscode://schemas/color-theme",
+	"name": "Dark+ (default dark)",
 	"include": "./dark_vs.json",
-	"settings": [
+	"tokenColors": [
 		{
@@ -9,3 +10,6 @@ "name": "Function declarations",
 				"entity.name.function",
-				"support.function"
+				"support.function",
+				"support.constant.handlebars",
+				"source.powershell variable.other.member",
+				"entity.name.operator.custom-literal" // See https://en.cppreference.com/w/cpp/language/user_literal
 			],
@@ -23,4 +27,13 @@ "settings": {
 				"entity.name.type",
+				"entity.name.namespace",
+				"entity.other.attribute",
+				"entity.name.scope-resolution",
 				"entity.name.class",
-
+				"storage.type.numeric.go",
+				"storage.type.byte.go",
+				"storage.type.boolean.go",
+				"storage.type.string.go",
+				"storage.type.uintptr.go",
+				"storage.type.error.go",
+				"storage.type.rune.go",
 				"storage.type.cs",
@@ -30,3 +43,2 @@ "storage.type.generic.cs",
 				"storage.type.variable.cs",
-
 				"storage.type.annotation.java",
@@ -39,3 +51,2 @@ "storage.type.generic.java",
 				"storage.type.token.java",
-
 				"storage.type.groovy",
@@ -56,3 +67,2 @@ "storage.type.annotation.groovy",
 			"scope": [
-				"meta.return.type",
 				"meta.type.cast.expr",
@@ -62,3 +72,4 @@ "meta.type.new.expr",
 				"support.constant.dom",
-				"support.constant.json"
+				"support.constant.json",
+				"entity.other.inherited-class"
 			],
@@ -70,4 +81,11 @@ "settings": {
 		{
-			"name": "Control flow keywords",
-			"scope": "keyword.control",
+			"name": "Control flow / Special keywords",
+			"scope": [
+				"keyword.control",
+				"source.cpp keyword.operator.new",
+				"keyword.operator.delete",
+				"keyword.other.using",
+				"keyword.other.operator",
+				"entity.name.operator"
+			],
 			"settings": {
@@ -82,3 +100,4 @@ "foreground": "#C586C0"
 				"meta.definition.variable.name",
-				"support.variable"
+				"support.variable",
+				"entity.name.variable"
 			],
@@ -90,6 +109,15 @@ "settings": {
 		{
+			"name": "Constants and enums",
+			"scope": [
+				"variable.other.constant",
+				"variable.other.enummember"
+			],
+			"settings": {
+				"foreground": "#51B6C4",
+			}
+		},
+		{
 			"name": "Object keys, TS grammar specific",
 			"scope": [
-				"meta.object-literal.key",
-				"meta.object-literal.key entity.name.function"
+				"meta.object-literal.key"
 			],
@@ -103,11 +131,9 @@ "settings": {
 			"scope": [
-				"constant.other.color.rgb-value.css",
-				"constant.other.rgb-value.css",
-				"meta.property-value.css support.function",
-				"meta.property-value.css support",
-
-				"constant.numeric.color.rgb-value.scss",
-				"constant.rgb-value.scss",
-				"meta.property-value.scss support.function",
-				"meta.property-value.scss support"
+				"support.constant.property-value",
+				"support.constant.font-name",
+				"support.constant.media-type",
+				"support.constant.media",
+				"constant.other.color.rgb-value",
+				"constant.other.rgb-value",
+				"support.constant.color"
 			],
@@ -117,4 +143,63 @@ "settings": {
 			}
+		},
+		{
+			"name": "Regular expression groups",
+			"scope": [
+				"punctuation.definition.group.regexp",
+				"punctuation.definition.group.assertion.regexp",
+				"punctuation.definition.character-class.regexp",
+				"punctuation.character.set.begin.regexp",
+				"punctuation.character.set.end.regexp",
+				"keyword.operator.negation.regexp",
+				"support.other.parenthesis.regexp"
+			],
+			"settings": {
+				"foreground": "#CE9178"
+			}
+		},
+		{
+			"scope": [
+				"constant.character.character-class.regexp",
+				"constant.other.character-class.set.regexp",
+				"constant.other.character-class.regexp",
+				"constant.character.set.regexp"
+			],
+			"settings": {
+				"foreground": "#d16969"
+			}
+		},
+		{
+			"scope": [
+				"keyword.operator.or.regexp",
+				"keyword.control.anchor.regexp"
+			],
+			"settings": {
+				"foreground": "#DCDCAA"
+			}
+		},
+		{
+			"scope": "keyword.operator.quantifier.regexp",
+			"settings": {
+				"foreground": "#d7ba7d"
+			}
+		},
+		{
+			"scope": "constant.character",
+			"settings": {
+				"foreground": "#569cd6"
+			}
+		},
+		{
+			"scope": "constant.character.escape",
+			"settings": {
+				"foreground": "#d7ba7d"
+			}
+		},
+		{
+			"scope": "entity.name.label",
+			"settings": {
+				"foreground": "#C8C8C8"
+			}
 		}
 	]
-}
+}

data/vscode/dark_vs.json

 {
-	"name": "Dark Visual Studio",
-	"settings": [
+	"$schema": "vscode://schemas/color-theme",
+	"name": "Dark (Visual Studio)",
+	"include": "./dark_defaults.json",
+	"tokenColors": [
 		{
+			"scope": [
+				"meta.embedded",
+				"source.groovy.embedded"
+			],
 			"settings": {
-				"foreground": "#D4D4D4",
-				"background": "#1E1E1E"
+				"foreground": "#D4D4D4"
 			}
@@ -28,7 +33,6 @@ },
 		},
-
 		{
 			"scope": "comment",
 			"settings": {
-				"foreground": "#608b4e"
+				"foreground": "#6A9955"
 			}
@@ -43,3 +47,9 @@ },
 		{
-			"scope": "constant.numeric",
+			"scope": [
+				"constant.numeric",
+				"entity.name.operator.custom-literal.number",
+				"variable.other.enummember",
+				"keyword.operator.plus.exponent",
+				"keyword.operator.minus.exponent"
+			],
 			"settings": {
@@ -56,12 +66,2 @@ "foreground": "#b5cea8"
 		{
-			"scope": [
-				"constant.other.color.rgb-value.css",
-				"constant.numeric.color.rgb-value.scss",
-				"constant.other.rgb-value.css"
-			],
-			"settings": {
-				"foreground": "#d4d4d4"
-			}
-		},
-		{
 			"scope": "entity.name.tag",
@@ -92,5 +92,3 @@ "settings": {
 				"entity.other.attribute-name.pseudo-element.css",
-
 				"source.css.less entity.other.attribute-name.id",
-
 				"entity.other.attribute-name.attribute.scss",
@@ -154,9 +152,9 @@ "entity.other.attribute-name.scss"
 		{
-			"scope": "beginning.punctuation.definition.quote.markdown",
+			"scope": "punctuation.definition.quote.begin.markdown",
 			"settings": {
-				"foreground": "#608b4e"
+				"foreground": "#6A9955"
 			}
 		},
 		{
-			"scope": "beginning.punctuation.definition.list.markdown",
+			"scope": "punctuation.definition.list.begin.markdown",
 			"settings": {
@@ -173,8 +171,2 @@ "foreground": "#6796e6"
 		{
-			"scope": "meta.selector",
-			"settings": {
-				"foreground": "#d7ba7d"
-			}
-		},
-		{
 			"name": "brackets of XML/HTML tags",
@@ -187,3 +179,6 @@ "scope": "punctuation.definition.tag",
 		{
-			"scope": "meta.preprocessor",
+			"scope": [
+				"meta.preprocessor",
+				"entity.name.function.preprocessor"
+			],
 			"settings": {
@@ -230,3 +225,6 @@ "foreground": "#569cd6"
 		{
-			"scope": "storage.modifier",
+			"scope": [
+				"storage.modifier",
+				"keyword.operator.noexcept"
+			],
 			"settings": {
@@ -237,3 +235,7 @@ "foreground": "#569cd6"
 		{
-			"scope": "string",
+			"scope": [
+				"string",
+				"entity.name.operator.custom-literal.string",
+				"meta.embedded.assembly"
+			],
 			"settings": {
@@ -262,6 +264,7 @@ "foreground": "#ce9178"
 		{
-			"name": "JavaScript string interpolation ${}",
+			"name": "String interpolation",
 			"scope": [
-				"punctuation.definition.template-expression.begin.ts",
-				"punctuation.definition.template-expression.end.ts"
+				"punctuation.definition.template-expression.begin",
+				"punctuation.definition.template-expression.end",
+				"punctuation.section.embedded"
 			],
@@ -273,4 +276,20 @@ "settings": {
 		{
-			"scope": "support.type.property-name",
+			"name": "Reset JavaScript string interpolation expression",
+			"scope": [
+				"meta.template.expression"
+			],
 			"settings": {
+				"foreground": "#d4d4d4"
+			}
+		},
+		{
+			"scope": [
+				"support.type.vendored.property-name",
+				"support.type.property-name",
+				"variable.css",
+				"variable.scss",
+				"variable.other.less",
+				"source.coffee.embedded"
+			],
+			"settings": {
 				"foreground": "#9cdcfe"
@@ -298,3 +317,14 @@ }
 		{
-			"scope": ["keyword.operator.new", "keyword.operator.expression"],
+			"scope": [
+				"keyword.operator.new",
+				"keyword.operator.expression",
+				"keyword.operator.cast",
+				"keyword.operator.sizeof",
+				"keyword.operator.alignof",
+				"keyword.operator.typeid",
+				"keyword.operator.alignas",
+				"keyword.operator.instanceof",
+				"keyword.operator.logical.python",
+				"keyword.operator.wordlike"
+			],
 			"settings": {
@@ -312,4 +342,4 @@ "foreground": "#569cd6"
 			"scope": [
-				"punctuation.section.embedded.metatag.begin.php",
-				"punctuation.section.embedded.metatag.end.php"
+				"punctuation.section.embedded.begin.php",
+				"punctuation.section.embedded.end.php"
 			],
@@ -334,3 +364,7 @@ "settings": {
 			"name": "coloring of the Java import and package identifiers",
-			"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
+			"scope": [
+				"storage.modifier.import.java",
+				"variable.language.wildcard.java",
+				"storage.modifier.package.java"
+			],
 			"settings": {
@@ -348,2 +382,2 @@ "foreground": "#d4d4d4"
 	]
-}
+}

data/vscode/light_plus.json

 {
-	"name": "Light+",
+	"$schema": "vscode://schemas/color-theme",
+	"name": "Light+ (default light)",
 	"include": "./light_vs.json",
-	"settings": [
+	"tokenColors": [
 		{
@@ -9,3 +10,6 @@ "name": "Function declarations",
 				"entity.name.function",
-				"support.function"
+				"support.function",
+				"support.constant.handlebars",
+				"source.powershell variable.other.member",
+				"entity.name.operator.custom-literal" // See https://en.cppreference.com/w/cpp/language/user_literal
 			],
@@ -23,4 +27,13 @@ "settings": {
 				"entity.name.type",
+				"entity.name.namespace",
+				"entity.other.attribute",
+				"entity.name.scope-resolution",
 				"entity.name.class",
-
+				"storage.type.numeric.go",
+				"storage.type.byte.go",
+				"storage.type.boolean.go",
+				"storage.type.string.go",
+				"storage.type.uintptr.go",
+				"storage.type.error.go",
+				"storage.type.rune.go",
 				"storage.type.cs",
@@ -30,3 +43,2 @@ "storage.type.generic.cs",
 				"storage.type.variable.cs",
-
 				"storage.type.annotation.java",
@@ -39,3 +51,2 @@ "storage.type.generic.java",
 				"storage.type.token.java",
-
 				"storage.type.groovy",
@@ -56,3 +67,2 @@ "storage.type.annotation.groovy",
 			"scope": [
-				"meta.return.type",
 				"meta.type.cast.expr",
@@ -62,3 +72,4 @@ "meta.type.new.expr",
 				"support.constant.dom",
-				"support.constant.json"
+				"support.constant.json",
+				"entity.other.inherited-class"
 			],
@@ -70,4 +81,11 @@ "settings": {
 		{
-			"name": "Control flow keywords",
-			"scope": "keyword.control",
+			"name": "Control flow / Special keywords",
+			"scope": [
+				"keyword.control",
+				"source.cpp keyword.operator.new",
+				"source.cpp keyword.operator.delete",
+				"keyword.other.using",
+				"keyword.other.operator",
+				"entity.name.operator"
+			],
 			"settings": {
@@ -82,3 +100,4 @@ "foreground": "#AF00DB"
 				"meta.definition.variable.name",
-				"support.variable"
+				"support.variable",
+				"entity.name.variable"
 			],
@@ -90,6 +109,15 @@ "settings": {
 		{
+			"name": "Constants and enums",
+			"scope": [
+				"variable.other.constant",
+				"variable.other.enummember"
+			],
+			"settings": {
+				"foreground": "#328267",
+			}
+		},
+		{
 			"name": "Object keys, TS grammar specific",
 			"scope": [
-				"meta.object-literal.key",
-				"meta.object-literal.key entity.name.function"
+				"meta.object-literal.key"
 			],
@@ -103,11 +131,9 @@ "settings": {
 			"scope": [
-				"constant.other.color.rgb-value.css",
-				"constant.other.rgb-value.css",
-				"meta.property-value.css support.function",
-				"meta.property-value.css support",
-
-				"constant.numeric.color.rgb-value.scss",
-				"constant.rgb-value.scss",
-				"meta.property-value.scss support.function",
-				"meta.property-value.scss support"
+				"support.constant.property-value",
+				"support.constant.font-name",
+				"support.constant.media-type",
+				"support.constant.media",
+				"constant.other.color.rgb-value",
+				"constant.other.rgb-value",
+				"support.constant.color"
 			],
@@ -117,4 +143,63 @@ "settings": {
 			}
+		},
+		{
+			"name": "Regular expression groups",
+			"scope": [
+				"punctuation.definition.group.regexp",
+				"punctuation.definition.group.assertion.regexp",
+				"punctuation.definition.character-class.regexp",
+				"punctuation.character.set.begin.regexp",
+				"punctuation.character.set.end.regexp",
+				"keyword.operator.negation.regexp",
+				"support.other.parenthesis.regexp"
+			],
+			"settings": {
+				"foreground": "#d16969"
+			}
+		},
+		{
+			"scope": [
+				"constant.character.character-class.regexp",
+				"constant.other.character-class.set.regexp",
+				"constant.other.character-class.regexp",
+				"constant.character.set.regexp"
+			],
+			"settings": {
+				"foreground": "#811f3f"
+			}
+		},
+		{
+			"scope": "keyword.operator.quantifier.regexp",
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"scope": [
+				"keyword.operator.or.regexp",
+				"keyword.control.anchor.regexp"
+			],
+			"settings": {
+				"foreground": "#ff0000"
+			}
+		},
+		{
+			"scope": "constant.character",
+			"settings": {
+				"foreground": "#0000ff"
+			}
+		},
+		{
+			"scope": "constant.character.escape",
+			"settings": {
+				"foreground": "#ff0000"
+			}
+		},
+		{
+			"scope": "entity.name.label",
+			"settings": {
+				"foreground": "#000000"
+			}
 		}
 	]
-}
+}

data/vscode/light_vs.json

 {
-	"name": "Light Visual Studio",
-	"settings": [
+	"$schema": "vscode://schemas/color-theme",
+	"name": "Light (Visual Studio)",
+	"include": "./light_defaults.json",
+	"tokenColors": [
 		{
+			"scope": [
+				"meta.embedded",
+				"source.groovy.embedded"
+			],
+			"settings": {
+				"foreground": "#000000ff"
+			}
+		},
+		{
 			"scope": "emphasis",
@@ -22,3 +33,2 @@ "settings": {
 		},
-
 		{
@@ -30,3 +40,2 @@ "scope": "comment",
 		},
-
 		{
@@ -39,5 +48,11 @@ "scope": "constant.language",
 		{
-			"scope": "constant.numeric",
+			"scope": [
+				"constant.numeric",
+				"entity.name.operator.custom-literal.number",
+				"variable.other.enummember",
+				"keyword.operator.plus.exponent",
+				"keyword.operator.minus.exponent"
+			],
 			"settings": {
-				"foreground": "#09885a"
+				"foreground": "#098658"
 			}
@@ -52,12 +67,2 @@ },
 		{
-			"scope": [
-				"constant.other.color.rgb-value.css",
-				"constant.numeric.color.rgb-value.scss",
-				"constant.other.rgb-value.css"
-			],
-			"settings": {
-				"foreground": "#0451a5"
-			}
-		},
-		{
 			"name": "css tags in selectors, xml tags",
@@ -89,5 +94,3 @@ "scope": "entity.name.tag",
 				"entity.other.attribute-name.pseudo-element.css",
-
 				"source.css.less entity.other.attribute-name.id",
-
 				"entity.other.attribute-name.attribute.scss",
@@ -117,3 +120,2 @@ "entity.other.attribute-name.scss"
 				"foreground": "#000080"
-
 			}
@@ -137,3 +139,3 @@ },
 			"settings": {
-				"foreground": "#09885a"
+				"foreground": "#098658"
 			}
@@ -155,4 +157,4 @@ },
 			"scope": [
-				"beginning.punctuation.definition.quote.markdown",
-				"beginning.punctuation.definition.list.markdown"
+				"punctuation.definition.quote.begin.markdown",
+				"punctuation.definition.list.begin.markdown"
 			],
@@ -170,8 +172,2 @@ "settings": {
 		{
-			"scope": "meta.selector",
-			"settings": {
-				"foreground": "#800000"
-			}
-		},
-		{
 			"name": "brackets of XML/HTML tags",
@@ -184,3 +180,6 @@ "scope": "punctuation.definition.tag",
 		{
-			"scope": "meta.preprocessor",
+			"scope": [
+				"meta.preprocessor",
+				"entity.name.function.preprocessor"
+			],
 			"settings": {
@@ -199,3 +198,3 @@ "foreground": "#0000ff"
 			"settings": {
-				"foreground": "#09885a"
+				"foreground": "#098658"
 			}
@@ -222,3 +221,6 @@ },
 		{
-			"scope": "storage.modifier",
+			"scope": [
+				"storage.modifier",
+				"keyword.operator.noexcept"
+			],
 			"settings": {
@@ -229,3 +231,7 @@ "foreground": "#0000ff"
 		{
-			"scope": "string",
+			"scope": [
+				"string",
+				"entity.name.operator.custom-literal.string",
+				"meta.embedded.assembly"
+			],
 			"settings": {
@@ -237,7 +243,5 @@ "foreground": "#a31515"
 			"scope": [
-
-				"string.comment.buffered.block.jade",
-				"string.quoted.jade",
-				"string.interpolated.jade",
-
+				"string.comment.buffered.block.pug",
+				"string.quoted.pug",
+				"string.interpolated.pug",
 				"string.unquoted.plain.in.yaml",
@@ -247,11 +251,8 @@ "string.unquoted.plain.out.yaml",
 				"string.quoted.single.yaml",
-
 				"string.quoted.double.xml",
 				"string.quoted.single.xml",
 				"string.unquoted.cdata.xml",
-
 				"string.quoted.double.html",
 				"string.quoted.single.html",
 				"string.unquoted.html",
-
 				"string.quoted.single.handlebars",
@@ -271,6 +272,7 @@ "string.quoted.double.handlebars"
 		{
-			"name": "JavaScript string interpolation ${}",
+			"name": "String interpolation",
 			"scope": [
-				"punctuation.definition.template-expression.begin.ts",
-				"punctuation.definition.template-expression.end.ts"
+				"punctuation.definition.template-expression.begin",
+				"punctuation.definition.template-expression.end",
+				"punctuation.section.embedded"
 			],
@@ -282,8 +284,21 @@ "settings": {
 		{
+			"name": "Reset JavaScript string interpolation expression",
 			"scope": [
-				"support.property-value",
-				"meta.property-value.css support",
-				"meta.property-value.scss support"
+				"meta.template.expression"
 			],
 			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"scope": [
+				"support.constant.property-value",
+				"support.constant.font-name",
+				"support.constant.media-type",
+				"support.constant.media",
+				"constant.other.color.rgb-value",
+				"constant.other.rgb-value",
+				"support.constant.color"
+			],
+			"settings": {
 				"foreground": "#0451a5"
@@ -294,7 +309,8 @@ }
 			"scope": [
-				"support.type.property-name.css",
-				"support.type.property-name.variable.css",
-				"support.type.property-name.media.css",
-				"support.type.property-name.less",
-				"support.type.property-name.scss"
+				"support.type.vendored.property-name",
+				"support.type.property-name",
+				"variable.css",
+				"variable.scss",
+				"variable.other.less",
+				"source.coffee.embedded"
 			],
@@ -306,3 +322,5 @@ "settings": {
 		{
-			"scope": "support.type.property-name",
+			"scope": [
+				"support.type.property-name.json"
+			],
 			"settings": {
@@ -331,3 +349,14 @@ "foreground": "#0451a5"
 		{
-			"scope": ["keyword.operator.new", "keyword.operator.expression"],
+			"scope": [
+				"keyword.operator.new",
+				"keyword.operator.expression",
+				"keyword.operator.cast",
+				"keyword.operator.sizeof",
+				"keyword.operator.alignof",
+				"keyword.operator.typeid",
+				"keyword.operator.alignas",
+				"keyword.operator.instanceof",
+				"keyword.operator.logical.python",
+				"keyword.operator.wordlike"
+			],
 			"settings": {
@@ -340,3 +369,3 @@ "foreground": "#0000ff"
 			"settings": {
-				"foreground": "#09885a"
+				"foreground": "#098658"
 			}
@@ -346,4 +375,4 @@ },
 			"scope": [
-				"punctuation.section.embedded.metatag.begin.php",
-				"punctuation.section.embedded.metatag.end.php"
+				"punctuation.section.embedded.begin.php",
+				"punctuation.section.embedded.end.php"
 			],
@@ -363,3 +392,3 @@ "settings": {
 			"settings": {
-				"foreground": "#09885a"
+				"foreground": "#098658"
 			}
@@ -369,3 +398,7 @@ },
 			"name": "coloring of the Java import and package identifiers",
-			"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
+			"scope": [
+				"storage.modifier.import.java",
+				"variable.language.wildcard.java",
+				"storage.modifier.package.java"
+			],
 			"settings": {
@@ -383,2 +416,2 @@ "foreground": "#000000"
 	]
-}
+}

dist/index.js

@@ -64,2 +64,1 @@ "use strict";
 exports.loadTheme = loadTheme_2.loadTheme;
-//# sourceMappingURL=index.js.map

dist/loadTheme.d.ts

 import { IRawTheme, IRawThemeSetting } from 'vscode-textmate';
 /**
- *
  * @param themePath Absolute path to theme.json / theme.tmTheme
@@ -5,0 +4,0 @@ */

dist/loadTheme.js

@@ -37,3 +37,2 @@ "use strict";
 /**
- *
  * @param themePath Absolute path to theme.json / theme.tmTheme
@@ -53,4 +52,8 @@ */
         var includedTheme = loadTheme(includedThemePath);
-        shikiTheme.settings = theme.settings.concat(includedTheme.settings);
-        shikiTheme.bg = getThemeBg(shikiTheme);
+        if (includedTheme.settings) {
+            shikiTheme.settings = shikiTheme.settings.concat(includedTheme.settings);
+        }
+        if (includedTheme.bg && !shikiTheme.bg) {
+            shikiTheme.bg = includedTheme.bg;
+        }
     }
@@ -70,2 +73,1 @@ return shikiTheme;
 }
-//# sourceMappingURL=loadTheme.js.map

dist/plist.js

@@ -477,2 +477,1 @@ /*---------------------------------------------------------
 }
-//# sourceMappingURL=plist.js.map

dist/types.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map

package.json

 {
   "name": "shiki-themes",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Themes for shiki",
@@ -21,3 +21,3 @@ "keywords": [
   },
-  "gitHead": "c91d0ed6af369a9c28ebf699b34edb7c60280a58"
+  "gitHead": "dace29c2bf8cd5fec38814e141ada34d636df1c0"
 }

src/loadTheme.ts

@@ -36,3 +36,2 @@ import { IRawTheme, IRawThemeSetting } from 'vscode-textmate'
 /**
- *
  * @param themePath Absolute path to theme.json / theme.tmTheme
@@ -54,4 +53,10 @@ */
     const includedTheme = loadTheme(includedThemePath)
-    shikiTheme.settings = theme.settings.concat(includedTheme.settings)
-    shikiTheme.bg = getThemeBg(shikiTheme)
+
+    if (includedTheme.settings) {
+      shikiTheme.settings = shikiTheme.settings.concat(includedTheme.settings)
+    }
+
+    if (includedTheme.bg && !shikiTheme.bg) {
+      shikiTheme.bg = includedTheme.bg
+    }
   }
@@ -58,0 +63,0 @@

New alerts

SPDX disjunction

License

SPDX disjunction for an artifact's license information

Found 1 instance in 1 package

Fixed alerts

SPDX disjunction

License

SPDX disjunction for an artifact's license information

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

501748

increased by1.55%

Number of package files

52

increased by4%

Lines of code

14293

increased by2.27%

No dependency changes