Restore the specific scope for plus options

So users are able to target those +'s on a custom tmTheme and colorize it differently than normal options. Like before the change tonight.
victor-gp · Nov 7, 2022 · d2fd36a · d2fd36a
1 parent b4f1bc2
commit d2fd36a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/syntaxes/cmd-help.sublime-syntax b/syntaxes/cmd-help.sublime-syntax
@@ -54,6 +54,8 @@ scope_variables: # last scope is matched first
 
   - &OPTION_DEF_SCOPES
     entity.name.function.option.cmd-help
+  - &PLUS_OPTION_DEF_SCOPES
+    entity.name.function.option.plus.cmd-help
   - &OPTION_ARGUMENT_SCOPES
     string.option-argument.cmd-help  variable.other.option-argument.cmd-help
     variable.parameter.option-argument.cmd-help
@@ -197,7 +199,7 @@ contexts:
       scope: keyword.control.end-of-options.cmd-help
       set: then-pop
     - match: \+(?=[\s<[:alpha:]])
-      scope: *OPTION_DEF_SCOPES
+      scope: *PLUS_OPTION_DEF_SCOPES
       set: plus-option-post
     - match: -:(?={{option_break}})
       scope: *OPTION_DEF_SCOPES
@@ -333,7 +335,7 @@ contexts:
       set: then-pop
     # e.g.: "+s, --no-sort" (from fzf)
     - match: '[a-z]+'
-      scope: *OPTION_DEF_SCOPES
+      scope: *PLUS_OPTION_DEF_SCOPES
       set: option-def-post
     - include: else-pop
 

diff --git a/tests/syntax/syntax_test_emacs.txt b/tests/syntax/syntax_test_emacs.txt
@@ -38,9 +38,10 @@ Action options:
 FILE                    visit FILE
 #^^^ variable.parameter.other-value.cmd-help
 +LINE                   go to line LINE in next FILE
-# <- entity.name.function.option.cmd-help
+# <- entity.name.function.option.plus.cmd-help
 #^^^^ variable.parameter.option-argument.cmd-help
 +LINE:COLUMN            go to line LINE, column COLUMN, in next FILE
+# <- entity.name.function.option.plus.cmd-help
 #^^^^^^^^^^^ variable.parameter.option-argument.cmd-help
 --directory, -L DIR     prepend DIR to load-path (with :DIR, append DIR)
 --eval EXPR             evaluate Emacs Lisp expression EXPR

diff --git a/tests/syntax/syntax_test_fzf.txt b/tests/syntax/syntax_test_fzf.txt
@@ -8,7 +8,7 @@ usage: fzf [options]
     -e, --exact           Enable Exact-match
     -i                    Case-insensitive match (default: smart-case match)
     +i                    Case-sensitive match
-#   ^^ entity.name.function.option.cmd-help
+#   ^^ entity.name.function.option.plus.cmd-help
     --scheme=SCHEME       Scoring scheme [default|path|history]
     --literal             Do not normalize latin script letters before matching
     -n, --nth=N[,..]      Comma-separated list of field index expressions
@@ -18,8 +18,8 @@ usage: fzf [options]
                           field index expressions
     -d, --delimiter=STR   Field delimiter regex (default: AWK-style)
     +s, --no-sort         Do not sort the result
-#   ^^ entity.name.function.option.cmd-help
-#     ^^ - entity.name.function.option.cmd-help
+#   ^^ entity.name.function.option.plus.cmd-help
+#     ^^ - entity.name.function.option.plus.cmd-help
 #       ^^^^^^^^^ entity.name.function.option.cmd-help
     --tac                 Reverse the order of the input
     --disabled            Do not perform search

diff --git a/tests/syntax/syntax_test_vim.txt b/tests/syntax/syntax_test_vim.txt
@@ -41,9 +41,9 @@ Arguments:
    -o[N]		Open N windows (default: one for each file)
    -O[N]		Like -o but split vertically
    +			Start at end of file
-#  ^ entity.name.function.option.cmd-help
+#  ^ entity.name.function.option.plus.cmd-help
    +<lnum>		Start at line <lnum>
-#  ^ entity.name.function.option.cmd-help
+#  ^ entity.name.function.option.plus.cmd-help
 #   ^^^^^^ variable.parameter.option-argument.cmd-help
    --cmd <command>	Execute <command> before loading any vimrc file
    -c <command>		Execute <command> after loading the first file