diff --git a/ftplugin/java.lua b/ftplugin/java.lua index 866da7c..f3ebfa0 100644 --- a/ftplugin/java.lua +++ b/ftplugin/java.lua @@ -144,37 +144,37 @@ -- [[command! -buffer -nargs=? -complete=custom,v:lua.require'jdtls'._complete_set_runtime JdtSetRuntime lua require('jdtls').set_runtime()]] -- ) -local mason_reg = require("mason-registry") -for _, pkg in pairs(mason_reg.get_installed_packages()) do - for _, type in pairs(pkg.spec.categories) do - if type == "LSP" and pkg.spec.name == "jdtls" then - local ok, lspconfig = pcall(require, "lspconfig") - if not ok then - return - end - - lspconfig.jdtls.setup({ - cmd = { - "jdtls", - "-configuration", - vim.fn.expand("$HOME") .. "/.cache/jdtls/config", - "-data", - vim.fn.expand("$HOME") .. "/.cache/jdtls/workspace", - }, - filetypes = { "java" }, - root_dir = require("lspconfig.util").root_pattern( - -- Single-module projects - { - "build.xml", -- Ant - "pom.xml", -- Maven - "settings.gradle", -- Gradle - "settings.gradle.kts", -- Gradle - }, - -- Multi-module projects - { "build.gradle", "build.gradle.kts" } - ) or vim.fn.getcwd(), - singe_file_support = true, - }) - end - end -end +-- local mason_reg = require("mason-registry") +-- for _, pkg in pairs(mason_reg.get_installed_packages()) do +-- for _, type in pairs(pkg.spec.categories) do +-- if type == "LSP" and pkg.spec.name == "jdtls" then +-- local ok, lspconfig = pcall(require, "lspconfig") +-- if not ok then +-- return +-- end +-- +-- lspconfig.jdtls.setup({ +-- cmd = { +-- "jdtls", +-- "-configuration", +-- vim.fn.expand("$HOME") .. "/.cache/jdtls/config", +-- "-data", +-- vim.fn.expand("$HOME") .. "/.cache/jdtls/workspace", +-- }, +-- filetypes = { "java" }, +-- root_dir = require("lspconfig.util").root_pattern( +-- -- Single-module projects +-- { +-- "build.xml", -- Ant +-- "pom.xml", -- Maven +-- "settings.gradle", -- Gradle +-- "settings.gradle.kts", -- Gradle +-- }, +-- -- Multi-module projects +-- { "build.gradle", "build.gradle.kts" } +-- ) or vim.fn.getcwd(), +-- singe_file_support = true, +-- }) +-- end +-- end +-- end diff --git a/lua/core/init.lua b/lua/core/init.lua index b6c8bc4..df0d77a 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -1,9 +1,4 @@ _G.pcode = _G.pcode or {} -vim.filetype.add({ - pattern = { - [".*%.blade%.php"] = "blade", - }, -}) require("custom.default") require("custom.dashboard") require("config.lazy_lib") @@ -25,12 +20,3 @@ require("custom.keymaps") -- vim.cmd("colorscheme onedark") -- vim.cmd("colorscheme github_dark_dimmed") -- vim.cmd("colorscheme github_dark_high_contrast") - --- local mason_reg = require("mason-registry") --- for _, pkg in pairs(mason_reg.get_installed_packages()) do --- for _, type in pairs(pkg.spec.categories) do --- if type == "LSP" and pkg.spec.name == "jdtls" then --- print("JDTLS READY") --- end --- end --- end