(nvim) trailing whitespaces

nvim/lua/configs/haskell-tools.lua

@@ -0,0 +1,35 @@
+return function()
+  local ht = require('haskell-tools')
+  local def_opts = { noremap = true, silent = true, }
+
+  ht.start_or_attach {
+    hls = {
+      on_attach = function(_, bufnr)
+        local opts = vim.tbl_extend('keep', def_opts, { buffer = bufnr, })
+        -- haskell-language-server relies heavily on codeLenses,
+        -- so auto-refresh (see advanced configuration) is enabled by default
+        vim.keymap.set('n', '<space>ca', vim.lsp.codelens.run, opts)
+        vim.keymap.set('n', '<space>hs', ht.hoogle.hoogle_signature, opts)
+        vim.keymap.set('n', '<space>ea', ht.lsp.buf_eval_all, opts)
+      end,
+    },
+  }
+
+  -- Suggested keymaps that do not depend on haskell-language-server:
+  local bufnr = vim.api.nvim_get_current_buf()
+  -- set buffer = bufnr in ftplugin/haskell.lua
+  local opts = { noremap = true, silent = true, buffer = bufnr }
+
+  -- Toggle a GHCi repl for the current package
+  vim.keymap.set('n', '<leader>rr', ht.repl.toggle, opts)
+  -- Toggle a GHCi repl for the current buffer
+  vim.keymap.set('n', '<leader>rf', function()
+    ht.repl.toggle(vim.api.nvim_buf_get_name(0))
+  end, def_opts)
+  vim.keymap.set('n', '<leader>rq', ht.repl.quit, opts)
+
+  -- Detect nvim-dap launch configurations
+  -- (requires nvim-dap and haskell-debug-adapter)
+  -- ht.dap.discover_configurations(bufnr)
+end
+

nvim/lua/configs/lsp.lua

@@ -0,0 +1,41 @@
+return function()
+  -- Global mappings.
+  -- See `:help vim.diagnostic.*` for documentation on any of the below functions
+  vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
+  vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
+  vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
+  vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
+
+  -- Use LspAttach autocommand to only map the following keys
+  -- after the language server attaches to the current buffer
+  vim.api.nvim_create_autocmd('LspAttach', {
+    group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+    desc = "LSP actions",
+    callback = function(ev)
+      -- Enable completion triggered by <c-x><c-o>
+      vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
+
+      -- Buffer local mappings.
+      -- See `:help vim.lsp.*` for documentation on any of the below functions
+      local opts = { buffer = ev.buf }
+      vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+      vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+      vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+      vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+      vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+      vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
+      vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
+      vim.keymap.set('n', '<space>wl', function()
+        print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+      end, opts)
+      vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
+      vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
+      vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
+      vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+      vim.keymap.set('n', '<space>f', function()
+        vim.lsp.buf.format { async = true }
+      end, opts)
+    end,
+  })
+end
+

nvim/lua/global.lua

@@ -11,6 +11,18 @@ opt.expandtab = true
 -- Line numbers
 opt.number = true
 
+-- Helper punctuation
+vim.opt.list = true
+vim.opt.listchars = {
+  trail = '·',
+  nbsp = '␣',
+  tab = '→→',
+}
+
+-- Trailing whitespace
+vim.fn.matchadd("errorMsg", [[\s\+$]])
+vim.api.nvim_create_autocmd("BufWritePre", { command = [[%s/\s\+$//e]] })
+
 vim.filetype.add({
   extension = {
     mdx = "mdx",
@@ -18,17 +30,6 @@ vim.filetype.add({
   }
 })
 
--- LSP hotkeys
-local cmds_lsp = vim.api.nvim_create_augroup("cmds_lsp", { clear = true })
-vim.api.nvim_create_autocmd("LspAttach", {
-  group = cmds_lsp,
-  desc = "LSP actions",
-  callback = function()
-    local buf_opts = { noremap = true, silent = true, buffer = true }
-    vim.keymap.set('n', 'K', vim.lsp.buf.hover, buf_opts)
-    vim.keymap.set('n', "<space>rn", vim.lsp.buf.rename, buf_opts)
-  end
-})
 
 -- Workaround: https://github.com/neovim/neovim/issues/21856
 vim.api.nvim_create_autocmd({ "VimLeave" }, {

nvim/lua/plugins.lua

@@ -128,6 +128,7 @@ return {
     "neovim/nvim-lspconfig",
     -- TODO: config here
     -- https://github.com/neovim/nvim-lspconfig#suggested-configuration
+    config = require("configs/lsp"),
   },
 
   -- Snippet engine