deps src: Automatic update

Author: marvim

src/treesitter_query-stamp/download-treesitter_query.cmake

@@ -22,16 +22,16 @@ function(check_file_hash has_hash hash_is_good)
   set("${has_hash}" TRUE PARENT_SCOPE)
 
   message(VERBOSE "verifying file...
-       file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz'")
+       file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz'")
 
-  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz" actual_value)
+  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz" actual_value)
 
-  if(NOT "${actual_value}" STREQUAL "79285847e8350ee9fe1f6f6c9eb64bc14320f70f7b9b65037193fc58f2638613")
+  if(NOT "${actual_value}" STREQUAL "c2b23b9a54cffcc999ded4a5d3949daf338bebb7945dece229f832332e6e6a7d")
     set("${hash_is_good}" FALSE PARENT_SCOPE)
     message(VERBOSE "SHA256 hash of
-    /home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz
+    /home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz
   does not match expected value
-    expected: '79285847e8350ee9fe1f6f6c9eb64bc14320f70f7b9b65037193fc58f2638613'
+    expected: 'c2b23b9a54cffcc999ded4a5d3949daf338bebb7945dece229f832332e6e6a7d'
       actual: '${actual_value}'")
   else()
     set("${hash_is_good}" TRUE PARENT_SCOPE)
@@ -71,32 +71,32 @@ function(sleep_before_download attempt)
   execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep "${sleep_seconds}")
 endfunction()
 
-if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz")
+if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz")
   check_file_hash(has_hash hash_is_good)
   if(has_hash)
     if(hash_is_good)
       message(VERBOSE "File already exists and hash match (skip download):
-  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz'
-  SHA256='79285847e8350ee9fe1f6f6c9eb64bc14320f70f7b9b65037193fc58f2638613'"
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz'
+  SHA256='c2b23b9a54cffcc999ded4a5d3949daf338bebb7945dece229f832332e6e6a7d'"
       )
       return()
     else()
       message(VERBOSE "File already exists but hash mismatch. Removing...")
-      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz")
+      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz")
     endif()
   else()
     message(VERBOSE "File already exists but no hash specified (use URL_HASH):
-  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz'
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz'
 Old file will be removed and new file downloaded from URL."
     )
-    file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz")
+    file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz")
   endif()
 endif()
 
 set(retry_number 5)
 
 message(VERBOSE "Downloading...
-   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz'
+   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz'
    timeout='none'
    inactivity timeout='none'"
 )
@@ -107,7 +107,7 @@ foreach(i RANGE ${retry_number})
   if(status_code IN_LIST download_retry_codes)
     sleep_before_download(${i})
   endif()
-  foreach(url IN ITEMS [====[https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.7.0.tar.gz]====])
+  foreach(url IN ITEMS [====[https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.8.0.tar.gz]====])
     if(NOT url IN_LIST skip_url_list)
       message(VERBOSE "Using src='${url}'")
 
@@ -119,7 +119,7 @@ foreach(i RANGE ${retry_number})
 
       file(
         DOWNLOAD
-        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz"
+        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz"
 
         # no TIMEOUT
         # no INACTIVITY_TIMEOUT
@@ -136,7 +136,7 @@ foreach(i RANGE ${retry_number})
         check_file_hash(has_hash hash_is_good)
         if(has_hash AND NOT hash_is_good)
           message(VERBOSE "Hash mismatch, removing...")
-          file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz")
+          file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz")
         else()
           message(VERBOSE "Downloading... done")
           return()

src/treesitter_query-stamp/extract-treesitter_query.cmake

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION ${CMAKE_VERSION}) # this file comes with cmake
 
 # Make file names absolute:
 #
-get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.7.0.tar.gz" ABSOLUTE)
+get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.8.0.tar.gz" ABSOLUTE)
 get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_query" ABSOLUTE)
 
 message(VERBOSE "extracting...

src/treesitter_query-stamp/treesitter_query-urlinfo.txt

@@ -6,7 +6,7 @@ method=url
 command=/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_query-stamp/download-treesitter_query.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_query-stamp/verify-treesitter_query.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_query-stamp/extract-treesitter_query.cmake
 source_dir=/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_query
 work_dir=/home/runner/work/deps/deps/neovim/deps/build/src
-url(s)=https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.7.0.tar.gz
-hash=SHA256=79285847e8350ee9fe1f6f6c9eb64bc14320f70f7b9b65037193fc58f2638613
+url(s)=https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.8.0.tar.gz
+hash=SHA256=c2b23b9a54cffcc999ded4a5d3949daf338bebb7945dece229f832332e6e6a7d
       no_extract=
 

src/treesitter_query/Cargo.lock

@@ -65,39 +65,45 @@ module.exports = grammar({
       optional($.string_content),
       token.immediate('"'),
     ),
+    _immediate_string: $ => seq(
+      token.immediate('"'),
+      optional($.string_content),
+      token.immediate('"'),
+    ),
     string_content: $ => repeat1(choice(token.immediate(prec(PREC.STRING, /[^"\\\n]+/)), $.escape_sequence)),
-    parameters: $ => repeat1(choice($.capture, $.string, $._node_identifier)),
+    parameters: $ => repeat1(choice($.capture, $.string, $.identifier)),
     comment: _ => token(prec(PREC.COMMENT, seq(";", /.*/))),
-    list: $ => seq("[", repeat1($.definition), "]", quantifier($), captures($)),
+    list: $ => seq("[", repeat1($.definition), "]", suffix($)),
 
     grouping: $ => seq(
       "(",
       repeat1(seq($._group_expression, optional("."))),
       ")",
-      quantifier($),
-      captures($),
+      suffix($),
     ),
 
     missing_node: ($) => seq(
       "(",
       "MISSING",
       optional(field("name", choice($.identifier, $.string))),
       ")",
-      quantifier($),
-      captures($),
+      suffix($),
     ),
 
     anonymous_node: $ => seq(
       field("name", choice($.string, "_")),
-      quantifier($),
-      captures($),
+      suffix($),
     ),
 
     named_node: $ => seq(
       "(",
       choice(
         field("name", $._node_identifier),
-        seq(field("supertype", $.identifier), token.immediate('/'), field("name", $._immediate_identifier)),
+        seq(
+          field("supertype", $.identifier),
+          token.immediate('/'),
+          field("name", choice($._immediate_identifier, alias($._immediate_string, $.string)))
+        ),
       ),
       optional(
         seq(
@@ -112,8 +118,7 @@ module.exports = grammar({
         ),
       ),
       ")",
-      quantifier($),
-      captures($),
+      suffix($),
     ),
     _field_name: $ => seq($.identifier, ":"),
     field_definition: $ => seq(
@@ -134,12 +139,8 @@ module.exports = grammar({
   }
 });
 
-function captures($) {
-  return repeat($.capture);
-}
-
-function quantifier($) {
-  return optional(field("quantifier", $.quantifier));
+function suffix($) {
+  return repeat(choice($.capture, field("quantifier", $.quantifier)))
 }
 
 function immediate_child(expression) {