From d3775127f82ea30cde9cd8e2a2cd27d698a7c94d Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Tue, 20 Jun 2023 08:44:43 +0530 Subject: [PATCH] nvim: treesitter: Register haskell parser in ftplugin 4468c8b made PureScript use Haskell for treesitter queries. However, setting them up globally sometimes seems to result in Haskell files getting identified as PureScript and triggering a PureScript LSP server attach. At least that's what the behaviour seems like. To prevent this, register the usage of Haskell treesitter queries in ftplugin viz. when PureScript file type is detected. --- nvim/.config/nvim/after/ftplugin/purescript.lua | 3 +++ nvim/.config/nvim/lua/treesitter.lua | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nvim/.config/nvim/after/ftplugin/purescript.lua b/nvim/.config/nvim/after/ftplugin/purescript.lua index 13ee5c6..a7ad853 100644 --- a/nvim/.config/nvim/after/ftplugin/purescript.lua +++ b/nvim/.config/nvim/after/ftplugin/purescript.lua @@ -12,3 +12,6 @@ vim.api.nvim_create_autocmd({ "BufReadPre", "BufWinEnter" }, { vim.bo.buflisted = false end, }) + +-- Make PureScript use Haskell parser and queries. +vim.treesitter.language.register('haskell', 'purescript') diff --git a/nvim/.config/nvim/lua/treesitter.lua b/nvim/.config/nvim/lua/treesitter.lua index bedac39..da073dc 100644 --- a/nvim/.config/nvim/lua/treesitter.lua +++ b/nvim/.config/nvim/lua/treesitter.lua @@ -17,8 +17,5 @@ require'nvim-treesitter.configs'.setup { }, } --- Make PureScript use Haskell parser and queries. -vim.treesitter.language.register('haskell', 'purescript') - vim.keymap.set('o', 'm', ':lua require(\'tsht\').nodes()', { noremap=false, unique=true, silent=true }) vim.keymap.set('x', 'm', ':lua require(\'tsht\').nodes()' , { noremap=true , unique=true, silent=true })