Merge branch 'scope-plus-as-option' into main

victor-gp · Nov 6, 2022 · ab04bda · ab04bda
2 parents be3d7ce + 97a7286
commit ab04bda
Show file tree

Hide file tree

Showing 38 changed files with 141 additions and 142 deletions.
diff --git a/syntaxes/cmd-help.sublime-syntax b/syntaxes/cmd-help.sublime-syntax
@@ -197,7 +197,7 @@ contexts:
       scope: keyword.control.end-of-options.cmd-help
       set: then-pop
     - match: \+(?=[\s<[:alpha:]])
-      scope: keyword.control.plus-option.cmd-help
+      scope: *OPTION_DEF_SCOPES
       set: plus-option-post
     - match: -:(?={{option_break}})
       scope: *OPTION_DEF_SCOPES
@@ -331,6 +331,10 @@ contexts:
     - match: '{{allcaps_argument_name}}(:{{allcaps_argument_name}})*'
       scope: *OPTION_ARGUMENT_SCOPES
       set: then-pop
+    # e.g.: "+s, --no-sort" (from fzf)
+    - match: '[a-z]+'
+      scope: *OPTION_DEF_SCOPES
+      set: option-def-post
     - include: else-pop
 
   ### other definitions ########################################################

diff --git a/tests/highlighted/emacs-26.3.txt b/tests/highlighted/emacs-26.3.txt
diff --git a/tests/highlighted/fzf-0.33.0.txt b/tests/highlighted/fzf-0.33.0.txt
diff --git a/tests/highlighted/vim-8.1.txt b/tests/highlighted/vim-8.1.txt
diff --git a/tests/syntax/syntax_test_emacs.txt b/tests/syntax/syntax_test_emacs.txt
@@ -38,10 +38,8 @@ Action options:
 FILE                    visit FILE
 #^^^ variable.parameter.other-value.cmd-help
 +LINE                   go to line LINE in next FILE
-# <- keyword.control.plus-option.cmd-help
-# <- - entity.name.function.option.cmd-help
+# <- entity.name.function.option.cmd-help
 #^^^^ variable.parameter.option-argument.cmd-help
-#todo #8: re-scope + as option
 +LINE:COLUMN            go to line LINE, column COLUMN, in next FILE
 #^^^^^^^^^^^ variable.parameter.option-argument.cmd-help
 --directory, -L DIR     prepend DIR to load-path (with :DIR, append DIR)

diff --git a/tests/syntax/syntax_test_fzf.txt b/tests/syntax/syntax_test_fzf.txt
@@ -8,8 +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
-#todo #8: scope +options
+#   ^^ entity.name.function.option.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
@@ -19,9 +18,9 @@ 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.cmd-help
-#       ^^^^^^^^^ - entity.name.function.option.cmd-help
+#       ^^^^^^^^^ entity.name.function.option.cmd-help
     --tac                 Reverse the order of the input
     --disabled            Do not perform search
     --tiebreak=CRI[,..]   Comma-separated list of sort criteria to apply

diff --git a/tests/syntax/syntax_test_vim.txt b/tests/syntax/syntax_test_vim.txt
@@ -41,11 +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
-#  ^ keyword.control.plus-option.cmd-help
-#  ^ - entity.name.function.option.cmd-help
-#todo #8: re-scope + as option
+#  ^ entity.name.function.option.cmd-help
    +<lnum>		Start at line <lnum>
-#  ^ keyword.control.plus-option.cmd-help
+#  ^ entity.name.function.option.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

diff --git a/tests/theme/1337-italics.txt b/tests/theme/1337-italics.txt
diff --git a/tests/theme/1337.txt b/tests/theme/1337.txt
diff --git a/tests/theme/Coldark-Cold.txt b/tests/theme/Coldark-Cold.txt
diff --git a/tests/theme/Coldark-Dark.txt b/tests/theme/Coldark-Dark.txt
diff --git a/tests/theme/DarkNeon.txt b/tests/theme/DarkNeon.txt
diff --git a/tests/theme/Dracula-italics.txt b/tests/theme/Dracula-italics.txt
diff --git a/tests/theme/Dracula.txt b/tests/theme/Dracula.txt
diff --git a/tests/theme/GitHub.txt b/tests/theme/GitHub.txt
diff --git a/tests/theme/Monokai Extended Bright-italics.txt b/tests/theme/Monokai Extended Bright-italics.txt