From 2ac4fa5d183cb1969a41a2fdff9d101107ac9cf5 Mon Sep 17 00:00:00 2001 From: Garrett Hopper Date: Wed, 7 May 2025 23:32:25 -0500 Subject: [PATCH] Rename @indent.{open,close} to @indent.{open,close}_delimiter --- lua/nvim-treesitter/indent.lua | 8 ++++---- queries/clojure/indents.scm | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua index cd7abe632..d49a5b710 100644 --- a/lua/nvim-treesitter/indent.lua +++ b/lua/nvim-treesitter/indent.lua @@ -52,7 +52,7 @@ end ---Find opening/closing delimiter node inside indent.align node based on either: --- metadata string: (#set! indent.{open,close}_delimiter "{") ---- node capture: @indent.{open,close} +--- node capture: @indent.{open,close}_delimiter ---@param edge string "open" or "close" ---@param bufnr integer ---@param q table @@ -62,7 +62,7 @@ end local function find_delimiter(edge, bufnr, q, node) local delimiter = q["indent.align"][node:id()]["indent." .. edge .. "_delimiter"] for child, _ in node:iter_children() do - if child:type() == delimiter or q["indent." .. edge][child:id()] ~= nil then + if child:type() == delimiter or q["indent." .. edge .. "_delimiter"][child:id()] ~= nil then delimiter = delimiter or child:type() local linenr = child:start() local line = vim.api.nvim_buf_get_lines(bufnr, linenr, linenr + 1, false)[1] @@ -102,8 +102,8 @@ local get_indents = memoize(function(bufnr, root, lang) ["indent.ignore"] = {}, ["indent.align"] = {}, ["indent.zero"] = {}, - ["indent.open"] = {}, - ["indent.close"] = {}, + ["indent.open_delimiter"] = {}, + ["indent.close_delimiter"] = {}, } --TODO(clason): remove when dropping Nvim 0.8 compat diff --git a/queries/clojure/indents.scm b/queries/clojure/indents.scm index 8da347a44..c43359f72 100644 --- a/queries/clojure/indents.scm +++ b/queries/clojure/indents.scm @@ -2,29 +2,29 @@ ; Align lines within forms [ (list_lit - open: _ @indent.open - close: _ @indent.close) + open: _ @indent.open_delimiter + close: _ @indent.close_delimiter) (vec_lit - open: _ @indent.open - close: _ @indent.close) + open: _ @indent.open_delimiter + close: _ @indent.close_delimiter) (map_lit - open: _ @indent.open - close: _ @indent.close) + open: _ @indent.open_delimiter + close: _ @indent.close_delimiter) (ns_map_lit - open: _ @indent.open - close: _ @indent.close) + open: _ @indent.open_delimiter + close: _ @indent.close_delimiter) (set_lit - open: _ @indent.open - close: _ @indent.close) + open: _ @indent.open_delimiter + close: _ @indent.close_delimiter) (anon_fn_lit - open: _ @indent.open - close: _ @indent.close) + open: _ @indent.open_delimiter + close: _ @indent.close_delimiter) (read_cond_lit - open: _ @indent.open - close: _ @indent.close) + open: _ @indent.open_delimiter + close: _ @indent.close_delimiter) (splicing_read_cond_lit - open: _ @indent.open - close: _ @indent.close) + open: _ @indent.open_delimiter + close: _ @indent.close_delimiter) ] @indent.align ([