Skip to content

Commit 4662b30

Browse files
feat(clojure): update to use parpar-nvim (#1460)
* feat(clojure): update to use parpar nvim-treesitter-sexp fails on neovim 0.11 nvim-paredit is a replacement for nvim-treesitter-sexp parpar provides nvim-paredit and nvim-parinfer and ensure they work together * docs: revert back to owner/repo for clojure repl client link --------- Co-authored-by: Uzair Aftab <uzaaft@outlook.com>
1 parent d94c659 commit 4662b30

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

lua/astrocommunity/pack/clojure/README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ The Clojure language pack includes:
1616
- `clojure` treesitter parsers
1717
- [clojure-lsp](https://clojure-lsp.io/) language server
1818
- Clojure REPL client: [Olical/conjure](https://github.com/Olical/conjure)
19-
- Structural editing: [gpanders/nvim-parinfer](https://github.com/gpanders/nvim-parinfer) & [PaterJason/nvim-treesitter-sexp](https://github.com/PaterJason/nvim-treesitter-sexp)
20-
21-
> NOTE: Conjure is available as a [code-runner](https://github.com/AstroNvim/astrocommunity/tree/main/lua/astrocommunity/code-runner) plugin config. nvim-treesitter-sexp and nvim-parinfer are available as [editing-support plugin configurations](https://github.com/AstroNvim/astrocommunity/tree/main/lua/astrocommunity/editing-support)
22-
23-
> NOTE: nvim-treesitter-sexp plugin disabled for Neovim 0.11 (treesitter breaking changes)
19+
- Structural editing: [parpar-nvim](https://github.com/dundalek/parpar.nvim) which provides both [nvim-parinfer](https://github.com/gpanders/nvim-parinfer) & [nvim-paredit](https://github.com/julienvincent/nvim-paredit)
2420

21+
> NOTE: Conjure is available as a [code-runner](https://github.com/AstroNvim/astrocommunity/tree/main/lua/astrocommunity/code-runner) plugin config. nvim-paredit and nvim-parinfer are available as [editing-support plugin configurations](https://github.com/AstroNvim/astrocommunity/tree/main/lua/astrocommunity/editing-support)
2522
2623
## Clojure Guides
2724

@@ -31,7 +28,6 @@ The Clojure language pack includes:
3128
- [Conjure - Clojure guide](https://github.com/Olical/conjure/wiki/Quick-start:-Clojure)
3229
- [Practicalli Neovim](https://practical.li/neovim/) Clojure development workflow and examples of [configuring Astrocommunity clojure pack](https://practical.li/neovim/configuration/astronvim/astrocommunity/)
3330

34-
3531
## Override Configuration
3632

3733
Plugins in the language pack can be disabled and default options overridden.
@@ -41,6 +37,7 @@ Example: Include the Clojure language pack and disable the parinfer plugin by se
4137
```lua
4238
{ import = "astrocommunity.pack.clojure" },
4339
{ "gpanders/nvim-parinfer", enabled = false },
40+
{ "julienvincent/nvim-paredit", enabled = false },
4441
```
4542

4643
Example: Change the test runner used by Conjure. `clojure.test` runner is used by default

lua/astrocommunity/pack/clojure/init.lua

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
--
44
-- clojure-lsp server via mason
55
-- treesitter clojure parser
6-
-- ts-comment.nvim with `;;` and `;` support
7-
-- structured editing with parinfer and treesitter-sexp plugins
8-
-- REPL connected editor with Conjure plugin (log HUD hidden by default)
6+
-- treesitter comments with `;;` and `;` support
7+
-- structured editing with parinfer and paredit plugins
8+
-- REPL connected editor with Conjure plugin
99
-- ------------------------------------------
1010

1111
local plugins = {
@@ -38,11 +38,8 @@ local plugins = {
3838
-- Conjure plugin for Clojure REPL
3939
{ import = "astrocommunity.code-runner.conjure" },
4040

41-
-- Parinfer parens management for Clojure
42-
{ import = "astrocommunity.editing-support.nvim-parinfer" },
43-
44-
-- Treesitter structural editing
45-
{ import = "astrocommunity.editing-support.nvim-treesitter-sexp" },
41+
-- Parinfer & Paredit structural editing for Lisp dialects
42+
{ import = "astrocommunity.editing-support.parpar-nvim" },
4643

4744
-- Better treesitter comments
4845
{ import = "astrocommunity.comment.ts-comments-nvim" },

0 commit comments

Comments
 (0)