deps src: Automatic update

neovim · May 7, 2024 · ae791be · ae791be
1 parent eab65d7
commit ae791be
Show file tree

Hide file tree

Showing 19 changed files with 6,249 additions and 3,152 deletions.
diff --git a/src/treesitter_query-stamp/download-treesitter_query.cmake b/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(STATUS "verifying file...
-       file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz'")
+       file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz'")
 
-  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz" actual_value)
+  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz" actual_value)
 
-  if(NOT "${actual_value}" STREQUAL "5a0ee26c4af94adb9ab850a518613f75e7040354f5b049a5b85457ebf579ae8b")
+  if(NOT "${actual_value}" STREQUAL "f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0")
     set("${hash_is_good}" FALSE PARENT_SCOPE)
     message(STATUS "SHA256 hash of
-    /home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz
+    /home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz
   does not match expected value
-    expected: '5a0ee26c4af94adb9ab850a518613f75e7040354f5b049a5b85457ebf579ae8b'
+    expected: 'f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0'
       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.2.0.tar.gz")
+if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz")
   check_file_hash(has_hash hash_is_good)
   if(has_hash)
     if(hash_is_good)
       message(STATUS "File already exists and hash match (skip download):
-  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz'
-  SHA256='5a0ee26c4af94adb9ab850a518613f75e7040354f5b049a5b85457ebf579ae8b'"
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz'
+  SHA256='f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0'"
       )
       return()
     else()
       message(STATUS "File already exists but hash mismatch. Removing...")
-      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz")
+      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz")
     endif()
   else()
     message(STATUS "File already exists but no hash specified (use URL_HASH):
-  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz'
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.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.2.0.tar.gz")
+    file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz")
   endif()
 endif()
 
 set(retry_number 5)
 
 message(STATUS "Downloading...
-   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz'
+   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.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.2.0.tar.gz]====])
+  foreach(url IN ITEMS [====[https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.3.0.tar.gz]====])
     if(NOT url IN_LIST skip_url_list)
       message(STATUS "Using src='${url}'")
 
@@ -118,7 +118,7 @@ foreach(i RANGE ${retry_number})
 
       file(
         DOWNLOAD
-        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz"
+        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz"
 
         # no TIMEOUT
         # no INACTIVITY_TIMEOUT
@@ -135,7 +135,7 @@ foreach(i RANGE ${retry_number})
         check_file_hash(has_hash hash_is_good)
         if(has_hash AND NOT hash_is_good)
           message(STATUS "Hash mismatch, removing...")
-          file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz")
+          file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz")
         else()
           message(STATUS "Downloading... done")
           return()

diff --git a/src/treesitter_query-stamp/extract-treesitter_query.cmake b/src/treesitter_query-stamp/extract-treesitter_query.cmake
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.5)
 
 # Make file names absolute:
 #
-get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.2.0.tar.gz" ABSOLUTE)
+get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter_query/v0.3.0.tar.gz" ABSOLUTE)
 get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_query" ABSOLUTE)
 
 message(STATUS "extracting...

diff --git a/src/treesitter_query-stamp/treesitter_query-urlinfo.txt b/src/treesitter_query-stamp/treesitter_query-urlinfo.txt
@@ -6,7 +6,7 @@ method=url
 command=/usr/local/bin/cmake;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_query-stamp/download-treesitter_query.cmake;COMMAND;/usr/local/bin/cmake;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter_query-stamp/verify-treesitter_query.cmake;COMMAND;/usr/local/bin/cmake;-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.2.0.tar.gz
-hash=SHA256=5a0ee26c4af94adb9ab850a518613f75e7040354f5b049a5b85457ebf579ae8b
+url(s)=https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.3.0.tar.gz
+hash=SHA256=f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0
 no_extract=
 
diff --git a/src/treesitter_query/.github/workflows/ci.yaml b/src/treesitter_query/.github/workflows/ci.yaml
@@ -30,10 +30,10 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
     steps:
-      - name: Set up repository
-        uses: tree-sitter/parser-setup-action@v1.1
-        with:
-          node-version: ${{vars.NODE_VERSION}}
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up tree-sitter
+        uses: tree-sitter/setup-action/cli@v1
       - name: Clone nvim-treesitter corpus
         uses: actions/checkout@v4
         with:
@@ -47,7 +47,10 @@ jobs:
           path: .tests/nvim-treesitter-textobjects
           sparse-checkout: queries/
       - name: Run tests
-        uses: tree-sitter/parser-test-action@v1.2
+        uses: tree-sitter/parser-test-action@v2
+        with:
+          test-rust: ${{runner.os == 'Linux'}}
+      - name: Parse files
+        uses: tree-sitter/parse-action@v4
         with:
-          test-library: ${{runner.os == 'Linux'}}
-          corpus-files: .tests/*/queries/*/*.scm
+          files: .tests/*/queries/*/*.scm
diff --git a/src/treesitter_query/Cargo.toml b/src/treesitter_query/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-query"
 description = "TS query grammar for tree-sitter"
-version = "0.2.0"
+version = "0.3.0"
 license = "Apache-2.0"
 readme = "README.md"
 keywords = ["incremental", "parsing", "tree-sitter", "query"]

diff --git a/src/treesitter_query/Makefile b/src/treesitter_query/Makefile
diff --git a/src/treesitter_query/bindings/node/index.js b/src/treesitter_query/bindings/node/index.js
diff --git a/src/treesitter_query/bindings/rust/build.rs b/src/treesitter_query/bindings/rust/build.rs
diff --git a/src/treesitter_query/grammar.js b/src/treesitter_query/grammar.js
@@ -61,7 +61,7 @@ module.exports = grammar({
         /[0-7]{1,3}/,
         /x[0-9a-fA-F]{2}/,
         /u[0-9a-fA-F]{4}/,
-        /u{[0-9a-fA-F]+}/
+        /u\{[0-9a-fA-F]+\}/
       )
     )),
 
@@ -92,7 +92,10 @@ module.exports = grammar({
 
     named_node: $ => seq(
       "(",
-      field("name", $._node_identifier),
+      choice(
+        field("name", $._node_identifier),
+        seq(field("supertype", $.identifier), token.immediate('/'), field("name", $._immediate_identifier)),
+      ),
       optional(
         seq(
           optional("."),