From 5bba0b1789fe46127e53e3e57f820165199195ed Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Mon, 24 Apr 2023 18:51:35 +0530 Subject: [PATCH] Revert "nvim: after/ftplugin/cabal: Enable HLS on cabal files" This reverts commit 34a5bbdacbb5c5dbabe8674289020979b6300104. HLS complains a lot (forgot the error) when trying to edit cabal files making it almost unusable. It was nice to not require a separate plugin for formatting cabal files, but, since this is not usable, disable it. --- nvim/.config/nvim/after/ftplugin/cabal.lua | 4 ---- nvim/.config/nvim/lua/lsp-utils.lua | 7 +------ 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 nvim/.config/nvim/after/ftplugin/cabal.lua diff --git a/nvim/.config/nvim/after/ftplugin/cabal.lua b/nvim/.config/nvim/after/ftplugin/cabal.lua deleted file mode 100644 index d0573c7..0000000 --- a/nvim/.config/nvim/after/ftplugin/cabal.lua +++ /dev/null @@ -1,4 +0,0 @@ -local lsp_utils = require('lsp-utils') -local hls_config = lsp_utils.hls_config() - -vim.lsp.start(hls_config) diff --git a/nvim/.config/nvim/lua/lsp-utils.lua b/nvim/.config/nvim/lua/lsp-utils.lua index 72d9ddc..47dc9be 100644 --- a/nvim/.config/nvim/lua/lsp-utils.lua +++ b/nvim/.config/nvim/lua/lsp-utils.lua @@ -177,12 +177,7 @@ function M.hls_config() root_dir = root_directory, filetypes = { 'haskell' }, single_file_support = true, - settings = { - haskell = { - formattingProvider = 'ormolu' , - cabalFormattingProvider = 'cabalfmt', - } - }, + settings = { haskell = { formattingProvider = 'ormolu' } }, } end