Update CMake highlights for latest grammar

1 files changed, 187 insertions, 89 deletions

diff --git a/vendored_parsers/highlights/cmake.scm b/vendored_parsers/highlights/cmake.scm
index d118992f8..fff50e7a2 100644
--- a/vendored_parsers/highlights/cmake.scm
+++ b/vendored_parsers/highlights/cmake.scm
@@ -1,128 +1,226 @@
 ;; Based on the nvim-treesitter highlighting, which is under the Apache license.
-;; https://github.com/nvim-treesitter/nvim-treesitter/blob/d76b0de6536c2461f97cfeca0550f8cb89793935/queries/cmake/highlights.scm
+;; https://github.com/nvim-treesitter/nvim-treesitter/blob/da0efd7398713a3177da5ce8690f0e5c5415763d/queries/cmake/highlights.scm
+
+(normal_command
+ (identifier)
+ (argument_list
+  (argument
+   (unquoted_argument)) @constant)
+ (#lua-match? @constant "^[%u@][%u%d_]+$"))
 
 [
- (quoted_argument)
- (bracket_argument)
+  (quoted_argument)
+  (bracket_argument)
 ] @string
 
 (variable_ref) @none
+
 (variable) @variable
 
 [
- (bracket_comment)
- (line_comment)
-] @comment
+  (bracket_comment)
+  (line_comment)
+] @comment @spell
 
-(normal_command (identifier) @function)
+(normal_command
+  (identifier) @function)
+
+[
+  "ENV"
+  "CACHE"
+] @module
 
-["ENV" "CACHE"] @symbol
-["$" "{" "}" "<" ">"] @punctuation.special
-["(" ")"] @punctuation.bracket
+[
+  "$"
+  "{"
+  "}"
+  "<"
+  ">"
+] @punctuation.special
+
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 [
- (function)
- (endfunction)
- (macro)
- (endmacro)
+  (function)
+  (endfunction)
+  (macro)
+  (endmacro)
 ] @keyword.function
 
 [
- (if)
- (elseif)
- (else)
- (endif)
-] @conditional
+  (if)
+  (elseif)
+  (else)
+  (endif)
+] @keyword.conditional
 
 [
- (foreach)
- (endforeach)
- (while)
- (endwhile)
-] @repeat
+  (foreach)
+  (endforeach)
+  (while)
+  (endwhile)
+] @keyword.repeat
+
+;; (normal_command
+;;   (identifier) @keyword.repeat
+;;   (#match? @keyword.repeat "\\c^(continue|break)$"))
+
+;; (normal_command
+;;   (identifier) @keyword.return
+;;   (#match? @keyword.return "\\c^return$"))
 
 (function_command
   (function)
-  . (argument) @function
-  (argument)* @parameter
-)
+  (argument_list
+    .
+    (argument) @function
+    (argument)* @variable.parameter))
 
 (macro_command
   (macro)
-  . (argument) @function.macro
-  (argument)* @parameter
-)
+  (argument_list
+    .
+    (argument) @function.macro
+    (argument)* @variable.parameter))
+
+(block_def
+  (block_command
+    (block) @function.builtin
+    (argument_list
+      (argument
+        (unquoted_argument) @constant))
+    (#any-of? @constant "SCOPE_FOR" "POLICIES" "VARIABLES" "PROPAGATE"))
+  (endblock_command
+    (endblock) @function.builtin))
+
+;
+;; ((argument) @boolean
+;;   (#match? @boolean "\\c^(1|on|yes|true|y|0|off|no|false|n|ignore|notfound|.*-notfound)$"))
+
+;
+(if_command
+  (if)
+  (argument_list
+    (argument) @keyword.operator)
+  (#any-of? @keyword.operator
+    "NOT" "AND" "OR" "COMMAND" "POLICY" "TARGET" "TEST" "DEFINED" "IN_LIST" "EXISTS" "IS_NEWER_THAN"
+    "IS_DIRECTORY" "IS_SYMLINK" "IS_ABSOLUTE" "MATCHES" "LESS" "GREATER" "EQUAL" "LESS_EQUAL"
+    "GREATER_EQUAL" "STRLESS" "STRGREATER" "STREQUAL" "STRLESS_EQUAL" "STRGREATER_EQUAL"
+    "VERSION_LESS" "VERSION_GREATER" "VERSION_EQUAL" "VERSION_LESS_EQUAL" "VERSION_GREATER_EQUAL"))
+
+(elseif_command
+  (elseif)
+  (argument_list
+    (argument) @keyword.operator)
+  (#any-of? @keyword.operator
+    "NOT" "AND" "OR" "COMMAND" "POLICY" "TARGET" "TEST" "DEFINED" "IN_LIST" "EXISTS" "IS_NEWER_THAN"
+    "IS_DIRECTORY" "IS_SYMLINK" "IS_ABSOLUTE" "MATCHES" "LESS" "GREATER" "EQUAL" "LESS_EQUAL"
+    "GREATER_EQUAL" "STRLESS" "STRGREATER" "STREQUAL" "STRLESS_EQUAL" "STRGREATER_EQUAL"
+    "VERSION_LESS" "VERSION_GREATER" "VERSION_EQUAL" "VERSION_LESS_EQUAL" "VERSION_GREATER_EQUAL"))
 
 ;; (normal_command
 ;;   (identifier) @function.builtin
-;;   . (argument) @variable
-;;   (#match? @function.builtin "\\c^(set)$")
-;; )
+;;   (#match? @function.builtin
+;;     "\\c^(cmake_host_system_information|cmake_language|cmake_minimum_required|cmake_parse_arguments|cmake_path|cmake_policy|configure_file|execute_process|file|find_file|find_library|find_package|find_path|find_program|foreach|get_cmake_property|get_directory_property|get_filename_component|get_property|include|include_guard|list|macro|mark_as_advanced|math|message|option|separate_arguments|set|set_directory_properties|set_property|site_name|string|unset|variable_watch|add_compile_definitions|add_compile_options|add_custom_command|add_custom_target|add_definitions|add_dependencies|add_executable|add_library|add_link_options|add_subdirectory|add_test|aux_source_directory|build_command|create_test_sourcelist|define_property|enable_language|enable_testing|export|fltk_wrap_ui|get_source_file_property|get_target_property|get_test_property|include_directories|include_external_msproject|include_regular_expression|install|link_directories|link_libraries|load_cache|project|remove_definitions|set_source_files_properties|set_target_properties|set_tests_properties|source_group|target_compile_definitions|target_compile_features|target_compile_options|target_include_directories|target_link_directories|target_link_libraries|target_link_options|target_precompile_headers|target_sources|try_compile|try_run|ctest_build|ctest_configure|ctest_coverage|ctest_empty_binary_directory|ctest_memcheck|ctest_read_custom_files|ctest_run_script|ctest_sleep|ctest_start|ctest_submit|ctest_test|ctest_update|ctest_upload)$"))
 
 ;; (normal_command
-;;   (identifier) @function.builtin
-;;   (#match? @function.builtin "\\c^(set)$")
-;;   (
-;;     (argument) @constant
-;;     (#any-of? @constant "PARENT_SCOPE")
-;;   ) .
-;; )
+;;   (identifier) @_function
+;;   (argument_list
+;;     .
+;;     (argument) @variable)
+;;   (#match? @_function "\\c^set$"))
 
 ;; (normal_command
-;;   (identifier) @function.builtin
-;;   (#match? @function.builtin "\\c^(set)$")
-;;   . (argument)
-;;   (
-;;     (argument) @_cache @constant
-;;     .
-;;     (argument) @_type @constant
-;;     (#any-of? @_cache "CACHE")
-;;     (#any-of? @_type "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL")
-;;   )
-;; )
+;;   (identifier) @_function
+;;   (#match? @_function "\\c^set$")
+;;   (argument_list
+;;     .
+;;     (argument)
+;;     ((argument) @_cache @keyword.modifier
+;;       .
+;;       (argument) @_type @type
+;;       (#any-of? @_cache "CACHE")
+;;       (#any-of? @_type "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL"))))
+
 ;; (normal_command
-;;   (identifier) @function.builtin
-;;   (#match? @function.builtin "\\c^(set)$")
-;;   . (argument)
-;;   (argument) @_cache
-;;   (#any-of? @_cache "CACHE")
-;;   (
-;;     (argument) @_force @constant
-;;     (#any-of? @_force "FORCE")
-;;   ) .
-;; )
+;;   (identifier) @_function
+;;   (#match? @_function "\\c^unset$")
+;;   (argument_list
+;;     .
+;;     (argument)
+;;     (argument) @keyword.modifier
+;;     (#any-of? @keyword.modifier "CACHE" "PARENT_SCOPE")))
 
-;; ((argument) @boolean
-;;   (#match? @boolean "\\c^(1|on|yes|true|y|0|off|no|false|n|ignore|notfound|.*-notfound)$")
-;; )
+;; (normal_command
+;;   (identifier) @_function
+;;   (#match? @_function "\\c^list$")
+;;   (argument_list
+;;     .
+;;     (argument) @constant
+;;     (#any-of? @constant "LENGTH" "GET" "JOIN" "SUBLIST" "FIND")
+;;     .
+;;     (argument) @variable
+;;     (argument) @variable .))
 
-(if_command
-  (if)
-  (argument) @keyword.operator
-  (#any-of? @keyword.operator "NOT" "AND" "OR"
-                              "COMMAND" "POLICY" "TARGET" "TEST" "DEFINED" "IN_LIST"
-                              "EXISTS" "IS_NEWER_THAN" "IS_DIRECTORY" "IS_SYMLINK" "IS_ABSOLUTE"
-                              "MATCHES"
-                              "LESS" "GREATER" "EQUAL" "LESS_EQUAL" "GREATER_EQUAL"
-                              "STRLESS" "STRGREATER" "STREQUAL" "STRLESS_EQUAL" "STRGREATER_EQUAL"
-                              "VERSION_LESS" "VERSION_GREATER" "VERSION_EQUAL" "VERSION_LESS_EQUAL" "VERSION_GREATER_EQUAL"
-  )
-)
+;; (normal_command
+;;   (identifier) @_function
+;;   (#match? @_function "\\c^list$")
+;;   (argument_list
+;;     .
+;;     (argument) @constant
+;;     .
+;;     (argument) @variable
+;;     (#any-of? @constant
+;;       "APPEND" "FILTER" "INSERT" "POP_BACK" "POP_FRONT" "PREPEND" "REMOVE_ITEM" "REMOVE_AT"
+;;       "REMOVE_DUPLICATES" "REVERSE" "SORT")))
 
 ;; (normal_command
-;;   (identifier) @function.builtin
-;;   . (argument)
-;;   (argument) @constant
-;;   (#any-of? @constant "ALL" "COMMAND" "DEPENDS" "BYPRODUCTS" "WORKING_DIRECTORY" "COMMENT"
-;;                    "JOB_POOL" "VERBATIM" "USES_TERMINAL" "COMMAND_EXPAND_LISTS" "SOURCES")
-;;   (#match? @function.builtin "\\c^(add_custom_target)$")
-;; )
+;;   (identifier) @_function
+;;   (#match? @_function "\\c^list$")
+;;   (argument_list
+;;     .
+;;     (argument) @_transform @constant
+;;     .
+;;     (argument) @variable
+;;     .
+;;     (argument) @_action @constant
+;;     (#eq? @_transform "TRANSFORM")
+;;     (#any-of? @_action "APPEND" "PREPEND" "TOUPPER" "TOLOWER" "STRIP" "GENEX_STRIP" "REPLACE")))
 
 ;; (normal_command
-;;   (identifier) @function.builtin
-;;   (argument) @constant
-;;   (#any-of? @constant "OUTPUT" "COMMAND" "MAIN_DEPENDENCY" "DEPENDS" "BYPRODUCTS" "IMPLICIT_DEPENDS" "WORKING_DIRECTORY"
-;;                       "COMMENT" "DEPFILE" "JOB_POOL" "VERBATIM" "APPEND" "USES_TERMINAL" "COMMAND_EXPAND_LISTS")
-;;   (#match? @function.builtin "\\c^(add_custom_command)$")
-;; )
+;;   (identifier) @_function
+;;   (#match? @_function "\\c^list$")
+;;   (argument_list
+;;     .
+;;     (argument) @_transform @constant
+;;     .
+;;     (argument) @variable
+;;     .
+;;     (argument) @_action @constant
+;;     .
+;;     (argument)? @_selector @constant
+;;     (#eq? @_transform "TRANSFORM")
+;;     (#any-of? @_action "APPEND" "PREPEND" "TOUPPER" "TOLOWER" "STRIP" "GENEX_STRIP" "REPLACE")
+;;     (#any-of? @_selector "AT" "FOR" "REGEX")))
+
+;; (normal_command
+;;   (identifier) @_function
+;;   (#match? @_function "\\c^list$")
+;;   (argument_list
+;;     .
+;;     (argument) @_transform @constant
+;;     (argument) @constant
+;;     .
+;;     (argument) @variable
+;;     (#eq? @_transform "TRANSFORM")
+;;     (#eq? @constant "OUTPUT_VARIABLE")))
+
+(escape_sequence) @string.escape
 
+((source_file
+  .
+  (line_comment) @keyword.directive @nospell)
+  (#lua-match? @keyword.directive "^#!/"))