Multi-scope section headings as entity.name.section

On top of "markup.heading". "entity.name.section" with higher priority because it's the standard scope for heading content. For most changed themes, it adds color where there was none. Although it's the same color as option names in most of them. For ansi it's a regression: goes from one color to the same one as options. For Solarized it's the opposite, so a net improvement.
victor-gp · Mar 12, 2022 · c35ebe7 · c35ebe7
1 parent 73b2c0f
commit c35ebe7
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 35 deletions.
diff --git a/syntaxes/cmd-help.sublime-syntax b/syntaxes/cmd-help.sublime-syntax
@@ -26,9 +26,14 @@ variables:
   relaxed_argument_name: '[:alpha:][[:alnum:]_-]*\b'
 
 ### scopes (last scope is matched first)
+  section_heading_scope: &SECTION_HEADING_SCOPE
+    markup.heading.cmd-help entity.name.section.cmd-help
+  inline_usage_scope:  &INLINE_USAGE_SCOPE
+    markup.heading.inline-usage.cmd-help entity.name.section.inline-usage.cmd-help
   option_argument_scope: &OPTION_ARGUMENT_SCOPE
     variable.other.option-argument.cmd-help variable.parameter.option-argument.cmd-help
 
+
 contexts:
   main:
     - match: ''
@@ -52,17 +57,17 @@ contexts:
 
   pre-heading:
     - match: '(?i:usage):(?=.+\n)'
-      scope: markup.heading.inline-usage.cmd-help
+      scope: *INLINE_USAGE_SCOPE
     # only consider lines <= 40 chars long
     - match: '^(?=.{1,40}\n)'
       set: heading
     - include: else-pop
 
   heading:
     - match: '{{leading_word}}( {{any_word}})*:?\n'
-      scope: markup.heading.cmd-help
+      scope: *SECTION_HEADING_SCOPE
     # - match: '{{any_word}}( {{any_word}})*:\n'
-    #   scope: markup.heading.cmd-help
+    #   scope: *SECTION_HEADING_SCOPE
     - include: else-pop
 
   def-option:

diff --git a/tests/theme/OneHalfDark.txt b/tests/theme/OneHalfDark.txt
@@ -1,11 +1,11 @@
 [38;2;220;223;228mbat 0.18.2[0m
 [38;2;220;223;228mA cat(1) clone with syntax highlighting and Git integration.[0m
 
-[38;2;220;223;228mUSAGE:[0m
+[38;2;97;175;239mUSAGE:[0m
 [38;2;220;223;228m    bat [OPTIONS] [FILE]...[0m
 [38;2;220;223;228m    bat <SUBCOMMAND>[0m
 
-[38;2;220;223;228mOPTIONS:[0m
+[38;2;97;175;239mOPTIONS:[0m
 [38;2;220;223;228m    [0m[38;2;97;175;239m-A[0m[38;2;220;223;228m, [0m[38;2;97;175;239m--show-all[0m[38;2;220;223;228m                       Show non-printable characters (space, tab, newline, ..).[0m
 [38;2;220;223;228m    [0m[38;2;97;175;239m-p[0m[38;2;220;223;228m, [0m[38;2;97;175;239m--plain[0m[38;2;220;223;228m                          Show plain style (alias for '--style=plain').[0m
 [38;2;220;223;228m    [0m[38;2;97;175;239m-l[0m[38;2;220;223;228m, [0m[38;2;97;175;239m--language[0m[38;2;220;223;228m [0m[38;2;224;108;117m<language>[0m[38;2;220;223;228m            Set the language for syntax highlighting.[0m
@@ -34,10 +34,10 @@
 [38;2;220;223;228m    [0m[38;2;97;175;239m-h[0m[38;2;220;223;228m, [0m[38;2;97;175;239m--help[0m[38;2;220;223;228m                           Print this help message.[0m
 [38;2;220;223;228m    [0m[38;2;97;175;239m-V[0m[38;2;220;223;228m, [0m[38;2;97;175;239m--version[0m[38;2;220;223;228m                        Show version information.[0m
 
-[38;2;220;223;228mARGS:[0m
+[38;2;97;175;239mARGS:[0m
 [38;2;220;223;228m    <FILE>...    File(s) to print / concatenate. Use '-' for standard input.[0m
 
-[38;2;220;223;228mSUBCOMMANDS:[0m
+[38;2;97;175;239mSUBCOMMANDS:[0m
 [38;2;220;223;228m    cache    Modify the syntax-definition and theme cache[0m
 
 [38;2;220;223;228mNote: `bat -h` prints a short and concise overview while `bat --help` gives all details.[0m
diff --git a/tests/theme/OneHalfLight.txt b/tests/theme/OneHalfLight.txt
@@ -1,11 +1,11 @@
 [38;2;56;58;66mbat 0.18.2[0m
 [38;2;56;58;66mA cat(1) clone with syntax highlighting and Git integration.[0m
 
-[38;2;56;58;66mUSAGE:[0m
+[38;2;1;132;188mUSAGE:[0m
 [38;2;56;58;66m    bat [OPTIONS] [FILE]...[0m
 [38;2;56;58;66m    bat <SUBCOMMAND>[0m
 
-[38;2;56;58;66mOPTIONS:[0m
+[38;2;1;132;188mOPTIONS:[0m
 [38;2;56;58;66m    [0m[38;2;1;132;188m-A[0m[38;2;56;58;66m, [0m[38;2;1;132;188m--show-all[0m[38;2;56;58;66m                       Show non-printable characters (space, tab, newline, ..).[0m
 [38;2;56;58;66m    [0m[38;2;1;132;188m-p[0m[38;2;56;58;66m, [0m[38;2;1;132;188m--plain[0m[38;2;56;58;66m                          Show plain style (alias for '--style=plain').[0m
 [38;2;56;58;66m    [0m[38;2;1;132;188m-l[0m[38;2;56;58;66m, [0m[38;2;1;132;188m--language[0m[38;2;56;58;66m [0m[38;2;228;86;73m<language>[0m[38;2;56;58;66m            Set the language for syntax highlighting.[0m
@@ -34,10 +34,10 @@
 [38;2;56;58;66m    [0m[38;2;1;132;188m-h[0m[38;2;56;58;66m, [0m[38;2;1;132;188m--help[0m[38;2;56;58;66m                           Print this help message.[0m
 [38;2;56;58;66m    [0m[38;2;1;132;188m-V[0m[38;2;56;58;66m, [0m[38;2;1;132;188m--version[0m[38;2;56;58;66m                        Show version information.[0m
 
-[38;2;56;58;66mARGS:[0m
+[38;2;1;132;188mARGS:[0m
 [38;2;56;58;66m    <FILE>...    File(s) to print / concatenate. Use '-' for standard input.[0m
 
-[38;2;56;58;66mSUBCOMMANDS:[0m
+[38;2;1;132;188mSUBCOMMANDS:[0m
 [38;2;56;58;66m    cache    Modify the syntax-definition and theme cache[0m
 
 [38;2;56;58;66mNote: `bat -h` prints a short and concise overview while `bat --help` gives all details.[0m
diff --git a/tests/theme/Solarized (dark).txt b/tests/theme/Solarized (dark).txt
@@ -1,11 +1,11 @@
 [38;2;131;148;150mbat 0.18.2[0m
 [38;2;131;148;150mA cat(1) clone with syntax highlighting and Git integration.[0m
 
-[1;38;2;181;137;0mUSAGE:[0m
+[1;38;2;203;75;22mUSAGE:[0m
 [38;2;131;148;150m    bat [OPTIONS] [FILE]...[0m
 [38;2;131;148;150m    bat <SUBCOMMAND>[0m
 
-[1;38;2;181;137;0mOPTIONS:[0m
+[1;38;2;203;75;22mOPTIONS:[0m
 [38;2;131;148;150m    [0m[38;2;181;137;0m-A[0m[38;2;131;148;150m, [0m[38;2;181;137;0m--show-all[0m[38;2;131;148;150m                       Show non-printable characters (space, tab, newline, ..).[0m
 [38;2;131;148;150m    [0m[38;2;181;137;0m-p[0m[38;2;131;148;150m, [0m[38;2;181;137;0m--plain[0m[38;2;131;148;150m                          Show plain style (alias for '--style=plain').[0m
 [38;2;131;148;150m    [0m[38;2;181;137;0m-l[0m[38;2;131;148;150m, [0m[38;2;181;137;0m--language[0m[38;2;131;148;150m [0m[38;2;38;139;210m<language>[0m[38;2;131;148;150m            Set the language for syntax highlighting.[0m
@@ -34,10 +34,10 @@
 [38;2;131;148;150m    [0m[38;2;181;137;0m-h[0m[38;2;131;148;150m, [0m[38;2;181;137;0m--help[0m[38;2;131;148;150m                           Print this help message.[0m
 [38;2;131;148;150m    [0m[38;2;181;137;0m-V[0m[38;2;131;148;150m, [0m[38;2;181;137;0m--version[0m[38;2;131;148;150m                        Show version information.[0m
 
-[1;38;2;181;137;0mARGS:[0m
+[1;38;2;203;75;22mARGS:[0m
 [38;2;131;148;150m    <FILE>...    File(s) to print / concatenate. Use '-' for standard input.[0m
 
-[1;38;2;181;137;0mSUBCOMMANDS:[0m
+[1;38;2;203;75;22mSUBCOMMANDS:[0m
 [38;2;131;148;150m    cache    Modify the syntax-definition and theme cache[0m
 
 [38;2;131;148;150mNote: `bat -h` prints a short and concise overview while `bat --help` gives all details.[0m
diff --git a/tests/theme/Solarized (light).txt b/tests/theme/Solarized (light).txt
@@ -1,11 +1,11 @@
 [38;2;101;123;131mbat 0.18.2[0m
 [38;2;101;123;131mA cat(1) clone with syntax highlighting and Git integration.[0m
 
-[1;38;2;181;137;0mUSAGE:[0m
+[1;38;2;203;75;22mUSAGE:[0m
 [38;2;101;123;131m    bat [OPTIONS] [FILE]...[0m
 [38;2;101;123;131m    bat <SUBCOMMAND>[0m
 
-[1;38;2;181;137;0mOPTIONS:[0m
+[1;38;2;203;75;22mOPTIONS:[0m
 [38;2;101;123;131m    [0m[38;2;181;137;0m-A[0m[38;2;101;123;131m, [0m[38;2;181;137;0m--show-all[0m[38;2;101;123;131m                       Show non-printable characters (space, tab, newline, ..).[0m
 [38;2;101;123;131m    [0m[38;2;181;137;0m-p[0m[38;2;101;123;131m, [0m[38;2;181;137;0m--plain[0m[38;2;101;123;131m                          Show plain style (alias for '--style=plain').[0m
 [38;2;101;123;131m    [0m[38;2;181;137;0m-l[0m[38;2;101;123;131m, [0m[38;2;181;137;0m--language[0m[38;2;101;123;131m [0m[38;2;38;139;210m<language>[0m[38;2;101;123;131m            Set the language for syntax highlighting.[0m
@@ -34,10 +34,10 @@
 [38;2;101;123;131m    [0m[38;2;181;137;0m-h[0m[38;2;101;123;131m, [0m[38;2;181;137;0m--help[0m[38;2;101;123;131m                           Print this help message.[0m
 [38;2;101;123;131m    [0m[38;2;181;137;0m-V[0m[38;2;101;123;131m, [0m[38;2;181;137;0m--version[0m[38;2;101;123;131m                        Show version information.[0m
 
-[1;38;2;181;137;0mARGS:[0m
+[1;38;2;203;75;22mARGS:[0m
 [38;2;101;123;131m    <FILE>...    File(s) to print / concatenate. Use '-' for standard input.[0m
 
-[1;38;2;181;137;0mSUBCOMMANDS:[0m
+[1;38;2;203;75;22mSUBCOMMANDS:[0m
 [38;2;101;123;131m    cache    Modify the syntax-definition and theme cache[0m
 
 [38;2;101;123;131mNote: `bat -h` prints a short and concise overview while `bat --help` gives all details.[0m
diff --git a/tests/theme/TwoDark.txt b/tests/theme/TwoDark.txt
@@ -1,11 +1,11 @@
 [38;2;171;178;191mbat 0.18.2[0m
 [38;2;171;178;191mA cat(1) clone with syntax highlighting and Git integration.[0m
 
-[38;2;171;178;191mUSAGE:[0m
+[38;2;97;175;239mUSAGE:[0m
 [38;2;171;178;191m    bat [OPTIONS] [FILE]...[0m
 [38;2;171;178;191m    bat <SUBCOMMAND>[0m
 
-[38;2;171;178;191mOPTIONS:[0m
+[38;2;97;175;239mOPTIONS:[0m
 [38;2;171;178;191m    [0m[38;2;97;175;239m-A[0m[38;2;171;178;191m, [0m[38;2;97;175;239m--show-all[0m[38;2;171;178;191m                       Show non-printable characters (space, tab, newline, ..).[0m
 [38;2;171;178;191m    [0m[38;2;97;175;239m-p[0m[38;2;171;178;191m, [0m[38;2;97;175;239m--plain[0m[38;2;171;178;191m                          Show plain style (alias for '--style=plain').[0m
 [38;2;171;178;191m    [0m[38;2;97;175;239m-l[0m[38;2;171;178;191m, [0m[38;2;97;175;239m--language[0m[38;2;171;178;191m [0m[38;2;224;108;117m<language>[0m[38;2;171;178;191m            Set the language for syntax highlighting.[0m
@@ -34,10 +34,10 @@
 [38;2;171;178;191m    [0m[38;2;97;175;239m-h[0m[38;2;171;178;191m, [0m[38;2;97;175;239m--help[0m[38;2;171;178;191m                           Print this help message.[0m
 [38;2;171;178;191m    [0m[38;2;97;175;239m-V[0m[38;2;171;178;191m, [0m[38;2;97;175;239m--version[0m[38;2;171;178;191m                        Show version information.[0m
 
-[38;2;171;178;191mARGS:[0m
+[38;2;97;175;239mARGS:[0m
 [38;2;171;178;191m    <FILE>...    File(s) to print / concatenate. Use '-' for standard input.[0m
 
-[38;2;171;178;191mSUBCOMMANDS:[0m
+[38;2;97;175;239mSUBCOMMANDS:[0m
 [38;2;171;178;191m    cache    Modify the syntax-definition and theme cache[0m
 
 [38;2;171;178;191mNote: `bat -h` prints a short and concise overview while `bat --help` gives all details.[0m
diff --git a/tests/theme/ansi.txt b/tests/theme/ansi.txt
@@ -1,11 +1,11 @@
 bat 0.18.2
 A cat(1) clone with syntax highlighting and Git integration.
 
-USAGE:
+[34mUSAGE:[0m
     bat [OPTIONS] [FILE]...
     bat <SUBCOMMAND>
 
-OPTIONS:
+[34mOPTIONS:[0m
     [34m-A[0m, [34m--show-all[0m                       Show non-printable characters (space, tab, newline, ..).
     [34m-p[0m, [34m--plain[0m                          Show plain style (alias for '--style=plain').
     [34m-l[0m, [34m--language[0m <language>            Set the language for syntax highlighting.
@@ -34,10 +34,10 @@ OPTIONS:
     [34m-h[0m, [34m--help[0m                           Print this help message.
     [34m-V[0m, [34m--version[0m                        Show version information.
 
-ARGS:
+[34mARGS:[0m
     <FILE>...    File(s) to print / concatenate. Use '-' for standard input.
 
-SUBCOMMANDS:
+[34mSUBCOMMANDS:[0m
     cache    Modify the syntax-definition and theme cache
 
 Note: `bat -h` prints a short and concise overview while `bat --help` gives all details.
diff --git a/tests/theme/base16-256.txt b/tests/theme/base16-256.txt
@@ -1,11 +1,11 @@
 [37mbat 0.18.2[0m
 [37mA cat(1) clone with syntax highlighting and Git integration.[0m
 
-[37mUSAGE:[0m
+[34mUSAGE:[0m
 [37m    bat [OPTIONS] [FILE]...[0m
 [37m    bat <SUBCOMMAND>[0m
 
-[37mOPTIONS:[0m
+[34mOPTIONS:[0m
 [37m    [0m[34m-A[0m[37m, [0m[34m--show-all[0m[37m                       Show non-printable characters (space, tab, newline, ..).[0m
 [37m    [0m[34m-p[0m[37m, [0m[34m--plain[0m[37m                          Show plain style (alias for '--style=plain').[0m
 [37m    [0m[34m-l[0m[37m, [0m[34m--language[0m[37m [0m[37m<language>[0m[37m            Set the language for syntax highlighting.[0m
@@ -34,10 +34,10 @@
 [37m    [0m[34m-h[0m[37m, [0m[34m--help[0m[37m                           Print this help message.[0m
 [37m    [0m[34m-V[0m[37m, [0m[34m--version[0m[37m                        Show version information.[0m
 
-[37mARGS:[0m
+[34mARGS:[0m
 [37m    <FILE>...    File(s) to print / concatenate. Use '-' for standard input.[0m
 
-[37mSUBCOMMANDS:[0m
+[34mSUBCOMMANDS:[0m
 [37m    cache    Modify the syntax-definition and theme cache[0m
 
 [37mNote: `bat -h` prints a short and concise overview while `bat --help` gives all details.[0m
diff --git a/tests/theme/base16.txt b/tests/theme/base16.txt
@@ -1,11 +1,11 @@
 [37mbat 0.18.2[0m
 [37mA cat(1) clone with syntax highlighting and Git integration.[0m
 
-[37mUSAGE:[0m
+[34mUSAGE:[0m
 [37m    bat [OPTIONS] [FILE]...[0m
 [37m    bat <SUBCOMMAND>[0m
 
-[37mOPTIONS:[0m
+[34mOPTIONS:[0m
 [37m    [0m[34m-A[0m[37m, [0m[34m--show-all[0m[37m                       Show non-printable characters (space, tab, newline, ..).[0m
 [37m    [0m[34m-p[0m[37m, [0m[34m--plain[0m[37m                          Show plain style (alias for '--style=plain').[0m
 [37m    [0m[34m-l[0m[37m, [0m[34m--language[0m[37m [0m[37m<language>[0m[37m            Set the language for syntax highlighting.[0m
@@ -34,10 +34,10 @@
 [37m    [0m[34m-h[0m[37m, [0m[34m--help[0m[37m                           Print this help message.[0m
 [37m    [0m[34m-V[0m[37m, [0m[34m--version[0m[37m                        Show version information.[0m
 
-[37mARGS:[0m
+[34mARGS:[0m
 [37m    <FILE>...    File(s) to print / concatenate. Use '-' for standard input.[0m
 
-[37mSUBCOMMANDS:[0m
+[34mSUBCOMMANDS:[0m
 [37m    cache    Modify the syntax-definition and theme cache[0m
 
 [37mNote: `bat -h` prints a short and concise overview while `bat --help` gives all details.[0m