From b2a699cc029f8d19cf116d44b6fce0670846c6c7 Mon Sep 17 00:00:00 2001 From: Dionisio E Alonso Date: Sat, 6 Jan 2024 17:34:43 -0300 Subject: [PATCH] feat(LSP): Move all server settings file into same directory Group all the files corresponding to servers' specific settings, to the same directory. --- .../server_settings/fortls.lua} | 0 .../server_settings/hls.lua} | 0 nvim/lua/lsp/server_settings/init.lua | 6 +++--- .../server_settings/pylsp.lua} | 14 +++++++------- .../workspace_sample/lsp-server-conf.lua | 0 5 files changed, 10 insertions(+), 10 deletions(-) rename nvim/lua/{fortran_lsp_server_options.lua => lsp/server_settings/fortls.lua} (100%) rename nvim/lua/{haskell_lsp_server_settings.lua => lsp/server_settings/hls.lua} (100%) rename nvim/lua/{python_lsp_server_settings.lua => lsp/server_settings/pylsp.lua} (77%) rename nvim/lua/{ => lsp/server_settings}/workspace_sample/lsp-server-conf.lua (100%) diff --git a/nvim/lua/fortran_lsp_server_options.lua b/nvim/lua/lsp/server_settings/fortls.lua similarity index 100% rename from nvim/lua/fortran_lsp_server_options.lua rename to nvim/lua/lsp/server_settings/fortls.lua diff --git a/nvim/lua/haskell_lsp_server_settings.lua b/nvim/lua/lsp/server_settings/hls.lua similarity index 100% rename from nvim/lua/haskell_lsp_server_settings.lua rename to nvim/lua/lsp/server_settings/hls.lua diff --git a/nvim/lua/lsp/server_settings/init.lua b/nvim/lua/lsp/server_settings/init.lua index 36bf67e..2f9d42a 100644 --- a/nvim/lua/lsp/server_settings/init.lua +++ b/nvim/lua/lsp/server_settings/init.lua @@ -1,7 +1,7 @@ local opts = {} -opts.pylsp = require("python_lsp_server_settings") -opts.hls = require("haskell_lsp_server_settings") -opts.fortls = require("fortran_lsp_server_options") +opts.pylsp = require("lsp.server_settings.pylsp") +opts.hls = require("lsp.server_settings.hls") +opts.fortls = require("lsp.server_settings.fortls") local workspace_conf_file = vim.fn.findfile(".nvim/lsp-server-conf.lua", ".;") if workspace_conf_file ~= "" then diff --git a/nvim/lua/python_lsp_server_settings.lua b/nvim/lua/lsp/server_settings/pylsp.lua similarity index 77% rename from nvim/lua/python_lsp_server_settings.lua rename to nvim/lua/lsp/server_settings/pylsp.lua index 48ef4e9..5393965 100644 --- a/nvim/lua/python_lsp_server_settings.lua +++ b/nvim/lua/lsp/server_settings/pylsp.lua @@ -1,5 +1,5 @@ local pylsp_settings = { - configurationSources = {"flake8", "pycodestyle"}, -- config files to read from, not plugins enabled + configurationSources = { "flake8", "pycodestyle" }, -- config files to read from, not plugins enabled plugins = { flake8 = { enabled = true, @@ -12,13 +12,13 @@ local pylsp_settings = { "--max-line-length=79", "--disable=missing-docstring,invalid-name,redefined-outer-name,logging-format-interpolation", "--disable=line-too-long,trailing-whitespace,trailing-newlines", -- Checked by flake8 - } + }, }, - pylsp_mypy = {enabled = true}, - pycodestyle = {enabled = false}, -- covered in flake8 - pyflakes = {enabled = false}, -- covered in flake8 - -- mccabe = {enabled = false}, -- not covered in flake8 by default; PyLSP doesn't handle the option - } + pylsp_mypy = { enabled = true }, + pycodestyle = { enabled = false }, -- covered in flake8 + pyflakes = { enabled = false }, -- covered in flake8 + -- mccabe = { enabled = false }, -- not covered in flake8 by default; PyLSP doesn't handle the option + }, } local venv_dir = vim.fn.finddir(".venv/", vim.fn.expand("%:p:h") .. ";") diff --git a/nvim/lua/workspace_sample/lsp-server-conf.lua b/nvim/lua/lsp/server_settings/workspace_sample/lsp-server-conf.lua similarity index 100% rename from nvim/lua/workspace_sample/lsp-server-conf.lua rename to nvim/lua/lsp/server_settings/workspace_sample/lsp-server-conf.lua