Skip to content

Commit 6093f55

Browse files
committed
Avoid pcall on vim.treesitter.language.add as it doesn't assert/error
1 parent 6770556 commit 6093f55

File tree

4 files changed

+49
-29
lines changed

4 files changed

+49
-29
lines changed

fnl/conjure/client/python/stdio.fnl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
(config.get-in [:mapping :prefix])
238238
(cfg [:mapping :stop]))]
239239
{:break? true})
240-
(if (not (pcall #(ts.add-language "python")))
240+
(if (not (ts.add-language "python"))
241241
(log.append [(.. M.comment-prefix "(error) The python client requires a python treesitter parser in order to function.")
242242
(.. M.comment-prefix "(error) See https://github.com/nvim-treesitter/nvim-treesitter")
243243
(.. M.comment-prefix "(error) for installation instructions.")])

fnl/conjure/tree-sitter.fnl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,11 @@
190190
node))))))
191191

192192
(fn add-language [lang]
193-
((or vim.treesitter.language.add
194-
vim.treesitter.language.require_language
195-
vim.treesitter.require_language)
196-
lang))
193+
(let [add (case vim.treesitter
194+
{:language {:add f}} f
195+
{:language {:require_language f}} (partial pcall f)
196+
{:require_language f} (partial pcall f))]
197+
(add lang)))
197198

198199
(fn get-root-node-for-str [lang code]
199200
(let [parser (vim.treesitter.get_string_parser code lang)]

lua/conjure/client/python/stdio.lua

Lines changed: 20 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lua/conjure/tree-sitter.lua

Lines changed: 23 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)