enforce aliases

ZYinMD · Dec 10, 2018 · 3a07819 · 3a07819
1 parent 65f048a
commit 3a07819
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 21 deletions.
diff --git a/palettes/sepia/palette.js b/palettes/sepia/palette.js
@@ -6,7 +6,7 @@
 
 // this file will be used both by node and by browser
 
-var palette = {
+const palette = {
 	grey: '#836e69',
 	silver: '#999c',
 	black: '#2d2d2d',
@@ -25,7 +25,7 @@ var palette = {
 	teal: '#088',
 };
 
-var alias = {
+const aliases = {
 	default: palette.grey,
 	variable: palette.olive,
 	property: palette.olive,
@@ -34,13 +34,23 @@ var alias = {
 	parameter: palette.yellow,
 	module: palette.maroon,
 	declaration: palette.blue,
+	tag: palette.blue,
 	string: palette.tan,
 	reserved: palette.magenta,
 	builtIn: palette.teal,
+	inherited: palette.teal,
+	number: palette.orange,
+	operator: palette.orange,
+	control: palette.orange,
+	flow: palette.black,
+	constant: palette.purple,
+	keyword: palette.yellow,
+	invalid: palette.red,
+	deprecated: palette.pink,
 }
 
 try {
-	module.exports = Object.assign(palette, alias);
+	module.exports = Object.assign(palette, aliases);
 } catch (err) {
 	// the exports can be used in node, browser doesn't understand it, but browser can use the palette.
 }
diff --git a/syntax-highlighting-rules/sepia/basic.json b/syntax-highlighting-rules/sepia/basic.json
@@ -36,7 +36,7 @@
 			"entity.other.inherited-class"
 		],
 		"settings": {
-			"foreground": "teal"
+			"foreground": "inherited"
 		}
 	},
 	{
@@ -51,6 +51,8 @@
 	{
 		"name": "properties",
 		"scope": [
+			"variable.other.property", // e.g. property of js object
+			"variable.other.object.property", // e.g. property of a property of js object
 			"support.type.property-name", // e.g. JSON key name
 			"meta.object-literal.key" // e.g. key name of object literal
 		],
@@ -71,7 +73,8 @@
 		"name": "built-in variables of runtime: window, document, prototype, etc",
 		"scope": [
 			"support.variable",
-			"support.class"
+			"support.class",
+			"support.constant"
 		],
 		"settings": {
 			"foreground": "builtIn"
@@ -92,7 +95,7 @@
 			"variable.function" // never encountered this scope in real code
 		],
 		"settings": {
-			"foreground": "red"
+			"foreground": "builtIn"
 		}
 	},
 	{
@@ -101,7 +104,7 @@
 			"constant"
 		],
 		"settings": {
-			"foreground": "purple"
+			"foreground": "constant"
 		}
 	},
 	{
@@ -110,7 +113,7 @@
 			"constant.numeric"
 		],
 		"settings": {
-			"foreground": "orange"
+			"foreground": "number"
 		}
 	},
 	{
@@ -138,6 +141,8 @@
 			"keyword.export",
 			"keyword.control.import",
 			"keyword.control.export",
+			"keyword.other.import",
+			"keyword.other.export",
 			"keyword.control.directive.include"
 			// "meta.import",
 			// "meta.export"
@@ -152,7 +157,7 @@
 			"keyword.control"
 		],
 		"settings": {
-			"foreground": "orange"
+			"foreground": "control"
 		}
 	},
 	{
@@ -165,7 +170,7 @@
 
 		],
 		"settings": {
-			"foreground": "black"
+			"foreground": "flow"
 		}
 	},
 	{
@@ -174,7 +179,7 @@
 			"keyword.operator"
 		],
 		"settings": {
-			"foreground": "orange"
+			"foreground": "operator"
 		}
 	},
 	{
@@ -183,7 +188,7 @@
 			"keyword"
 		],
 		"settings": {
-			"foreground": "yellow"
+			"foreground": "keyword"
 		}
 	},
 	{
@@ -226,7 +231,7 @@
 			"invalid.deprecated"
 		],
 		"settings": {
-			"foreground": "pink"
+			"foreground": "deprecated"
 		}
 	}
 ]
diff --git a/syntax-highlighting-rules/sepia/css.json b/syntax-highlighting-rules/sepia/css.json
@@ -10,26 +10,30 @@
 		}
 	},
 	{
-		"name": "CSS: property value",
+		"name": "CSS: property value", // needs to be specified because support.constant was colored as "builtIn"
 		"scope": [
-			"meta.property-value"
+			"meta.property-value",
+			"support.constant.property-value",
+			"support.constant.font-name",
+			"support.constant.media-type",
+			"support.constant.media"
 		],
 		"settings": {
-			"foreground": "tan"
+			"foreground": "string"
 		}
 	},
 	{
 		"name": "CSS: @",
 		"scope": "keyword.control.at-rule",
 		"settings": {
-			"foreground": "maroon"
+			"foreground": "module"
 		}
 	},
 	{
 		"name": "CSS: !important",
 		"scope": "keyword.other.important",
 		"settings": {
-			"foreground": "maroon"
+			"foreground": "module"
 		}
 	},
 	{
@@ -40,13 +44,14 @@
 			"support.constant.color"
 		],
 		"settings": {
-			"foreground": "orange" // color names should be colorless
+			"foreground": "number"
 		}
 	},
 	{
 		"name": "color names in English",
 		"scope": [
-			"support.constant.color.w3c-standard-color-name.css"
+			"support.constant.color.w3c-standard-color-name.css",
+			"support.constant.color.w3c-extended-color-name"
 		],
 		"settings": {
 			"foreground": "default" // color names should be colorless

diff --git a/syntax-highlighting-rules/sepia/markdown.json b/syntax-highlighting-rules/sepia/markdown.json
@@ -5,7 +5,7 @@
 			"entity.name.section"
 		],
 		"settings": {
-			"foreground": "cyan"
+			"foreground": "tag"
 		}
 	}
 ]