From fa04744c9a03468eda319d3e354fcd2210b856d9 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Wed, 3 Jun 2020 14:26:19 +0530 Subject: [PATCH] nvim: Enable purescript language server This does not perform any better than purs ide and psc-ide-vim could not jump to definitions in other components which is the same case here. But, at least we now need one less package and additional bindings for psc-ide-vim. Signed-off-by: Sanchayan Maity --- nvim/.config/nvim/after/ftplugin/purescript.vim | 13 ------------- nvim/.config/nvim/init.vim | 1 - nvim/.config/nvim/lua/lsp.lua | 2 +- nvim/.config/nvim/plugin_settings.vim | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/nvim/.config/nvim/after/ftplugin/purescript.vim b/nvim/.config/nvim/after/ftplugin/purescript.vim index ca27417..17d4593 100644 --- a/nvim/.config/nvim/after/ftplugin/purescript.vim +++ b/nvim/.config/nvim/after/ftplugin/purescript.vim @@ -1,15 +1,2 @@ setlocal textwidth=0 setlocal wrapmargin=0 - -nmap L :Plist -nmap l :Pload -nmap r :Prebuild -nmap f :PaddClause -nmap T :PaddType -nmap a :Papply -nmap c :Pcase -nmap i :Pimport -nmap q :PaddImportQualifications -nmap p :Pursuit -nmap gd :Pgoto -nmap K :Ptype diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index d90bd24..0f4bab7 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -73,7 +73,6 @@ Plug 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' } Plug 'rust-lang/rust.vim', { 'for': 'rust' } " Purescript Plug 'purescript-contrib/purescript-vim' -Plug 'frigoeu/psc-ide-vim' " Lisp Plug 'wlangstroth/vim-racket' Plug 'guns/vim-clojure-static' diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua index 2605564..2e6dc26 100644 --- a/nvim/.config/nvim/lua/lsp.lua +++ b/nvim/.config/nvim/lua/lsp.lua @@ -19,7 +19,7 @@ local on_attach = function(_, bufnr) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'rn', 'lua vim.lsp.buf.rename()', opts) end -local servers = { 'ghcide', 'rust_analyzer' } +local servers = { 'ghcide', 'purescriptls', 'rust_analyzer' } for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { on_attach = on_attach, diff --git a/nvim/.config/nvim/plugin_settings.vim b/nvim/.config/nvim/plugin_settings.vim index 78d9212..34a7d49 100644 --- a/nvim/.config/nvim/plugin_settings.vim +++ b/nvim/.config/nvim/plugin_settings.vim @@ -93,8 +93,8 @@ let g:completion_chain_complete_list = { \ {'mode': 'keyn'} \], \ 'purescript': [ + \ {'complete_items': ['lsp']}, \ {'mode': 'keyn'}, - \ {'mode': 'omni'}, \ {'mode': ''}, \ {'mode': ''} \],