Merge branch 'master' of github.com:ChristianChiarulli/LunarVim into stable

1 files changed, 17 insertions, 17 deletions

diff --git a/ftplugin/java.lua b/ftplugin/java.lua
index 0b151b66..00ca0091 100644
--- a/ftplugin/java.lua
+++ b/ftplugin/java.lua
@@ -1,4 +1,4 @@
-local util = require 'lspconfig/util'
+local util = require "lspconfig/util"
 -- In Vimscript
 -- augroup lsp
 --   au!
@@ -20,17 +20,17 @@ local util = require 'lspconfig/util'
 -- };
 
 local on_attach = function(client, bufr)
-    -- require('jdtls').setup_dap()
-    require'lsp'.common_on_attach(client, bufr)
+  -- require('jdtls').setup_dap()
+  require("lsp").common_on_attach(client, bufr)
 end
 
-require'lspconfig'.jdtls.setup {
-    on_attach = 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
+require("lspconfig").jdtls.setup {
+  on_attach = 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
 }
 
 -- require('jdtls').start_or_attach({
@@ -41,10 +41,10 @@ require'lspconfig'.jdtls.setup {
 -- })
 
 -- 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>'
-    --     }
-    -- }
+-- _java = {
+--     -- {'FileType', 'java', 'luafile '..CONFIG_PATH..'/lua/lsp/java-ls.lua'},
+--     {
+--         'FileType', 'java',
+--         'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>'
+--     }
+-- }