diff options
Diffstat (limited to 'ftplugin')
41 files changed, 67 insertions, 155 deletions
diff --git a/ftplugin/c.lua b/ftplugin/c.lua index c4fbdd16..3f931e4a 100644 --- a/ftplugin/c.lua +++ b/ftplugin/c.lua @@ -1,4 +1,4 @@ -require("lang.clang").format() -require("lang.clang").lint() -require("lang.clang").lsp() -require("lang.clang").dap() +require("lsp").setup "c" + +-- TODO get from dap +-- require("lang.c").dap() diff --git a/ftplugin/clojure.lua b/ftplugin/clojure.lua index 17d79724..683720a5 100644 --- a/ftplugin/clojure.lua +++ b/ftplugin/clojure.lua @@ -1,4 +1 @@ -require("lang.clojure").format() -require("lang.clojure").lint() -require("lang.clojure").lsp() -require("lang.clojure").dap() +require("lsp").setup "clojure" diff --git a/ftplugin/cmake.lua b/ftplugin/cmake.lua index 8d50c595..56d30106 100644 --- a/ftplugin/cmake.lua +++ b/ftplugin/cmake.lua @@ -1,4 +1 @@ -require("lang.cmake").format() -require("lang.cmake").lint() -require("lang.cmake").lsp() -require("lang.cmake").dap() +require("lsp").setup "cmake" diff --git a/ftplugin/cpp.lua b/ftplugin/cpp.lua index d2be5311..6028ea49 120000..100644 --- a/ftplugin/cpp.lua +++ b/ftplugin/cpp.lua @@ -1 +1 @@ -c.lua
\ No newline at end of file +require("lsp").setup "cpp" diff --git a/ftplugin/cs.lua b/ftplugin/cs.lua index cf2e31c6..dd76f973 100644 --- a/ftplugin/cs.lua +++ b/ftplugin/cs.lua @@ -1,4 +1 @@ -require("lang.cs").format() -require("lang.cs").lint() -require("lang.cs").lsp() -require("lang.cs").dap() +require("lsp").setup "csharp" diff --git a/ftplugin/css.lua b/ftplugin/css.lua index 846c6a83..094ed2a3 100644 --- a/ftplugin/css.lua +++ b/ftplugin/css.lua @@ -1,4 +1 @@ -require("lang.css").format() -require("lang.css").lint() -require("lang.css").lsp() -require("lang.css").dap() +require("lsp").setup "css" diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua index 1db4fe05..9f0ccfa0 100644 --- a/ftplugin/dart.lua +++ b/ftplugin/dart.lua @@ -1,4 +1 @@ -require("lang.dart").format() -require("lang.dart").lint() -require("lang.dart").lsp() -require("lang.dart").dap() +require("lsp").setup "dart" diff --git a/ftplugin/dockerfile.lua b/ftplugin/dockerfile.lua index 8a43c764..72ec7f90 100644 --- a/ftplugin/dockerfile.lua +++ b/ftplugin/dockerfile.lua @@ -1,4 +1 @@ -require("lang.dockerfile").format() -require("lang.dockerfile").lint() -require("lang.dockerfile").lsp() -require("lang.dockerfile").dap() +require("lsp").setup "docker" diff --git a/ftplugin/elixir.lua b/ftplugin/elixir.lua index 07b9625b..f16f71fa 100644 --- a/ftplugin/elixir.lua +++ b/ftplugin/elixir.lua @@ -1,4 +1,9 @@ -require("lang.elixir").format() -require("lang.elixir").lint() -require("lang.elixir").lsp() -require("lang.elixir").dap() +require("lsp").setup "elixir" + +-- TODO: do we need this? +-- 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 +-- ]] diff --git a/ftplugin/elm.lua b/ftplugin/elm.lua index 0868b9db..38fda314 100644 --- a/ftplugin/elm.lua +++ b/ftplugin/elm.lua @@ -1,4 +1 @@ -require("lang.elm").format() -require("lang.elm").lint() -require("lang.elm").lsp() -require("lang.elm").dap() +require("lsp").setup "elm" diff --git a/ftplugin/erlang.lua b/ftplugin/erlang.lua index b7231c41..c6426dba 100644 --- a/ftplugin/erlang.lua +++ b/ftplugin/erlang.lua @@ -1,4 +1 @@ -require("lang.erlang").format() -require("lang.erlang").lint() -require("lang.erlang").lsp() -require("lang.erlang").dap() +require("lsp").setup "erlang" diff --git a/ftplugin/euphoria3.lua b/ftplugin/euphoria3.lua index 67da6c48..391c51ad 100644 --- a/ftplugin/euphoria3.lua +++ b/ftplugin/euphoria3.lua @@ -1,4 +1,9 @@ -require("lang.euphoria3").format() -require("lang.euphoria3").lint() -require("lang.euphoria3").lsp() -require("lang.euphoria3").dap() +require("lsp").setup "erlang" + +-- TODO: do we need this? +-- 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 +-- ]] diff --git a/ftplugin/fish.lua b/ftplugin/fish.lua index 00416a08..575ec434 100644 --- a/ftplugin/fish.lua +++ b/ftplugin/fish.lua @@ -1,4 +1 @@ -require("lang.fish").format() -require("lang.fish").lint() -require("lang.fish").lsp() -require("lang.fish").dap() +require("lsp").setup "fish" diff --git a/ftplugin/go.lua b/ftplugin/go.lua index e5b8475f..218b634c 100644 --- a/ftplugin/go.lua +++ b/ftplugin/go.lua @@ -1,4 +1 @@ -require("lang.go").format() -require("lang.go").lint() -require("lang.go").lsp() -require("lang.go").dap() +require("lsp").setup "go" diff --git a/ftplugin/graphql.lua b/ftplugin/graphql.lua index 30bddcc4..83e8878d 100644 --- a/ftplugin/graphql.lua +++ b/ftplugin/graphql.lua @@ -1,4 +1 @@ -require("lang.graphql").format() -require("lang.graphql").lint() -require("lang.graphql").lsp() -require("lang.graphql").dap() +require("lsp").setup "graphql" diff --git a/ftplugin/html.lua b/ftplugin/html.lua index 70c3295a..c60394c0 100644 --- a/ftplugin/html.lua +++ b/ftplugin/html.lua @@ -1,4 +1 @@ -require("lang.html").format() -require("lang.html").lint() -require("lang.html").lsp() -require("lang.html").dap() +require("lsp").setup "html" diff --git a/ftplugin/java.lua b/ftplugin/java.lua index 898cf8af..dcb46ca2 100644 --- a/ftplugin/java.lua +++ b/ftplugin/java.lua @@ -1,4 +1 @@ -require("lang.java").format() -require("lang.java").lint() -require("lang.java").lsp() -require("lang.java").dap() +require("lsp").setup "java" diff --git a/ftplugin/javascript.lua b/ftplugin/javascript.lua index fc59ab68..37b95c71 100644 --- a/ftplugin/javascript.lua +++ b/ftplugin/javascript.lua @@ -1 +1 @@ -require "lsp.tsserver-ls" +require("lsp").setup "javascript" diff --git a/ftplugin/javascriptreact.lua b/ftplugin/javascriptreact.lua index f74b54e9..90920166 100644 --- a/ftplugin/javascriptreact.lua +++ b/ftplugin/javascriptreact.lua @@ -1,3 +1 @@ -require "lsp.tsserver-ls" - -vim.cmd "setl ts=2 sw=2" +require("lsp").setup "javascriptreact" diff --git a/ftplugin/json.lua b/ftplugin/json.lua index 0408f9b5..18368cf9 100644 --- a/ftplugin/json.lua +++ b/ftplugin/json.lua @@ -1,4 +1 @@ -require("lang.json").format() -require("lang.json").lint() -require("lang.json").lsp() -require("lang.json").dap() +require("lsp").setup "json" diff --git a/ftplugin/julia.lua b/ftplugin/julia.lua index 7e16d7bd..9840be1f 100644 --- a/ftplugin/julia.lua +++ b/ftplugin/julia.lua @@ -1,4 +1 @@ -require("lang.julia").format() -require("lang.julia").lint() -require("lang.julia").lsp() -require("lang.julia").dap() +require("lsp").setup "julia" diff --git a/ftplugin/kotlin.lua b/ftplugin/kotlin.lua index 2677c287..a0e6d5d6 100644 --- a/ftplugin/kotlin.lua +++ b/ftplugin/kotlin.lua @@ -1,4 +1 @@ -require("lang.kotlin").format() -require("lang.kotlin").lint() -require("lang.kotlin").lsp() -require("lang.kotlin").dap() +require("lsp").setup "kotlin" diff --git a/ftplugin/lua.lua b/ftplugin/lua.lua index 37ebab42..2ed88315 100644 --- a/ftplugin/lua.lua +++ b/ftplugin/lua.lua @@ -1,4 +1 @@ -require("lang.lua").format() -require("lang.lua").lint() -require("lang.lua").lsp() -require("lang.lua").dap() +require("lsp").setup "lua" diff --git a/ftplugin/php.lua b/ftplugin/php.lua index c319ea67..4eabcf71 100644 --- a/ftplugin/php.lua +++ b/ftplugin/php.lua @@ -1,4 +1 @@ -require("lang.php").format() -require("lang.php").lint() -require("lang.php").lsp() -require("lang.php").dap() +require("lsp").setup "php" diff --git a/ftplugin/python.lua b/ftplugin/python.lua index 85f08beb..3e79e6bc 100644 --- a/ftplugin/python.lua +++ b/ftplugin/python.lua @@ -1,4 +1,3 @@ -require("lang.python").format() -require("lang.python").lint() -require("lang.python").lsp() -require("lang.python").dap() +require("lsp").setup "python" +-- TODO get from dap +-- require("lang.python").dap() diff --git a/ftplugin/r.lua b/ftplugin/r.lua index 6de40bda..296d3c86 100644 --- a/ftplugin/r.lua +++ b/ftplugin/r.lua @@ -1,4 +1,2 @@ -require("lang.r").format() -require("lang.r").lint() -require("lang.r").lsp() -require("lang.r").dap() +-- R -e 'install.packages("languageserver",repos = "http://cran.us.r-project.org")' +require("lsp").setup "r" diff --git a/ftplugin/ruby.lua b/ftplugin/ruby.lua index 6022504c..7e968917 100644 --- a/ftplugin/ruby.lua +++ b/ftplugin/ruby.lua @@ -1,4 +1,2 @@ -require("lang.ruby").format() -require("lang.ruby").lint() -require("lang.ruby").lsp() -require("lang.ruby").dap() +-- also support sorbet +require("lsp").setup "ruby" diff --git a/ftplugin/rust.lua b/ftplugin/rust.lua index 74728407..f1623f25 100644 --- a/ftplugin/rust.lua +++ b/ftplugin/rust.lua @@ -1,4 +1,4 @@ -require("lang.rust").format() -require("lang.rust").lint() -require("lang.rust").lsp() -require("lang.rust").dap() +require("lsp").setup "rust" + +-- TODO get from dap +-- require("lang.rust").dap() diff --git a/ftplugin/scala.lua b/ftplugin/scala.lua index 3b726fb6..169e36ad 100644 --- a/ftplugin/scala.lua +++ b/ftplugin/scala.lua @@ -1,4 +1 @@ -require("lang.scala").format() -require("lang.scala").lint() -require("lang.scala").lsp() -require("lang.scala").dap() +require("lsp").setup "scala" diff --git a/ftplugin/sh.lua b/ftplugin/sh.lua index ee3a27d7..4f18fbca 100644 --- a/ftplugin/sh.lua +++ b/ftplugin/sh.lua @@ -1,4 +1 @@ -require("lang.sh").format() -require("lang.sh").lint() -require("lang.sh").lsp() -require("lang.sh").dap() +require("lsp").setup "sh" diff --git a/ftplugin/svelte.lua b/ftplugin/svelte.lua index 108a0fc3..175a5cbd 100644 --- a/ftplugin/svelte.lua +++ b/ftplugin/svelte.lua @@ -1,4 +1 @@ -require("lang.svelte").format() -require("lang.svelte").lint() -require("lang.svelte").lsp() -require("lang.svelte").dap() +require("lsp").setup "svelte" diff --git a/ftplugin/swift.lua b/ftplugin/swift.lua index 64d87e1c..1ae7554a 100644 --- a/ftplugin/swift.lua +++ b/ftplugin/swift.lua @@ -1,4 +1 @@ -require("lang.swift").format() -require("lang.swift").lint() -require("lang.swift").lsp() -require("lang.swift").dap() +require("lsp").setup "swift" diff --git a/ftplugin/tex.lua b/ftplugin/tex.lua index 3de774f4..e9a98ec5 100644 --- a/ftplugin/tex.lua +++ b/ftplugin/tex.lua @@ -1,4 +1 @@ -require("lang.tex").format() -require("lang.tex").lint() -require("lang.tex").lsp() -require("lang.tex").dap() +require("lsp").setup "tex" diff --git a/ftplugin/tf.lua b/ftplugin/tf.lua index cfe54936..3486663d 100644 --- a/ftplugin/tf.lua +++ b/ftplugin/tf.lua @@ -1,4 +1 @@ -require("lang.terraform").format() -require("lang.terraform").lint() -require("lang.terraform").lsp() -require("lang.terraform").dap() +require("lsp").setup "terraform" diff --git a/ftplugin/typescript.lua b/ftplugin/typescript.lua index f74b54e9..2f6219df 100644 --- a/ftplugin/typescript.lua +++ b/ftplugin/typescript.lua @@ -1,3 +1 @@ -require "lsp.tsserver-ls" - -vim.cmd "setl ts=2 sw=2" +require("lsp").setup "typescript" diff --git a/ftplugin/typescriptreact.lua b/ftplugin/typescriptreact.lua index f74b54e9..2f6219df 100644 --- a/ftplugin/typescriptreact.lua +++ b/ftplugin/typescriptreact.lua @@ -1,3 +1 @@ -require "lsp.tsserver-ls" - -vim.cmd "setl ts=2 sw=2" +require("lsp").setup "typescript" diff --git a/ftplugin/vim.lua b/ftplugin/vim.lua index 0b5f5ea8..88c00c1c 100644 --- a/ftplugin/vim.lua +++ b/ftplugin/vim.lua @@ -1,4 +1 @@ -require("lang.vim").format() -require("lang.vim").lint() -require("lang.vim").lsp() -require("lang.vim").dap() +require("lsp").setup "vim" diff --git a/ftplugin/vue.lua b/ftplugin/vue.lua index 11d7b2a1..a174c9bf 100644 --- a/ftplugin/vue.lua +++ b/ftplugin/vue.lua @@ -1,4 +1 @@ -require("lang.vue").format() -require("lang.vue").lint() -require("lang.vue").lsp() -require("lang.vue").dap() +require("lsp").setup "vue" diff --git a/ftplugin/yaml.lua b/ftplugin/yaml.lua index f38f2586..d21f9785 100644 --- a/ftplugin/yaml.lua +++ b/ftplugin/yaml.lua @@ -1,4 +1 @@ -require("lang.yaml").format() -require("lang.yaml").lint() -require("lang.yaml").lsp() -require("lang.yaml").dap() +require("lsp").setup "yaml" diff --git a/ftplugin/zig.lua b/ftplugin/zig.lua index 9b391764..ef3d64d4 100644 --- a/ftplugin/zig.lua +++ b/ftplugin/zig.lua @@ -1,4 +1 @@ -require("lang.zig").format() -require("lang.zig").lint() -require("lang.zig").lsp() -require("lang.zig").dap() +require("lsp").setup "zig" diff --git a/ftplugin/zsh.lua b/ftplugin/zsh.lua index 4dfbb7b8..4f18fbca 100644 --- a/ftplugin/zsh.lua +++ b/ftplugin/zsh.lua @@ -1,4 +1 @@ -require("lang.zsh").format() -require("lang.zsh").lint() -require("lang.zsh").lsp() -require("lang.zsh").dap() +require("lsp").setup "sh" |