Skip to content

refactor!: move all the client commands to nvim-refactor repo #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s1n7ax merged 2 commits into from
Jul 25, 2024
Merged

refactor!: move all the client commands to nvim-refactor repo #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19f72cc
refactor!: move all the client commands to nvim-refactor repo
s1n7ax Jul 24, 2024
6220974
chore: remove unwanted code
s1n7ax Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 47 additions & 50 deletions lua/java.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
require('java.commands')

local decomple_watch = require('java.startup.decompile-watcher')
local mason_dep = require('java.startup.mason-dep')
local setup_wrap = require('java.startup.lspconfig-setup-wrap')
local startup_check = require('java.startup.startup-check')

local test = require('java.api.test')
local dap = require('java.api.dap')
local runner = require('java.api.runner')
local profile_ui = require('java.ui.profile')
local refactor = require('java.api.refactor')
local build_api = require('java.api.build')
local command_util = require('java.utils.command')

local test_api = require('java.api.test')
local dap_api = require('java.api.dap')
local runner_api = require('java.api.runner')
local settings_api = require('java.api.settings')
local profile_ui = require('java.ui.profile')

local global_config = require('java.config')

Expand All @@ -36,70 +34,73 @@ function M.setup(custom_config)

local is_installing = mason_dep.install(config)

if not is_installing then
setup_wrap.setup(config)
decomple_watch.setup()
dap.setup_dap_on_lsp_attach()
if is_installing then
return
end

setup_wrap.setup(config)
decomple_watch.setup()
dap_api.setup_dap_on_lsp_attach()

vim.api.nvim_exec_autocmds(
'User',
{ pattern = 'JavaPostSetup', data = { config = config } }
)
end

----------------------------------------------------------------------
-- Experimental APIs --
----------------------------------------------------------------------
M.build = {}
M.build.build_workspace = build_api.full_build_workspace
---@param path string[]
---@param command fun()
---@param opts vim.api.keyset.user_command
function M.register_api(path, command, opts)
local name = command_util.path_to_command_name(path)

vim.api.nvim_create_user_command(name, command, opts or {})

local last_index = #path - 1
local func_name = path[last_index]

table.remove(path, last_index)

local node = M

for _, v in ipairs(path) do
if not node[v] then
node[v] = {}
end

node = node[v]
end

node[func_name] = command
end

----------------------------------------------------------------------
-- DAP APIs --
----------------------------------------------------------------------
M.dap = {}
M.dap.config_dap = dap.config_dap
M.dap.config_dap = dap_api.config_dap

----------------------------------------------------------------------
-- Test APIs --
----------------------------------------------------------------------
M.test = {}
M.test.run_current_class = test.run_current_class
M.test.debug_current_class = test.debug_current_class
M.test.run_current_class = test_api.run_current_class
M.test.debug_current_class = test_api.debug_current_class

M.test.run_current_method = test.run_current_method
M.test.debug_current_method = test.debug_current_method
M.test.run_current_method = test_api.run_current_method
M.test.debug_current_method = test_api.debug_current_method

M.test.view_last_report = test.view_last_report

----------------------------------------------------------------------
-- Manipulate --
----------------------------------------------------------------------

M.manipulate = {}
-- M.manipulate.organize_imports = {}

----------------------------------------------------------------------
-- Refactor --
----------------------------------------------------------------------
M.refactor = {}
M.refactor.extract_variable = refactor.extract_variable
M.refactor.extract_constant = refactor.extract_constant
M.refactor.extract_method = refactor.extract_method
M.refactor.extract_field = refactor.extract_field
M.refactor.convert_variable_to_field = refactor.convert_variable_to_field
M.refactor.extract_variable_all_occurrence =
refactor.extract_variable_all_occurrence
M.test.view_last_report = test_api.view_last_report

----------------------------------------------------------------------
-- Runner APIs --
----------------------------------------------------------------------
M.runner = {}
M.runner.built_in = {}
M.runner.built_in.run_app = runner.built_in.run_app
M.runner.built_in.toggle_logs = runner.built_in.toggle_logs
M.runner.built_in.stop_app = runner.built_in.stop_app
M.runner.built_in.switch_app = runner.built_in.switch_app
M.runner.built_in.run_app = runner_api.built_in.run_app
M.runner.built_in.toggle_logs = runner_api.built_in.toggle_logs
M.runner.built_in.stop_app = runner_api.built_in.stop_app
M.runner.built_in.switch_app = runner_api.built_in.switch_app

----------------------------------------------------------------------
-- Profile UI --
Expand All @@ -113,8 +114,4 @@ M.profile.ui = profile_ui.ui
M.settings = {}
M.settings.change_runtime = settings_api.change_runtime

function M.__run()
test.debug_current_method()
end

return M
51 changes: 0 additions & 51 deletions lua/java/api/build.lua
View file
Open in desktop

This file was deleted.

Loading