diff options
Diffstat (limited to 'ftplugin')
| -rw-r--r-- | ftplugin/c.lua | 44 | ||||
| -rw-r--r-- | ftplugin/cmake.lua | 13 | ||||
| -rw-r--r-- | ftplugin/cs.lua | 14 | ||||
| -rw-r--r-- | ftplugin/css.lua | 53 | ||||
| -rw-r--r-- | ftplugin/dart.lua | 33 | ||||
| -rw-r--r-- | ftplugin/dockerfile.lua | 14 | ||||
| -rw-r--r-- | ftplugin/elixir.lua | 33 | ||||
| -rw-r--r-- | ftplugin/elm.lua | 17 | ||||
| -rw-r--r-- | ftplugin/euphoria3.lua | 19 | ||||
| -rw-r--r-- | ftplugin/go.lua | 33 | ||||
| -rw-r--r-- | ftplugin/graphql.lua | 10 | ||||
| -rw-r--r-- | ftplugin/html.lua | 21 | ||||
| -rw-r--r-- | ftplugin/java.lua | 100 | ||||
| -rw-r--r-- | ftplugin/json.lua | 39 | ||||
| -rw-r--r-- | ftplugin/kotlin.lua | 42 | ||||
| -rw-r--r-- | ftplugin/lua.lua | 51 | ||||
| -rw-r--r-- | ftplugin/php.lua | 45 | ||||
| -rw-r--r-- | ftplugin/ruby.lua | 36 | ||||
| -rw-r--r-- | ftplugin/rust.lua | 115 | ||||
| -rw-r--r-- | ftplugin/sh.lua | 56 | ||||
| -rw-r--r-- | ftplugin/tex.lua | 101 | ||||
| -rw-r--r-- | ftplugin/tf.lua | 29 | ||||
| -rw-r--r-- | ftplugin/vim.lua | 13 | 
23 files changed, 92 insertions, 839 deletions
| diff --git a/ftplugin/c.lua b/ftplugin/c.lua index bcfb8242..1cc0bdb0 100644 --- a/ftplugin/c.lua +++ b/ftplugin/c.lua @@ -1,40 +1,4 @@ -O.formatters.filetype["c"] = { -  function() -    return { -      exe = O.lang.clang.formatter.exe, -      args = O.lang.clang.formatter.args, -      stdin = not (O.lang.clang.formatter.stdin ~= nil), -    } -  end, -} -O.formatters.filetype["cpp"] = O.formatters.filetype["c"] - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} - -if require("lv-utils").check_lsp_client_active "clangd" then -  return -end - -local clangd_flags = { "--background-index" } - -if O.lang.clang.cross_file_rename then -  table.insert(clangd_flags, "--cross-file-rename") -end - -table.insert(clangd_flags, "--header-insertion=" .. O.lang.clang.header_insertion) - -require("lspconfig").clangd.setup { -  cmd = { DATA_PATH .. "/lspinstall/cpp/clangd/bin/clangd", unpack(clangd_flags) }, -  on_attach = require("lsp").common_on_attach, -  handlers = { -    ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { -      virtual_text = O.lang.clang.diagnostics.virtual_text, -      signs = O.lang.clang.diagnostics.signs, -      underline = O.lang.clang.diagnostics.underline, -      update_in_insert = true, -    }), -  }, -} +require("lang.c").format() +require("lang.c").lint() +require("lang.c").lsp() +require("lang.c").dap() diff --git a/ftplugin/cmake.lua b/ftplugin/cmake.lua index 35369a15..8d50c595 100644 --- a/ftplugin/cmake.lua +++ b/ftplugin/cmake.lua @@ -1,9 +1,4 @@ -if require("lv-utils").check_lsp_client_active "cmake" then -  return -end - -require("lspconfig").cmake.setup { -  cmd = { DATA_PATH .. "/lspinstall/cmake/venv/bin/cmake-language-server" }, -  on_attach = require("lsp").common_on_attach, -  filetypes = { "cmake" }, -} +require("lang.cmake").format() +require("lang.cmake").lint() +require("lang.cmake").lsp() +require("lang.cmake").dap() diff --git a/ftplugin/cs.lua b/ftplugin/cs.lua index e0a0f62a..cf2e31c6 100644 --- a/ftplugin/cs.lua +++ b/ftplugin/cs.lua @@ -1,10 +1,4 @@ -if require("lv-utils").check_lsp_client_active "omnisharp" then -  return -end - --- C# language server (csharp/OmniSharp) setup -require("lspconfig").omnisharp.setup { -  on_attach = require("lsp").common_on_attach, -  root_dir = require("lspconfig").util.root_pattern(".sln", ".git"), -  cmd = { DATA_PATH .. "/lspinstall/csharp/omnisharp/run", "--languageserver", "--hostPID", tostring(vim.fn.getpid()) }, -} +require("lang.cs").format() +require("lang.cs").lint() +require("lang.cs").lsp() +require("lang.cs").dap() diff --git a/ftplugin/css.lua b/ftplugin/css.lua index 810ea421..846c6a83 100644 --- a/ftplugin/css.lua +++ b/ftplugin/css.lua @@ -1,49 +1,4 @@ -vim.cmd "let proj = FindRootDirectory()" -local root_dir = vim.api.nvim_get_var "proj" - --- use the global prettier if you didn't find the local one -local prettier_instance = root_dir .. "/node_modules/.bin/prettier" -if vim.fn.executable(prettier_instance) ~= 1 then -  prettier_instance = O.lang.tsserver.formatter.exe -end - -local ft = vim.bo.filetype -O.formatters.filetype[ft]= { -  function() -    local args = { "--stdin-filepath", vim.fn.fnameescape(vim.api.nvim_buf_get_name(0)) } -    -- TODO: O.lang.[ft].formatter.args -    local extend_args = O.lang.css.formatter.args - -    for i = 1, #extend_args do -      table.insert(args, extend_args[i]) -    end - -    return { -      exe = prettier_instance, -      args = args, -      stdin = true -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} - -if not require("lv-utils").check_lsp_client_active "cssls" then -  local capabilities = vim.lsp.protocol.make_client_capabilities() -  capabilities.textDocument.completion.completionItem.snippetSupport = true -  -- npm install -g vscode-css-languageserver-bin -  require("lspconfig").cssls.setup { -    cmd = { -      "node", -      DATA_PATH .. "/lspinstall/css/vscode-css/css-language-features/server/dist/node/cssServerMain.js", -      "--stdio", -    }, -    on_attach = require("lsp").common_on_attach, -    capabilities = capabilities, -  } -end - -vim.cmd "setl ts=2 sw=2" +require("lang.css").format() +require("lang.css").lint() +require("lang.css").lsp() +require("lang.css").dap() diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua index f9b68e9d..1db4fe05 100644 --- a/ftplugin/dart.lua +++ b/ftplugin/dart.lua @@ -1,29 +1,4 @@ -O.formatters.filetype["dart"] = { -  function() -    return { -      exe = O.lang.dart.formatter.exe, -      args = O.lang.dart.formatter.args, -      stdin = not (O.lang.dart.formatter.stdin ~= nil), -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} -if require("lv-utils").check_lsp_client_active "dartls" then -  return -end - -require("lspconfig").dartls.setup { -  cmd = { "dart", O.lang.dart.sdk_path, "--lsp" }, -  on_attach = require("lsp").common_on_attach, -  init_options = { -    closingLabels = false, -    flutterOutline = false, -    onlyAnalyzeProjectsWithOpenFiles = false, -    outline = false, -    suggestFromUnimportedLibraries = true, -  }, -} +require("lang.dart").format() +require("lang.dart").lint() +require("lang.dart").lsp() +require("lang.dart").dap() diff --git a/ftplugin/dockerfile.lua b/ftplugin/dockerfile.lua index e0fa97af..8a43c764 100644 --- a/ftplugin/dockerfile.lua +++ b/ftplugin/dockerfile.lua @@ -1,10 +1,4 @@ -if require("lv-utils").check_lsp_client_active "dockerls" then -  return -end - --- npm install -g dockerfile-language-server-nodejs -require("lspconfig").dockerls.setup { -  cmd = { DATA_PATH .. "/lspinstall/dockerfile/node_modules/.bin/docker-langserver", "--stdio" }, -  on_attach = require("lsp").common_on_attach, -  root_dir = vim.loop.cwd, -} +require("lang.dockerfile").format() +require("lang.dockerfile").lint() +require("lang.dockerfile").lsp() +require("lang.dockerfile").dap() diff --git a/ftplugin/elixir.lua b/ftplugin/elixir.lua index 4d6a3e6d..07b9625b 100644 --- a/ftplugin/elixir.lua +++ b/ftplugin/elixir.lua @@ -1,29 +1,4 @@ -if require("lv-utils").check_lsp_client_active "elixirls" then -  return -end - -O.formatters.filetype["elixir"] = { -  function() -    return { -      exe = O.lang.elixir.formatter.exe, -      args = O.lang.elixir.formatter.args, -      stdin = not (O.lang.elixir.formatter.stdin ~= nil), -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} - -require("lspconfig").elixirls.setup { -  cmd = { DATA_PATH .. "/lspinstall/elixir/elixir-ls/language_server.sh" }, -} - --- needed for the LSP to recognize elixir files (alternativly just use elixir-editors/vim-elixir) --- vim.cmd([[ ---   au BufRead,BufNewFile *.ex,*.exs set filetype=elixir ---   au BufRead,BufNewFile *.eex,*.leex,*.sface set filetype=eelixir ---   au BufRead,BufNewFile mix.lock set filetype=elixir --- ]]) +require("lang.elixir").format() +require("lang.elixir").lint() +require("lang.elixir").lsp() +require("lang.elixir").dap() diff --git a/ftplugin/elm.lua b/ftplugin/elm.lua index d1d6ee12..0868b9db 100644 --- a/ftplugin/elm.lua +++ b/ftplugin/elm.lua @@ -1,13 +1,4 @@ -if require("lv-utils").check_lsp_client_active "elmls" then -  return -end - -require("lspconfig").elmls.setup { -  cmd = { DATA_PATH .. "/lspinstall/elm/node_modules/.bin/elm-language-server" }, -  init_options = { -    elmAnalyseTrigger = "change", -    elmFormatPath = DATA_PATH .. "/lspinstall/elm/node_modules/.bin/elm-format", -    elmPath = DATA_PATH .. "/lspinstall/elm/node_modules/.bin/elm", -    elmTestPath = DATA_PATH .. "/lspinstall/elm/node_modules/.bin/elm-test", -  }, -} +require("lang.elm").format() +require("lang.elm").lint() +require("lang.elm").lsp() +require("lang.elm").dap() diff --git a/ftplugin/euphoria3.lua b/ftplugin/euphoria3.lua index b59a265a..67da6c48 100644 --- a/ftplugin/euphoria3.lua +++ b/ftplugin/euphoria3.lua @@ -1,15 +1,4 @@ -if require("lv-utils").check_lsp_client_active "elixirls" then -  return -end - --- TODO: Remove this at some point -require("lspconfig").elixirls.setup { -  cmd = { DATA_PATH .. "/lspinstall/elixir/elixir-ls/language_server.sh" }, -} - --- needed for the LSP to recognize elixir files (alternativly just use elixir-editors/vim-elixir) --- vim.cmd([[ ---   au BufRead,BufNewFile *.ex,*.exs set filetype=elixir ---   au BufRead,BufNewFile *.eex,*.leex,*.sface set filetype=eelixir ---   au BufRead,BufNewFile mix.lock set filetype=elixir --- ]]) +require("lang.euphoria3").format() +require("lang.euphoria3").lint() +require("lang.euphoria3").lsp() +require("lang.euphoria3").dap() diff --git a/ftplugin/go.lua b/ftplugin/go.lua index 47de932f..e5b8475f 100644 --- a/ftplugin/go.lua +++ b/ftplugin/go.lua @@ -1,29 +1,4 @@ -O.formatters.filetype["go"] = { -  function() -    return { -      exe = O.lang.go.formatter.exe, -      args = O.lang.go.formatter.args, -      stdin = not (O.lang.go.formatter.stdin ~= nil), -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} - -if not require("lv-utils").check_lsp_client_active "gopls" then -  require("lspconfig").gopls.setup { -    cmd = { DATA_PATH .. "/lspinstall/go/gopls" }, -    settings = { gopls = { analyses = { unusedparams = true }, staticcheck = true } }, -    root_dir = require("lspconfig").util.root_pattern(".git", "go.mod"), -    init_options = { usePlaceholders = true, completeUnimported = true }, -    on_attach = require("lsp").common_on_attach, -  } -end - -vim.opt_local.tabstop = 4 -vim.opt_local.shiftwidth = 4 -vim.opt_local.softtabstop = 4 -vim.opt_local.expandtab = false +require("lang.go").format() +require("lang.go").lint() +require("lang.go").lsp() +require("lang.go").dap() diff --git a/ftplugin/graphql.lua b/ftplugin/graphql.lua index c9ce5437..30bddcc4 100644 --- a/ftplugin/graphql.lua +++ b/ftplugin/graphql.lua @@ -1,6 +1,4 @@ -if require("lv-utils").check_lsp_client_active "graphql" then -  return -end - --- npm install -g graphql-language-service-cli -require("lspconfig").graphql.setup { on_attach = require("lsp").common_on_attach } +require("lang.graphql").format() +require("lang.graphql").lint() +require("lang.graphql").lsp() +require("lang.graphql").dap() diff --git a/ftplugin/html.lua b/ftplugin/html.lua index fa60e0a6..70c3295a 100644 --- a/ftplugin/html.lua +++ b/ftplugin/html.lua @@ -1,17 +1,4 @@ -if not require("lv-utils").check_lsp_client_active "html" then -  -- npm install -g vscode-html-languageserver-bin -  local capabilities = vim.lsp.protocol.make_client_capabilities() -  capabilities.textDocument.completion.completionItem.snippetSupport = true - -  require("lspconfig").html.setup { -    cmd = { -      "node", -      DATA_PATH .. "/lspinstall/html/vscode-html/html-language-features/server/dist/node/htmlServerMain.js", -      "--stdio", -    }, -    on_attach = require("lsp").common_on_attach, -    capabilities = capabilities, -  } -end - -vim.cmd "setl ts=2 sw=2" +require("lang.html").format() +require("lang.html").lint() +require("lang.html").lsp() +require("lang.html").dap() diff --git a/ftplugin/java.lua b/ftplugin/java.lua index 7db90f0e..898cf8af 100644 --- a/ftplugin/java.lua +++ b/ftplugin/java.lua @@ -1,96 +1,4 @@ -vim.cmd "let proj = FindRootDirectory()" -local root_dir = vim.api.nvim_get_var "proj" - --- use the global prettier if you didn't find the local one -local prettier_instance = root_dir .. "/node_modules/.bin/prettier" -if vim.fn.executable(prettier_instance) ~= 1 then -  prettier_instance = O.lang.tsserver.formatter.exe -end - -O.formatters.filetype["java"] = { -  function() -    return { -      exe = prettier_instance, -      -- TODO: allow user to override this -      args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) }, -      stdin = true, -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} - -if require("lv-utils").check_lsp_client_active "jdtls" then -  return -end - -if O.lang.java.java_tools.active then -  -- find_root looks for parent directories relative to the current buffer containing one of the given arguments. -  if vim.fn.has "mac" == 1 then -    WORKSPACE_PATH = "/Users/" .. USER .. "/workspace/" -  elseif vim.fn.has "unix" == 1 then -    WORKSPACE_PATH = "/home/" .. USER .. "/workspace/" -  else -    print "Unsupported system" -  end -  JAVA_LS_EXECUTABLE = CONFIG_PATH .. "/utils/bin/jdtls" - -  require("jdtls").start_or_attach { -    on_attach = require("lsp").common_on_attach, -    cmd = { JAVA_LS_EXECUTABLE, WORKSPACE_PATH .. vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") }, -  } - -  vim.api.nvim_set_keymap( -    "n", -    "<leader>la", -    ":lua require('jdtls').code_action()<CR>", -    { noremap = true, silent = true } -  ) -  vim.api.nvim_set_keymap( -    "n", -    "<leader>lR", -    ":lua require('jdtls').code_action(false, 'refactor')<CR>", -    { noremap = true, silent = true } -  ) - -  vim.cmd "command! -buffer JdtCompile lua require('jdtls').compile()" -  vim.cmd "command! -buffer JdtUpdateConfig lua require('jdtls').update_project_config()" -  -- vim.cmd "command! -buffer JdtJol lua require('jdtls').jol()" -  vim.cmd "command! -buffer JdtBytecode lua require('jdtls').javap()" -  -- vim.cmd "command! -buffer JdtJshell lua require('jdtls').jshell()" -else -  local util = require "lspconfig/util" - -  require("lspconfig").jdtls.setup { -    on_attach = require("lsp").common_on_attach, -    cmd = { DATA_PATH .. "/lspinstall/java/jdtls.sh" }, -    filetypes = { "java" }, -    root_dir = util.root_pattern { ".git", "build.gradle", "pom.xml" }, -    -- init_options = {bundles = bundles} -    -- on_attach = require'lsp'.common_on_attach -  } -end - --- local bundles = { ---     vim.fn.glob( ---         CONFIG_PATH.."/.debuggers/java-debug/com.microsoft.java.debug.plugin/target/com.microsoft.java.debug.plugin-*.jar") --- }; - --- require('jdtls').start_or_attach({ ---     on_attach = on_attach, ---     cmd = {DATA_PATH .. "/lspinstall/java/jdtls.sh"}, ---     root_dir = require('jdtls.setup').find_root({'build.gradle', 'pom.xml', '.git'}), ---     init_options = {bundles = bundles} --- }) - --- TODO: setup autoformat stuff later --- _java = { ---     -- {'FileType', 'java', 'luafile '..CONFIG_PATH..'/lua/lsp/java-ls.lua'}, ---     { ---         'FileType', 'java', ---         'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>' ---     } --- } +require("lang.java").format() +require("lang.java").lint() +require("lang.java").lsp() +require("lang.java").dap() diff --git a/ftplugin/json.lua b/ftplugin/json.lua index cb73995c..0408f9b5 100644 --- a/ftplugin/json.lua +++ b/ftplugin/json.lua @@ -1,35 +1,4 @@ -O.formatters.filetype["json"] = { -  function() -    return { -      exe = O.lang.json.formatter.exe, -      args = O.lang.json.formatter.args, -      stdin = not (O.lang.json.formatter.stdin ~= nil), -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} -if require("lv-utils").check_lsp_client_active "jsonls" then -  return -end - --- npm install -g vscode-json-languageserver -require("lspconfig").jsonls.setup { -  cmd = { -    "node", -    DATA_PATH .. "/lspinstall/json/vscode-json/json-language-features/server/dist/node/jsonServerMain.js", -    "--stdio", -  }, -  on_attach = require("lsp").common_on_attach, - -  commands = { -    Format = { -      function() -        vim.lsp.buf.range_formatting({}, { 0, 0 }, { vim.fn.line "$", 0 }) -      end, -    }, -  }, -} +require("lang.json").format() +require("lang.json").lint() +require("lang.json").lsp() +require("lang.json").dap() diff --git a/ftplugin/kotlin.lua b/ftplugin/kotlin.lua index 8d034e6f..2677c287 100644 --- a/ftplugin/kotlin.lua +++ b/ftplugin/kotlin.lua @@ -1,38 +1,4 @@ -if require("lv-utils").check_lsp_client_active "kotlin_language_server" then -  return -end - ---- default config for gradle-projects of the ---- kotlin-language-server: https://github.com/fwcd/kotlin-language-server ---- ---- This server requires vim to be aware of the kotlin-filetype. ---- You could refer for this capability to: ---- 	https://github.com/udalov/kotlin-vim (recommended) ---- 	Note that there is no LICENSE specified yet. - -local util = require "lspconfig/util" - -local bin_name = DATA_PATH .. "/lspinstall/kotlin/server/bin/kotlin-language-server" -if vim.fn.has "win32" == 1 then -  bin_name = bin_name .. ".bat" -end - -local root_files = { -  "settings.gradle", -- Gradle (multi-project) -  "settings.gradle.kts", -- Gradle (multi-project) -  "build.xml", -- Ant -  "pom.xml", -- Maven -} - -local fallback_root_files = { -  "build.gradle", -- Gradle -  "build.gradle.kts", -- Gradle -} - -require("lspconfig").kotlin_language_server.setup { -  cmd = { bin_name }, -  on_attach = require("lsp").common_on_attach, -  root_dir = function(fname) -    return util.root_pattern(unpack(root_files))(fname) or util.root_pattern(unpack(fallback_root_files))(fname) -  end, -} +require("lang.kotlin").format() +require("lang.kotlin").lint() +require("lang.kotlin").lsp() +require("lang.kotlin").dap() diff --git a/ftplugin/lua.lua b/ftplugin/lua.lua index eb7b9944..37ebab42 100644 --- a/ftplugin/lua.lua +++ b/ftplugin/lua.lua @@ -1,47 +1,4 @@ -O.formatters.filetype["lua"] = { -  function() -    return { -      exe = O.lang.lua.formatter.exe, -      args = O.lang.lua.formatter.args, -      stdin = not (O.lang.lua.formatter.stdin ~= nil), -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} -if not require("lv-utils").check_lsp_client_active "sumneko_lua" then -  -- https://github.com/sumneko/lua-language-server/wiki/Build-and-Run-(Standalone) -  local sumneko_root_path = DATA_PATH .. "/lspinstall/lua" -  local sumneko_binary = sumneko_root_path .. "/sumneko-lua-language-server" - -  require("lspconfig").sumneko_lua.setup { -    cmd = { sumneko_binary, "-E", sumneko_root_path .. "/main.lua" }, -    on_attach = require("lsp").common_on_attach, -    settings = { -      Lua = { -        runtime = { -          -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) -          version = "LuaJIT", -          -- Setup your lua path -          path = vim.split(package.path, ";"), -        }, -        diagnostics = { -          -- Get the language server to recognize the `vim` global -          globals = { "vim" }, -        }, -        workspace = { -          -- Make the server aware of Neovim runtime files -          library = { -            [vim.fn.expand "$VIMRUNTIME/lua"] = true, -            [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true, -          }, -          maxPreload = 100000, -          preloadFileSize = 1000, -        }, -      }, -    }, -  } -end +require("lang.lua").format() +require("lang.lua").lint() +require("lang.lua").lsp() +require("lang.lua").dap() diff --git a/ftplugin/php.lua b/ftplugin/php.lua index 054dff79..c319ea67 100644 --- a/ftplugin/php.lua +++ b/ftplugin/php.lua @@ -1,41 +1,4 @@ -O.formatters.filetype["php"] = { -  function() -    return { -      exe = O.lang.php.formatter.exe, -      args = O.lang.php.formatter.args, -      stdin = not (O.lang.php.formatter.stdin ~= nil), -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} -if require("lv-utils").check_lsp_client_active "intelephense" then -  return -end - -require("lspconfig").intelephense.setup { -  cmd = { DATA_PATH .. "/lspinstall/php/node_modules/.bin/intelephense", "--stdio" }, -  on_attach = require("lsp").common_on_attach, -  handlers = { -    ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { -      virtual_text = O.lang.php.diagnostics.virtual_text, -      signs = O.lang.php.diagnostics.signs, -      underline = O.lang.php.diagnostics.underline, -      update_in_insert = true, -    }), -  }, -  filetypes = O.lang.php.filetypes, -  settings = { -    intelephense = { -      format = { -        braces = O.lang.php.format.braces, -      }, -      environment = { -        phpVersion = O.lang.php.environment.php_version, -      }, -    }, -  }, -} +require("lang.php").format() +require("lang.php").lint() +require("lang.php").lsp() +require("lang.php").dap() diff --git a/ftplugin/ruby.lua b/ftplugin/ruby.lua index ff7e7c8b..6022504c 100644 --- a/ftplugin/ruby.lua +++ b/ftplugin/ruby.lua @@ -1,32 +1,4 @@ -O.formatters.filetype["ruby"] = { -  function() -    return { -      exe = O.lang.ruby.formatter.exe, -      args = O.lang.ruby.formatter.args, -      stdin = not (O.lang.ruby.formatter.stdin ~= nil), -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} -if require("lv-utils").check_lsp_client_active "solargraph" then -  return -end - --- If you are using rvm, make sure to change below configuration -require("lspconfig").solargraph.setup { -  cmd = { DATA_PATH .. "/lspinstall/ruby/solargraph/solargraph", "stdio" }, -  on_attach = require("lsp").common_on_attach, -  handlers = { -    ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { -      virtual_text = O.lang.ruby.diagnostics.virtual_text, -      signs = O.lang.ruby.diagnostics.signs, -      underline = O.lang.ruby.diagnostics.underline, -      update_in_insert = true, -    }), -  }, -  filetypes = O.lang.ruby.filetypes, -} +require("lang.ruby").format() +require("lang.ruby").lint() +require("lang.ruby").lsp() +require("lang.ruby").dap() diff --git a/ftplugin/rust.lua b/ftplugin/rust.lua index e7103fd1..74728407 100644 --- a/ftplugin/rust.lua +++ b/ftplugin/rust.lua @@ -1,111 +1,4 @@ -O.formatters.filetype["rust"] = { -  function() -    return { -      exe = O.lang.rust.formatter.exe, -      args = O.lang.rust.formatter.args, -      stdin = not (O.lang.rust.formatter.stdin ~= nil), -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} -if require("lv-utils").check_lsp_client_active "rust_analyzer" then -  return -end - -if O.lang.rust.rust_tools.active then -  local opts = { -    tools = { -- rust-tools options -      -- automatically set inlay hints (type hints) -      -- There is an issue due to which the hints are not applied on the first -      -- opened file. For now, write to the file to trigger a reapplication of -      -- the hints or just run :RustSetInlayHints. -      -- default: true -      autoSetHints = true, - -      -- whether to show hover actions inside the hover window -      -- this overrides the default hover handler -      -- default: true -      hover_with_actions = true, - -      runnables = { -        -- whether to use telescope for selection menu or not -        -- default: true -        use_telescope = true, - -        -- rest of the opts are forwarded to telescope -      }, - -      inlay_hints = { -        -- wheter to show parameter hints with the inlay hints or not -        -- default: true -        show_parameter_hints = true, - -        -- prefix for parameter hints -        -- default: "<-" -        parameter_hints_prefix = O.lang.rust.rust_tools.parameter_hints_prefix, - -        -- prefix for all the other hints (type, chaining) -        -- default: "=>" -        other_hints_prefix = O.lang.rust.rust_tools.other_hints_prefix, - -        -- whether to align to the lenght of the longest line in the file -        max_len_align = false, - -        -- padding from the left if max_len_align is true -        max_len_align_padding = 1, - -        -- whether to align to the extreme right or not -        right_align = false, - -        -- padding from the right if right_align is true -        right_align_padding = 7, -      }, - -      hover_actions = { -        -- the border that is used for the hover window -        -- see vim.api.nvim_open_win() -        border = { -          { "â•", "FloatBorder" }, -          { "─", "FloatBorder" }, -          { "â•®", "FloatBorder" }, -          { "│", "FloatBorder" }, -          { "╯", "FloatBorder" }, -          { "─", "FloatBorder" }, -          { "â•°", "FloatBorder" }, -          { "│", "FloatBorder" }, -        }, -      }, -    }, - -    -- all the opts to send to nvim-lspconfig -    -- these override the defaults set by rust-tools.nvim -    -- see https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md#rust_analyzer -    server = { -      cmd = { DATA_PATH .. "/lspinstall/rust/rust-analyzer" }, -      on_attach = require("lsp").common_on_attach, -    }, -- rust-analyser options -  } -  require("rust-tools").setup(opts) -else -  require("lspconfig").rust_analyzer.setup { -    cmd = { DATA_PATH .. "/lspinstall/rust/rust-analyzer" }, -    on_attach = require("lsp").common_on_attach, -    filetypes = { "rust" }, -    root_dir = require("lspconfig.util").root_pattern("Cargo.toml", "rust-project.json"), -  } -end - --- TODO: fix these mappings -vim.api.nvim_exec( -  [[ -    autocmd Filetype rust nnoremap <leader>lm <Cmd>RustExpandMacro<CR> -    autocmd Filetype rust nnoremap <leader>lH <Cmd>RustToggleInlayHints<CR> -    autocmd Filetype rust nnoremap <leader>le <Cmd>RustRunnables<CR> -    autocmd Filetype rust nnoremap <leader>lh <Cmd>RustHoverActions<CR> -    ]], -  true -) +require("lang.rust").format() +require("lang.rust").lint() +require("lang.rust").lsp() +require("lang.rust").dap() diff --git a/ftplugin/sh.lua b/ftplugin/sh.lua index 54002f19..ee3a27d7 100644 --- a/ftplugin/sh.lua +++ b/ftplugin/sh.lua @@ -1,52 +1,4 @@ -O.formatters.filetype["sh"] = { -  function() -    return { -      exe = O.lang.sh.formatter.exe, -      args = O.lang.sh.formatter.args, -      stdin = not (O.lang.sh.formatter.stdin ~= nil), -    } -  end, -} - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} -if not require("lv-utils").check_lsp_client_active "bashls" then -  -- npm i -g bash-language-server -  require("lspconfig").bashls.setup { -    cmd = { DATA_PATH .. "/lspinstall/bash/node_modules/.bin/bash-language-server", "start" }, -    on_attach = require("lsp").common_on_attach, -    filetypes = { "sh", "zsh" }, -  } -end - --- sh -local sh_arguments = {} - -local shfmt = { formatCommand = "shfmt -ci -s -bn", formatStdin = true } - -local shellcheck = { -  LintCommand = "shellcheck -f gcc -x", -  lintFormats = { "%f:%l:%c: %trror: %m", "%f:%l:%c: %tarning: %m", "%f:%l:%c: %tote: %m" }, -} - -if O.lang.sh.linter == "shellcheck" then -  table.insert(sh_arguments, shellcheck) -end - -if not require("lv-utils").check_lsp_client_active "efm" then -  require("lspconfig").efm.setup { -    -- init_options = {initializationOptions}, -    cmd = { DATA_PATH .. "/lspinstall/efm/efm-langserver" }, -    init_options = { documentFormatting = true, codeAction = false }, -    root_dir = require("lspconfig").util.root_pattern ".git/", -    filetypes = { "sh" }, -    settings = { -      rootMarkers = { ".git/" }, -      languages = { -        sh = sh_arguments, -      }, -    }, -  } -end +require("lang.sh").format() +require("lang.sh").lint() +require("lang.sh").lsp() +require("lang.sh").dap() diff --git a/ftplugin/tex.lua b/ftplugin/tex.lua index ff7689d3..3de774f4 100644 --- a/ftplugin/tex.lua +++ b/ftplugin/tex.lua @@ -1,97 +1,4 @@ -if require("lv-utils").check_lsp_client_active "texlab" then -  return -end - -local preview_settings = {} - -local sumatrapdf_args = { "-reuse-instance", "%p", "-forward-search", "%f", "%l" } -local evince_args = { "-f", "%l", "%p", "\"code -g %f:%l\"" } -local okular_args = { "--unique", "file:%p#src:%l%f" } -local zathura_args = { "--synctex-forward", "%l:1:%f", "%p" } -local qpdfview_args = { "--unique", "%p#src:%f:%l:1" } -local skim_args = { "%l", "%p", "%f" } - -if O.lang.latex.forward_search.executable == "C:/Users/{User}/AppData/Local/SumatraPDF/SumatraPDF.exe" then -  preview_settings = sumatrapdf_args -elseif O.lang.latex.forward_search.executable == "evince-synctex" then -  preview_settings = evince_args -elseif O.lang.latex.forward_search.executable == "okular" then -  preview_settings = okular_args -elseif O.lang.latex.forward_search.executable == "zathura" then -  preview_settings = zathura_args -elseif O.lang.latex.forward_search.executable == "qpdfview" then -  preview_settings = qpdfview_args -elseif O.lang.latex.forward_search.executable == "/Applications/Skim.app/Contents/SharedSupport/displayline" then -  preview_settings = skim_args -end - -require("lspconfig").texlab.setup { -  cmd = { DATA_PATH .. "/lspinstall/latex/texlab" }, -  on_attach = require("lsp").common_on_attach, -  handlers = { -    ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { -      virtual_text = O.lang.latex.diagnostics.virtual_text, -      signs = O.lang.latex.diagnostics.signs, -      underline = O.lang.latex.diagnostics.underline, -       update_in_insert = true, -    }), -  }, -  filetypes = { "tex", "bib" }, -  settings = { -    texlab = { -      auxDirectory = O.lang.latex.aux_directory, -      bibtexFormatter = O.lang.latex.bibtex_formatter, -      build = { -        args = O.lang.latex.build.args, -        executable = O.lang.latex.build.executable, -        forwardSearchAfter = O.lang.latex.build.forward_search_after, -        onSave = O.lang.latex.build.on_save, -      }, -      chktex = { -        onEdit = O.lang.latex.chktex.on_edit, -        onOpenAndSave = O.lang.latex.chktex.on_open_and_save, -      }, -      diagnosticsDelay = O.lang.latex.diagnostics_delay, -      formatterLineLength = O.lang.latex.formatter_line_length, -      forwardSearch = { -        args = preview_settings, -        executable = O.lang.latex.forward_search.executable, -      }, -      latexFormatter = O.lang.latex.latex_formatter, -      latexindent = { -         modifyLineBreaks = O.lang.latex.latexindent.modify_line_breaks, -      }, -    }, -  }, -} -vim.g.vimtex_compiler_method = "latexmk" -vim.g.vimtex_view_method = "zathura" -vim.g.vimtex_fold_enabled = 0 -vim.g.vimtex_quickfix_ignore_filters = O.lang.latex.ignore_errors - -O.plugin.which_key.mappings["t"] = { -  name = "+Latex", -  c = { "<cmd>VimtexCompile<cr>", "Toggle Compilation Mode" }, -  f = { "<cmd>call vimtex#fzf#run()<cr>", "Fzf Find" }, -  i = { "<cmd>VimtexInfo<cr>", "Project Information" }, -  s = { "<cmd>VimtexStop<cr>", "Stop Project Compilation" }, -  t = { "<cmd>VimtexTocToggle<cr>", "Toggle Table Of Content" }, -  v = { "<cmd>VimtexView<cr>", "View PDF" }, -  b = { "<cmd>TexlabBuild<cr>", "Build with Texlab" }, -  p = { "<cmd>TexlabForward<cr>", "Preview with Texlab" }, -} - --- Compile on initialization, cleanup on quit -vim.api.nvim_exec( -  [[ -        augroup vimtex_event_1 -            au! -            au User VimtexEventQuit     call vimtex#compiler#clean(0) -            au User VimtexEventInitPost call vimtex#compiler#compile() -        augroup END -    ]], -  false -) -if O.lang.latex.auto_save then -  vim.api.nvim_exec([[au FocusLost * :wa]], false) -end +require("lang.tex").format() +require("lang.tex").lint() +require("lang.tex").lsp() +require("lang.tex").dap() diff --git a/ftplugin/tf.lua b/ftplugin/tf.lua index a328f7c2..cfe54936 100644 --- a/ftplugin/tf.lua +++ b/ftplugin/tf.lua @@ -1,25 +1,4 @@ -O.formatters.filetype["hcl"] = { -  function() -    return { -      exe = O.lang.terraform.formatter.exe, -      args = O.lang.terraform.formatter.args, -      stdin = not (O.lang.terraform.formatter.stdin ~= nil), -    } -  end, -} -O.formatters.filetype["tf"] = O.formatters.filetype["hcl"] - -require("formatter.config").set_defaults { -  logging = false, -  filetype = O.formatters.filetype, -} - -if require("lv-utils").check_lsp_client_active "terraformls" then -  return -end - -require("lspconfig").terraformls.setup { -  cmd = { DATA_PATH .. "/lspinstall/terraform/terraform-ls", "serve" }, -  on_attach = require("lsp").common_on_attach, -  filetypes = { "tf", "terraform", "hcl" }, -} +require("lang.terraform").format() +require("lang.terraform").lint() +require("lang.terraform").lsp() +require("lang.terraform").dap() diff --git a/ftplugin/vim.lua b/ftplugin/vim.lua index 4a405698..0b5f5ea8 100644 --- a/ftplugin/vim.lua +++ b/ftplugin/vim.lua @@ -1,9 +1,4 @@ -if require("lv-utils").check_lsp_client_active "vimls" then -  return -end - --- npm install -g vim-language-server -require("lspconfig").vimls.setup { -  cmd = { DATA_PATH .. "/lspinstall/vim/node_modules/.bin/vim-language-server", "--stdio" }, -  on_attach = require("lsp").common_on_attach, -} +require("lang.vim").format() +require("lang.vim").lint() +require("lang.vim").lsp() +require("lang.vim").dap() | 
