Refactor fallback colouring

Author: jotaen

Mariana.sublime-color-scheme

@@ -2,11 +2,6 @@
 	// https://www.sublimetext.com/docs/color_schemes.html
 	// https://www.sublimetext.com/docs/scope_naming.html
 
-	// The naming pattern of the scopes is this:
-	// [conventional_scheme].klog.[klog_scheme]
-	// The first part serves as a fallback, so that there
-	// is at least *some* colouring.
-
 	"variables": {},
 	"globals": {},
 	"rules": [
@@ -15,33 +10,33 @@
 			"foreground": "#ffffff",
 		},
 		{
-			"scope": "constant.language.klog.date",
+			"scope": "meta.klog.date",
 			"foreground": "#ffffff",
-			"font_style": "underline"
+			"font_style": "underline",
 		},
 		{
-			"scope": "variable.klog.should_total",
+			"scope": "meta.klog.should_total",
 			"foreground": "#ef7af5",
 		},
 		{
-			"scope": "comment.klog.summary.text",
+			"scope": "meta.klog.summary.text",
 			"foreground": "#aaaaaa",
 		},
 		{
-			"scope": "comment.klog.summary.tag",
+			"scope": "meta.klog.summary.tag",
 			"foreground": "#c9c9c9",
-			"font_style": "italic"
+			"font_style": "italic",
 		},
 		{
-			"scope": "constant.numeric.klog.duration.positive",
-			"foreground": "#91f578",
+			"scope": "meta.klog.duration.positive",
+			"foreground": "#8ce675",
 		},
 		{
-			"scope": "keyword.control.klog.duration.negative",
+			"scope": "meta.klog.duration.negative",
 			"foreground": "#f58078",
 		},
 		{
-			"scope": "string.quoted.klog.range",
+			"scope": "meta.klog.range",
 			"foreground": "#86c8f7",
 		},
 	]

Monokai.sublime-color-scheme

@@ -0,0 +1,43 @@
+{
+	// https://www.sublimetext.com/docs/color_schemes.html
+	// https://www.sublimetext.com/docs/scope_naming.html
+
+	"variables": {},
+	"globals": {},
+	"rules": [
+		{
+			"scope": "source.klog",
+			"foreground": "#ffffff",
+		},
+		{
+			"scope": "meta.klog.date",
+			"foreground": "#ffffff",
+			"font_style": "underline",
+		},
+		{
+			"scope": "meta.klog.should_total",
+			"foreground": "#ef7af5",
+		},
+		{
+			"scope": "meta.klog.summary.text",
+			"foreground": "#aaaaaa",
+		},
+		{
+			"scope": "meta.klog.summary.tag",
+			"foreground": "#c9c9c9",
+			"font_style": "italic",
+		},
+		{
+			"scope": "meta.klog.duration.positive",
+			"foreground": "#8ce675",
+		},
+		{
+			"scope": "meta.klog.duration.negative",
+			"foreground": "#f58078",
+		},
+		{
+			"scope": "meta.klog.range",
+			"foreground": "#86c8f7",
+		},
+	]
+}

klog.sublime-settings

@@ -1,8 +1,4 @@
 {
-	// Enforce Mariana scheme, since colors have special
-	// meaning in klog, so we can’t use the general-purpose ones.
-	"color_scheme": "Mariana.sublime-color-scheme",
-
 	// Disable indentation-related features.
 	"smart_indent": false,
 

klog.sublime-syntax

@@ -23,12 +23,12 @@ contexts:
   record:
   # A record must start with a date.
   - match: '^({{date}})'
-    scope: constant.language.klog.date
+    scope: constant.language meta.klog.date
     push:
 
     # Then, there may follow a should total on the same line.
     - match: '(\s+{{should_total}})?\s*'
-      scope: variable.klog.should_total
+      scope: variable.function meta.klog.should_total
 
     - match: '.*'
       scope: invalid
@@ -45,7 +45,7 @@ contexts:
   # A record summary line cannot start with whitespace.
   - match: '^(?=[^\s])'
     push:
-    - meta_scope: comment.klog.summary.text
+    - meta_scope: comment meta.klog.summary.text
     - include: tag
     - match: '^(?=\s)'
       pop: 1
@@ -69,16 +69,16 @@ contexts:
   - match: '^{{indentation}}'
     push:
     - match: '{{duration_positive}}'
-      scope: constant.numeric.klog.duration.positive
+      scope: constant.numeric meta.klog.duration.positive
       push: entry_summary
     - match: '{{duration_negative}}'
-      scope: keyword.control.klog.duration.negative
+      scope: keyword.control meta.klog.duration.negative
       push: entry_summary
     - match: '{{range}}'
-      scope: string.quoted.klog.range.closed
+      scope: string.quoted meta.klog.range.closed
       push: entry_summary
     - match: '{{open_range}}'
-      scope: string.quoted.klog.range.open
+      scope: string.quoted meta.klog.range.open
       push: entry_summary
 
     # Exit on blank line.
@@ -93,7 +93,7 @@ contexts:
   # Parse the remainder of the first line, and continue on the next.
   - match: '(?=\s|$)'
     push:
-    - meta_scope: comment.klog.summary.text
+    - meta_scope: comment meta.klog.summary.text
     - include: tag
 
     # Exit on blank line.
@@ -114,4 +114,4 @@ contexts:
 
   tag:
   - match: '\#[\p{L}\d_]+'
-    scope: comment.klog.summary.tag
+    scope: comment meta.klog.summary.tag