deps src: Automatic update

src/treesitter-bash-stamp/download-treesitter-bash.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-bash/v0.20.4.tar.gz'")
+       file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz'")
 
-  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.4.tar.gz" actual_value)
+  file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz" actual_value)
 
-  if(NOT "${actual_value}" STREQUAL "8a86182b9dd66acdce27c1e272247882b5cf910dd8725fbb68a8bf9d808fecba")
+  if(NOT "${actual_value}" STREQUAL "7bba80ac64a18ec1b3f47e738e6a168f065c3cb4244234eff1b773816008f5a7")
     set("${hash_is_good}" FALSE PARENT_SCOPE)
     message(STATUS "SHA256 hash of
-    /home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.4.tar.gz
+    /home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz
   does not match expected value
-    expected: '8a86182b9dd66acdce27c1e272247882b5cf910dd8725fbb68a8bf9d808fecba'
+    expected: '7bba80ac64a18ec1b3f47e738e6a168f065c3cb4244234eff1b773816008f5a7'
       actual: '${actual_value}'")
   else()
     set("${hash_is_good}" TRUE PARENT_SCOPE)
@@ -71,40 +71,40 @@ function(sleep_before_download attempt)
   execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep "${sleep_seconds}")
 endfunction()
 
-if("/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.4.tar.gz" STREQUAL "")
+if("/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz" STREQUAL "")
   message(FATAL_ERROR "LOCAL can't be empty")
 endif()
 
-if("https://github.com/tree-sitter/tree-sitter-bash/archive/v0.20.4.tar.gz" STREQUAL "")
+if("https://github.com/tree-sitter/tree-sitter-bash/archive/v0.20.5.tar.gz" STREQUAL "")
   message(FATAL_ERROR "REMOTE can't be empty")
 endif()
 
-if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.4.tar.gz")
+if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.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-bash/v0.20.4.tar.gz'
-  SHA256='8a86182b9dd66acdce27c1e272247882b5cf910dd8725fbb68a8bf9d808fecba'"
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz'
+  SHA256='7bba80ac64a18ec1b3f47e738e6a168f065c3cb4244234eff1b773816008f5a7'"
       )
       return()
     else()
       message(STATUS "File already exists but hash mismatch. Removing...")
-      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.4.tar.gz")
+      file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.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-bash/v0.20.4.tar.gz'
+  file='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.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-bash/v0.20.4.tar.gz")
+    file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz")
   endif()
 endif()
 
 set(retry_number 5)
 
 message(STATUS "Downloading...
-   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.4.tar.gz'
+   dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz'
    timeout='none'
    inactivity timeout='none'"
 )
@@ -115,7 +115,7 @@ foreach(i RANGE ${retry_number})
   if(status_code IN_LIST download_retry_codes)
     sleep_before_download(${i})
   endif()
-  foreach(url https://github.com/tree-sitter/tree-sitter-bash/archive/v0.20.4.tar.gz)
+  foreach(url https://github.com/tree-sitter/tree-sitter-bash/archive/v0.20.5.tar.gz)
     if(NOT url IN_LIST skip_url_list)
       message(STATUS "Using src='${url}'")
 
@@ -126,7 +126,7 @@ foreach(i RANGE ${retry_number})
 
       file(
         DOWNLOAD
-        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.4.tar.gz"
+        "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz"
 
         # no TIMEOUT
         # no INACTIVITY_TIMEOUT
@@ -143,7 +143,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-bash/v0.20.4.tar.gz")
+          file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz")
         else()
           message(STATUS "Downloading... done")
           return()

src/treesitter-bash-stamp/extract-treesitter-bash.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-bash/v0.20.4.tar.gz" ABSOLUTE)
+get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/treesitter-bash/v0.20.5.tar.gz" ABSOLUTE)
 get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/treesitter-bash" ABSOLUTE)
 
 message(STATUS "extracting...

src/treesitter-bash-stamp/treesitter-bash-urlinfo.txt

@@ -6,7 +6,7 @@ method=url
 command=/usr/local/bin/cmake;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter-bash-stamp/download-treesitter-bash.cmake;COMMAND;/usr/local/bin/cmake;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter-bash-stamp/verify-treesitter-bash.cmake;COMMAND;/usr/local/bin/cmake;-P;/home/runner/work/deps/deps/neovim/deps/build/src/treesitter-bash-stamp/extract-treesitter-bash.cmake
 source_dir=/home/runner/work/deps/deps/neovim/deps/build/src/treesitter-bash
 work_dir=/home/runner/work/deps/deps/neovim/deps/build/src
-url(s)=https://github.com/tree-sitter/tree-sitter-bash/archive/v0.20.4.tar.gz
-hash=SHA256=8a86182b9dd66acdce27c1e272247882b5cf910dd8725fbb68a8bf9d808fecba
+url(s)=https://github.com/tree-sitter/tree-sitter-bash/archive/v0.20.5.tar.gz
+hash=SHA256=7bba80ac64a18ec1b3f47e738e6a168f065c3cb4244234eff1b773816008f5a7
 no_extract=
 

src/treesitter-bash/.github/workflows/pack.yml

@@ -1,13 +1,14 @@
 name: Pack
 
 on:
+  workflow_dispatch:
   release:
     types:
       - released
 
 env:
-  NODE_PREBUILD_CMD: npx prebuild -t 10.0.0 -t 12.0.0 -t 14.0.0 -t 16.0.0 -t 18.0.0 -t 20.0.0 --strip -u ${{ secrets.GH_TOKEN }}
-  ELECTRON_PREBUILD_CMD: npx prebuild -r electron -t 3.0.0 -t 4.0.0 -t 5.0.0 -t 6.0.0 -t 7.0.0 -t 8.0.0 -t 9.0.0 -t 10.0.0 -t 11.0.0 -t 12.0.0 -t 13.0.0 -t 14.0.0 -t 15.0.0 -t 16.0.0 -t 17.0.0 -t 18.0.0 -t 19.0.0 -t 20.0.0 -t 21.0.0 -t 22.0.0 -t 23.0.0 -t 24.0.0 -t 25.0.0 --strip -u ${{ secrets.GH_TOKEN }}
+  NODE_PREBUILD_CMD: npx prebuild -t 10.0.0 -t 12.0.0 -t 14.0.0 -t 16.0.0 -t 18.0.0 -t 20.0.0 --strip -u ${{ secrets.GITHUB_TOKEN }}
+  ELECTRON_PREBUILD_CMD: npx prebuild -r electron -t 3.0.0 -t 4.0.0 -t 5.0.0 -t 6.0.0 -t 7.0.0 -t 8.0.0 -t 9.0.0 -t 10.0.0 -t 11.0.0 -t 12.0.0 -t 13.0.0 -t 14.0.0 -t 15.0.0 -t 16.0.0 -t 17.0.0 -t 18.0.0 -t 19.0.0 -t 20.0.0 -t 21.0.0 -t 22.0.0 -t 23.0.0 -t 24.0.0 -t 25.0.0 --strip -u ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   test:

src/treesitter-bash/Cargo.toml

@@ -1,8 +1,11 @@
 [package]
 name = "tree-sitter-bash"
 description = "Bash grammar for tree-sitter"
-version = "0.20.4"
-authors = ["Max Brunsfeld <[email protected]"]
+version = "0.20.5"
+authors = [
+	"Max Brunsfeld <[email protected]>",
+	"Amaan Qureshi <[email protected]>",
+]
 license = "MIT"
 readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "bash"]

src/treesitter-bash/binding.gyp

@@ -16,7 +16,7 @@
       ]
     }
   ],
-  'variables': {
-    'openssl_fips': '',
+  "variables": {
+    "openssl_fips": "",
   }
 }

src/treesitter-bash/bindings/rust/README.md

@@ -9,7 +9,7 @@ way.)
 ```toml
 [dependencies]
 tree-sitter = "0.20.10"
-tree-sitter-bash = "0.20.4"
+tree-sitter-bash = "0.20.5"
 ```
 
 Typically, you will use the [language][language func] function to add this

src/treesitter-bash/grammar.js

@@ -68,6 +68,7 @@ module.exports = grammar({
     $._special_variable_name,
     $._c_word,
     $._statement_not_subshell,
+    $._redirect,
   ],
 
   externals: $ => [
@@ -97,6 +98,8 @@ module.exports = grammar({
     '<<',
     '<<-',
     /\n/,
+    '(',
+    'esac',
     $.__error_recovery,
   ],
 
@@ -179,7 +182,7 @@ module.exports = grammar({
       $.subshell,
     )),
 
-    redirected_statement: $ => prec.dynamic(-1, prec(-1, choice(
+    redirected_statement: $ => prec.dynamic(-1, prec.right(-1, choice(
       seq(
         field('body', $._statement),
         field('redirect', choice(
@@ -193,7 +196,7 @@ module.exports = grammar({
         field('body', choice($.if_statement, $.while_statement)),
         $.herestring_redirect,
       ),
-      field('redirect', repeat1($.file_redirect)),
+      field('redirect', repeat1($._redirect)),
       $.herestring_redirect,
     ))),
 
@@ -379,9 +382,11 @@ module.exports = grammar({
         choice(
           $.compound_statement,
           $.subshell,
-          $.test_command),
+          $.test_command,
+          $.if_statement,
+        ),
       ),
-      field('redirect', optional($.file_redirect)),
+      field('redirect', optional($._redirect)),
     )),
 
     compound_statement: $ => seq(
@@ -425,11 +430,26 @@ module.exports = grammar({
     test_command: $ => seq(
       choice(
         seq('[', optional(choice($._expression, $.redirected_statement)), ']'),
-        seq('[[', $._expression, ']]'),
+        seq(
+          '[[',
+          choice(
+            $._expression,
+            alias($._test_command_binary_expression, $.binary_expression),
+          ),
+          ']]',
+        ),
         seq('((', optional($._expression), '))'),
       ),
     ),
 
+    _test_command_binary_expression: $ => prec(PREC.ASSIGN,
+      seq(
+        field('left', $._expression),
+        field('operator', '='),
+        field('right', alias($._regex_no_space, $.regex)),
+      ),
+    ),
+
     declaration_command: $ => prec.left(seq(
       choice('declare', 'typeset', 'export', 'readonly', 'local'),
       repeat(choice(
@@ -450,7 +470,7 @@ module.exports = grammar({
     command: $ => prec.left(seq(
       repeat(choice(
         $.variable_assignment,
-        field('redirect', choice($.file_redirect, $.herestring_redirect)),
+        field('redirect', $._redirect),
       )),
       field('name', $.command_name),
       choice(
@@ -518,7 +538,7 @@ module.exports = grammar({
       optional(choice(
         alias($._heredoc_pipeline, $.pipeline),
         seq(
-          field('redirect', repeat1($.file_redirect)),
+          field('redirect', repeat1($._redirect)),
           optional($._heredoc_expression),
         ),
         $._heredoc_expression,
@@ -566,6 +586,8 @@ module.exports = grammar({
       $._literal,
     )),
 
+    _redirect: $ => choice($.file_redirect, $.herestring_redirect),
+
     // Expressions
 
     _expression: $ => choice(
@@ -828,8 +850,8 @@ module.exports = grammar({
 
     number: $ => choice(
       /-?(0x)?[0-9]+(#[0-9A-Za-z@_]+)?/,
-      // the base can be an expansion
-      seq(/-?(0x)?[0-9]+#/, $.expansion),
+      // the base can be an expansion or command substitution
+      seq(/-?(0x)?[0-9]+#/, choice($.expansion, $.command_substitution)),
     ),
 
     simple_expansion: $ => seq(
@@ -838,6 +860,7 @@ module.exports = grammar({
         $._simple_variable_name,
         $._multiline_variable_name,
         $._special_variable_name,
+        $.variable_name,
         alias('!', $.special_variable_name),
         alias('#', $.special_variable_name),
       ),
@@ -919,7 +942,13 @@ module.exports = grammar({
 
     _expansion_regex: $ => seq(
       field('operator', choice('#', alias($._immediate_double_hash, '##'), '%', '%%')),
-      optional(choice($.regex, alias(')', $.regex), $.string, $.raw_string, alias(/\s+/, $.regex))),
+      repeat(choice(
+        $.regex,
+        alias(')', $.regex),
+        $.string,
+        $.raw_string,
+        alias(/\s+/, $.regex),
+      )),
     ),
 
     _expansion_regex_replacement: $ => seq(
@@ -966,6 +995,7 @@ module.exports = grammar({
       )),
       optional(seq(
         field('operator', ':'),
+        optional($.simple_expansion),
         optional(choice(
           $._simple_variable_name,
           $.number,
@@ -1019,6 +1049,7 @@ module.exports = grammar({
         $.command_substitution,
         alias($._expansion_word, $.word),
         $.array,
+        $.process_substitution,
       ),
       repeat1(seq(
         choice($._concat, alias(/`\s*`/, '``')),
@@ -1033,6 +1064,7 @@ module.exports = grammar({
           $.command_substitution,
           alias($._expansion_word, $.word),
           $.array,
+          $.process_substitution,
         ),
       )),
     )),

src/treesitter-bash/package.json

@@ -1,25 +1,28 @@
 {
   "name": "tree-sitter-bash",
-  "version": "0.20.4",
+  "version": "0.20.5",
   "description": "Bash grammar for tree-sitter",
   "main": "bindings/node",
   "keywords": [
     "parser",
     "lexer",
     "bash"
   ],
-  "author": "Max Brunsfeld",
+  "author": "Max Brunsfeld <[email protected]>",
+  "contributors": [
+    "Amaan Qureshi <[email protected]>"
+  ],
   "license": "MIT",
   "dependencies": {
     "nan": "^2.18.0",
     "prebuild-install": "^7.1.1",
     "web-tree-sitter": "^0.20.8"
   },
   "devDependencies": {
-    "eslint": "^8.50.0",
+    "eslint": "^8.56.0",
     "eslint-config-google": "^0.14.0",
-    "node-gyp": "^9.4.0",
-    "prebuild": "^12.1.0",
+    "node-gyp": "^10.0.1",
+    "prebuild": "^13.0.0",
     "tree-sitter-cli": "^0.20.8"
   },
   "overrides": {
@@ -42,9 +45,15 @@
   "tree-sitter": [
     {
       "scope": "source.bash",
+      "injection-regex": "(shell|bash|sh)",
+      "first-line-regex": "^#!.*\\b(sh|bash|dash)\\b.*$",
       "file-types": [
         "sh",
-        "bash"
+        "bash",
+        ".bashrc",
+        ".bash_profile",
+        "ebuild",
+        "eclass"
       ]
     }
   ]