diff options
| -rw-r--r-- | ftplugin/java.lua | 25 | ||||
| -rw-r--r-- | lua/default-config.lua | 4 | ||||
| -rw-r--r-- | lua/lsp/tsserver-ls.lua | 2 |
3 files changed, 30 insertions, 1 deletions
diff --git a/ftplugin/java.lua b/ftplugin/java.lua index 2f42a78f..7db90f0e 100644 --- a/ftplugin/java.lua +++ b/ftplugin/java.lua @@ -1,3 +1,28 @@ +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 diff --git a/lua/default-config.lua b/lua/default-config.lua index fff921b9..b10c9590 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -132,6 +132,10 @@ O = { java_tools = { active = false, }, + formatter = { + exe = "prettier", + args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0), "--single-quote" }, + }, }, json = { diagnostics = { diff --git a/lua/lsp/tsserver-ls.lua b/lua/lsp/tsserver-ls.lua index 22c58950..8ed801e8 100644 --- a/lua/lsp/tsserver-ls.lua +++ b/lua/lsp/tsserver-ls.lua @@ -13,7 +13,7 @@ O.formatters.filetype["javascriptreact"] = { exe = prettier_instance, -- TODO: allow user to override this args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0), "--single-quote" }, - stdin = true + stdin = true, } end, } |