Merge pull request #76 from julienvincent/jv/ref-trztzlkssmsq

Add treesitter queries and tests for commonlisp

README.md

@@ -73,7 +73,7 @@ paredit.setup({
   -- for new filetypes.
   --
   -- Defaults to all supported filetypes.
-  filetypes = { "clojure", "fennel", "scheme" },
+  filetypes = { "clojure", "fennel", "scheme", "lisp" },
 
   -- This is some language specific configuration. Right now this is just used for
   -- setting character lists that are considered whitespace.
@@ -288,8 +288,13 @@ understand the AST.
 Right now `nvim-paredit` has built-in support for:
 
 - `clojure`
-- `fennel`
-- `scheme`
+- `fennel` *
+- `scheme` *
+- `commonlisp` *
+
+> [!NOTE]
+>
+> Items marked with `*` only have partial test coverage. Not all language syntax is guaranteed to work.
 
 Take a look at the [Language Queries Spec](./docs/language-queries.md) if you are wanting to add support for languages
 not built-in to nvim-paredit, or you want to develop on the existing queries.

lua/nvim-paredit/defaults.lua

@@ -119,7 +119,7 @@ M.defaults = {
     enabled = false,
     indentor = require("nvim-paredit.indentation.native").indentor,
   },
-  filetypes = { "clojure", "fennel", "scheme" },
+  filetypes = { "clojure", "fennel", "scheme", "lisp" },
   languages = {
     clojure = {
       whitespace_chars = { " ", "," },

lua/nvim-paredit/treesitter/forms.lua

@@ -94,7 +94,7 @@ end
 --   (list_lit
 --     (kw_lit)) @form.inner) @form.outer
 -- ```
--- 
+--
 -- Given the above AST we would want to extract the `list_lit` annotated in
 -- this example with @form.inner.
 function M.get_form_inner(form_node, opts)
@@ -140,6 +140,9 @@ local function get_last_anon_child_of_form_head(node)
       return current
     end
     local child = node:child(i)
+    if not child then
+      return
+    end
     if child:named() then
       return current
     end

queries/commonlisp/paredit/forms.scm

@@ -0,0 +1,13 @@
+;; We only consider a list_lit a form if it starts with a "(" anonymous node.
+;; Some constructs like `(defun)` or `(loop)` are constructed as:
+;;
+;; (list_lit
+;;   (defun ...))
+;;
+;; And in these cases we want to consider the `(defun)` the form inner and
+;; 'ignore' the `list_lit` node
+(list_lit
+  open: "(") @form
+
+(loop_macro) @form
+(defun) @form

tests/config.lua

@@ -11,6 +11,6 @@ vim.bo.swapfile = false
 
 require("nvim-treesitter.configs").setup({
   parser_install_dir = vim.fn.getcwd() .. "/.build/parsers",
-  ensure_installed = { "clojure", "fennel", "scheme" },
+  ensure_installed = { "clojure", "fennel", "scheme", "commonlisp" },
   sync_install = true,
 })