Add Java support for @statement.outer

.github/workflows/check_query_files.yml

@@ -1,7 +1,6 @@
 name: Check loading of syntax files
 
 on:
-  push:
   pull_request:
   schedule:
     - cron: '0 0 * * *' # every day at midnight
@@ -10,6 +9,9 @@ jobs:
   luacheck:
     name: Check Query Files
     runs-on: ubuntu-latest
+    env:
+      NVIM_TAG: stable
+      APPIMAGE: nvim-linux-x86_64.appimage
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -20,19 +22,20 @@ jobs:
       - name: Prepare
         env:
           NVIM_TAG: stable
+          APPIMAGE: nvim-linux-x86_64.appimage
         run: |
           sudo apt-get update && sudo apt-get install libfuse2
           sudo add-apt-repository universe
-          wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim.appimage
-          chmod u+x nvim.appimage
+          wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/${APPIMAGE}
+          chmod u+x ${APPIMAGE}
           mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter-textobject/start
           ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter-textobject/start
           mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
           cd ~/.local/share/nvim/site/pack/nvim-treesitter/start
           git clone https://github.com/nvim-treesitter/nvim-treesitter.git
 
       - name: Compile parsers
-        run: ./nvim.appimage --headless -c "TSInstallSync all" -c "q"
+        run: ./${APPIMAGE} --headless -c "TSInstallSync all" -c "q"
 
       - name: Check query files
-        run: ./nvim.appimage --headless -c "luafile ./scripts/check-queries.lua" -c "q"
+        run: ./${APPIMAGE} --headless -c "luafile ./scripts/check-queries.lua" -c "q"

.github/workflows/lint.yml

@@ -1,6 +1,6 @@
 name: Linting and style checking
 
-on: [push, pull_request]
+on: pull_request
 
 jobs:
   luacheck:

.github/workflows/tests.yml

@@ -1,9 +1,7 @@
 name: Tests
 
 on:
-  push:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
     branches:
       - 'master'
 

.github/workflows/update-readme.yml

@@ -9,6 +9,8 @@ jobs:
   update-readme:
     name: Update README.md
     runs-on: ubuntu-latest
+    env:
+      APPIMAGE: nvim-linux-x86_64.appimage
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -20,23 +22,23 @@ jobs:
         run: |
           sudo apt-get update && sudo apt-get install libfuse2
           sudo add-apt-repository universe
-          wget https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage
-          chmod u+x nvim.appimage
+          wget https://github.com/neovim/neovim/releases/download/nightly/${APPIMAGE}
+          chmod u+x ${APPIMAGE}
           mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter-textobject/start
           ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter-textobject/start
           mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
           cd ~/.local/share/nvim/site/pack/nvim-treesitter/start
           git clone https://github.com/nvim-treesitter/nvim-treesitter.git
 
       - name: Compile parsers
-        run: ./nvim.appimage --headless -c "TSInstallSync all" -c "q"
+        run: ./${APPIMAGE} --headless -c "TSInstallSync all" -c "q"
 
       # inspired by nvim-lspconfigs
       - name: Check README
         run: |
           git config user.email "actions@github"
           git config user.name "Github Actions"
-          ./nvim.appimage --headless -c "luafile ./scripts/update-readme.lua" -c "q" || echo "Needs update"
+          ./${APPIMAGE} --headless -c "luafile ./scripts/update-readme.lua" -c "q" || echo "Needs update"
           git add README.md
           git commit -m "docs: update queries in README" || echo 'No commit necessary!'
           git clean -xf

lua/nvim-treesitter/textobjects/lsp_interop.lua

@@ -111,7 +111,11 @@ function M.peek_definition_code(query_string, query_group, lsp_request, context)
   if vim.tbl_contains(vim.api.nvim_list_wins(), floating_win) then
     vim.api.nvim_set_current_win(floating_win)
   else
-    local params = vim.lsp.util.make_position_params()
+    local win_id = vim.api.nvim_get_current_win()
+    local params = vim.fn.has "nvim-0.11" == 0 and vim.lsp.util.make_position_params()
+      or function(client)
+        return vim.lsp.util.make_position_params(win_id, client.offset_encoding)
+      end
     return vim.lsp.buf_request(
       0,
       lsp_request,

queries/apex/textobjects.scm

@@ -99,6 +99,12 @@
 ] @comment.outer
 
 ; assignment
-(variable_declarator
-  name: (identifier) @assignment.lhs
-  value: (_) @assignment.rhs) @assignment.inner @assignment.outer
+(field_declaration
+  (variable_declarator
+    name: (identifier) @assignment.lhs
+    value: (_) @assignment.rhs) @assignment.inner) @assignment.outer
+
+(local_variable_declaration
+  (variable_declarator
+    name: (identifier) @assignment.lhs
+    value: (_) @assignment.rhs) @assignment.inner) @assignment.outer

queries/css/textobjects.scm

@@ -18,3 +18,5 @@
 
 (declaration
   (property_name) @assignment.inner)
+
+(comment) @comment.outer

queries/ecma/textobjects.scm

@@ -1,6 +1,9 @@
 (function_declaration
   body: (statement_block)) @function.outer
 
+(generator_function_declaration
+  body: (statement_block)) @function.outer
+
 (function_expression
   body: (statement_block)) @function.outer
 
@@ -15,6 +18,17 @@
     "}"
     (#make-range! "function.inner" @_start @_end)))
 
+(generator_function_declaration
+  body: (statement_block
+    .
+    "{"
+    .
+    (_) @_start @_end
+    (_)? @_end
+    .
+    "}"
+    (#make-range! "function.inner" @_start @_end)))
+
 (function_expression
   body: (statement_block
     .
@@ -58,7 +72,18 @@
     (#make-range! "function.inner" @_start @_end)))
 
 (class_declaration
-  body: (class_body) @class.inner) @class.outer
+  body: (class_body)) @class.outer
+
+(class_declaration
+  body: (class_body
+    .
+    "{"
+    .
+    (_) @_start @_end
+    (_)? @_end
+    .
+    "}"
+    (#make-range! "class.inner" @_start @_end)))
 
 (export_statement
   (class_declaration)) @class.outer
@@ -182,39 +207,6 @@
   ","? @_end
   (#make-range! "parameter.outer" @parameter.inner @_end))
 
-; If the array/object pattern is the first parameter, treat its elements as the argument list
-(formal_parameters
-  .
-  (_
-    [
-      (object_pattern
-        "," @_start
-        .
-        (_) @parameter.inner)
-      (array_pattern
-        "," @_start
-        .
-        (_) @parameter.inner)
-    ])
-  (#make-range! "parameter.outer" @_start @parameter.inner))
-
-(formal_parameters
-  .
-  (_
-    [
-      (object_pattern
-        .
-        (_) @parameter.inner
-        .
-        ","? @_end)
-      (array_pattern
-        .
-        (_) @parameter.inner
-        .
-        ","? @_end)
-    ])
-  (#make-range! "parameter.outer" @parameter.inner @_end))
-
 ; arguments
 (arguments
   "," @_start
@@ -239,9 +231,10 @@
 ; number
 (number) @number.inner
 
-(variable_declarator
-  name: (_) @assignment.lhs
-  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
+(lexical_declaration
+  (variable_declarator
+    name: (_) @assignment.lhs
+    value: (_) @assignment.inner @assignment.rhs)) @assignment.outer
 
 (variable_declarator
   name: (_) @assignment.inner)
@@ -250,3 +243,133 @@
   (pair
     key: (_) @assignment.lhs
     value: (_) @assignment.inner @assignment.rhs) @assignment.outer)
+
+(return_statement
+  (_) @return.inner) @return.outer
+
+(return_statement) @statement.outer
+
+[
+  (if_statement)
+  (expression_statement)
+  (for_statement)
+  (while_statement)
+  (do_statement)
+  (for_in_statement)
+  (export_statement)
+  (lexical_declaration)
+] @statement.outer
+
+; 1.  default import
+(import_statement
+  (import_clause
+    (identifier) @parameter.inner @parameter.outer))
+
+; 2.  namespace import  e.g. `* as React`
+(import_statement
+  (import_clause
+    (namespace_import
+      (identifier) @parameter.inner) @parameter.outer))
+
+; 3.  named import  e.g. `import { Bar, Baz } from ...`
+(import_statement
+  (import_clause
+    (named_imports
+      (import_specifier) @parameter.inner)))
+
+; 3‑A.  named import followed by a comma
+((import_statement
+  (import_clause
+    (named_imports
+      (import_specifier) @_start
+      .
+      "," @_end)))
+  (#make-range! "parameter.outer" @_start @_end))
+
+; 3‑B.  comma followed by named import
+((import_statement
+  (import_clause
+    (named_imports
+      "," @_start
+      .
+      (import_specifier) @_end)))
+  (#make-range! "parameter.outer" @_start @_end))
+
+; 3-C.  only one named import without a comma
+(import_statement
+  (import_clause
+    (named_imports
+      .
+      (import_specifier) @parameter.outer .)))
+
+; Treat list or object elements as @parameter
+; 1. parameter.inner
+(object
+  (_) @parameter.inner)
+
+(array
+  (_) @parameter.inner)
+
+(object_pattern
+  (_) @parameter.inner)
+
+(array_pattern
+  (_) @parameter.inner)
+
+; 2. parameter.outer: Only one element, no comma
+(object
+  .
+  (_) @parameter.outer .)
+
+(array
+  .
+  (_) @parameter.outer .)
+
+(object_pattern
+  .
+  (_) @parameter.outer .)
+
+(array_pattern
+  .
+  (_) @parameter.outer .)
+
+; 3. parameter.outer: Comma before or after
+([
+  (object
+    "," @_start
+    .
+    (_) @_end)
+  (array
+    "," @_start
+    .
+    (_) @_end)
+  (object_pattern
+    "," @_start
+    .
+    (_) @_end)
+  (array_pattern
+    "," @_start
+    .
+    (_) @_end)
+]
+  (#make-range! "parameter.outer" @_start @_end))
+
+([
+  (object
+    (_) @_start
+    .
+    "," @_end)
+  (array
+    (_) @_start
+    .
+    "," @_end)
+  (object_pattern
+    (_) @_start
+    .
+    "," @_end)
+  (array_pattern
+    (_) @_start
+    .
+    "," @_end)
+]
+  (#make-range! "parameter.outer" @_start @_end))