refactor!: change the project structure according to new core changes (nvim-java#27)

s1n7ax · web-flow · commit 7c7b772151b6 · 2023-11-19T14:14:26.000+05:30
- core was changed in nvim-java/nvim-java-core#18 - fix: logs to use the current project logger instead of java-core logger - refactor: changes in the project structure and some file names
diff --git a/lua/java.lua b/lua/java.lua
@@ -1,6 +1,6 @@
 local deps = require('java.dependencies')
 local java_mason = require('java.mason')
-local java_dap = require('java.dap')
+local java_dap = require('java.dap.api')
 local java_lspconfig = require('java.lspconfig')
 local ts = require('java.treesitter')
 
diff --git a/lua/java/dap/api.lua b/lua/java/dap/api.lua
@@ -0,0 +1,50 @@
+local JavaDap = require('java.dap')
+
+local log = require('java.utils.log')
+local notify = require('java-core.utils.notify')
+local get_error_handler = require('java.handlers.error')
+local jdtls = require('java.jdtls')
+
+local M = {}
+
+---Setup dap config & adapter on jdtls attach event
+function M.setup_dap_on_lsp_attach()
+	log.info('add LspAttach event handlers to setup dap adapter & config')
+
+	vim.api.nvim_create_autocmd('LspAttach', {
+		pattern = '*',
+		callback = M.on_jdtls_attach,
+		once = true,
+		group = vim.api.nvim_create_augroup('nvim-java-dap-config', {}),
+	})
+end
+
+---Runs the current test class
+function M.run_current_test_class()
+	return JavaDap:new(jdtls()):execute_current_test_class({ noDebug = true })
+end
+
+function M.debug_current_test_class()
+	return JavaDap:new(jdtls()):execute_current_test_class({})
+end
+
+---Configures the dap
+function M.config_dap()
+	return JavaDap:new(jdtls())
+		:config_dap()
+		:catch(get_error_handler('failed to configure dap'))
+end
+
+---@private
+---@param ev any
+function M.on_jdtls_attach(ev)
+	local client = vim.lsp.get_client_by_id(ev.data.client_id)
+
+	if client.name == 'jdtls' then
+		log.info('setup java dap config & adapter')
+
+		M.config_dap()
+	end
+end
+
+return M
diff --git a/lua/java/dap/dapp.lua b/lua/java/dap/dapp.lua
diff --git a/lua/java/dap/init.lua b/lua/java/dap/init.lua
@@ -1,54 +1,69 @@
-local JavaDap = require('java.dap.dapp')
+local log = require('java.utils.log')
+local get_error_handler = require('java.handlers.error')
 
-local log = require('java-core.utils.log')
-local notify = require('java-core.utils.notify')
-local jdtls = require('java.jdtls')
+local Promise = require('java-core.utils.promise')
+local JavaCoreDap = require('java-core.dap')
+local JavaCoreTestApi = require('java-core.api.test')
 
+---@class JavaDap
+---@field private client LspClient
+---@field private dap JavaCoreDap
+---@field private test_api JavaCoreTestApi
 local M = {}
 
----Setup dap config & adapter on jdtls attach event
-function M.setup_dap_on_lsp_attach()
-	log.info('add LspAttach event handlers to setup dap adapter & config')
+---@param args { client: LspClient }
+---@return JavaDap
+function M:new(args)
+	local o = {
+		client = args.client,
+	}
 
-	vim.api.nvim_create_autocmd('LspAttach', {
-		pattern = '*',
-		callback = M.on_jdtls_attach,
-		once = true,
-		group = vim.api.nvim_create_augroup('nvim-java-dap-config', {}),
+	o.test_api = JavaCoreTestApi:new({
+		client = args.client,
 	})
-end
 
----Runs the current test class
-function M.run_current_test_class()
-	return JavaDap:new(jdtls()):execute_current_test_class({ noDebug = true })
-end
+	o.dap = JavaCoreDap:new({
+		client = args.client,
+	})
 
-function M.debug_current_test_class()
-	return JavaDap:new(jdtls()):execute_current_test_class()
+	setmetatable(o, self)
+	self.__index = self
+	return o
 end
 
----Configures the dap
-function M.config_dap()
-	return JavaDap:new(jdtls())
-		:config_dap()
-		:thenCall(function()
-			notify.info('DAP configured')
-		end)
-		:catch(function(err)
-			notify.error('Failed to configure DAP', err)
-		end)
+---Run the current test class
+---@param config JavaCoreDapLauncherConfigOverridable
+function M:execute_current_test_class(config)
+	log.info('running the current class')
+
+	local buffer = vim.api.nvim_get_current_buf()
+
+	return self.test_api
+		:run_class_by_buffer(buffer, config)
+		:catch(get_error_handler('failed to run current test class'))
 end
 
----@private
----@param ev any
-function M.on_jdtls_attach(ev)
-	local client = vim.lsp.get_client_by_id(ev.data.client_id)
+function M:config_dap()
+	return Promise.resolve()
+		:thenCall(function()
+			log.debug('set dap adapter callback function')
 
-	if client.name == 'jdtls' then
-		log.info('setup java dap config & adapter')
+			-- setting java adapter
+			require('dap').adapters.java = function(callback)
+				self.dap
+					:get_dap_adapter()
+					:thenCall(callback)
+					:catch(get_error_handler('failed to set DAP adapter'))
+			end
 
-		M.config_dap()
-	end
+			-- setting java config
+			return self.dap:get_dap_config()
+		end)
+		:thenCall(function(dap_config)
+			log.debug('set dap config: ', dap_config)
+			require('dap').configurations.java = dap_config
+		end)
+		:catch(get_error_handler('failed to set DAP configuration'))
 end
 
 return M
diff --git a/lua/java/dependencies.lua b/lua/java/dependencies.lua
@@ -1,4 +1,4 @@
-local log = require('java-core.utils.log')
+local log = require('java.utils.log')
 
 local pkgs = {
 	{
diff --git a/lua/java/handlers/error.lua b/lua/java/handlers/error.lua
@@ -1,5 +1,5 @@
 local notify = require('java-core.utils.notify')
-local log = require('java-core.utils.log')
+local log = require('java.utils.log')
 
 local function table_tostring(tbl)
 	local str = ''
diff --git a/lua/java/jdtls.lua b/lua/java/jdtls.lua
@@ -1,7 +1,7 @@
 local get_error_handler = require('java.handlers.error')
 
 ---Returns an active jdtls client
----@return { client: LSPClient }
+---@return { client: LspClient }
 local function get_jdtls()
 	local clients = vim.lsp.get_active_clients({ name = 'jdtls' })
 
diff --git a/lua/java/lspconfig.lua b/lua/java/lspconfig.lua
@@ -1,4 +1,4 @@
-local log = require('java-core.utils.log')
+local log = require('java.utils.log')
 local lspconfig = require('lspconfig')
 local server = require('java-core.ls.servers.jdtls')
 local jdtls = require('java.jdtls')
@@ -10,7 +10,7 @@ local M = {}
 
 function M.wrap_lspconfig_setup()
 	log.info('wrap lspconfig.java.setup function to inject a custom java config')
-	---@type fun(config: LSPSetupConfig)
+	---@type fun(config: LspSetupConfig)
 	local org_setup = lspconfig.jdtls.setup
 
 	lspconfig.jdtls.setup = function(user_config)
@@ -26,6 +26,7 @@ function M.wrap_lspconfig_setup()
 				'build.gradle.kts',
 				'.git',
 			},
+			jdtls_plugins = { 'java-test', 'java-debug-adapter' },
 		})
 
 		config = vim.tbl_deep_extend('force', user_config, config)
diff --git a/lua/java/mason.lua b/lua/java/mason.lua
@@ -1,4 +1,4 @@
-local log = require('java-core.utils.log')
+local log = require('java.utils.log')
 local mason_reg = require('mason-registry')
 
 local M = {}
diff --git a/lua/java/utils/log.lua b/lua/java/utils/log.lua
@@ -137,6 +137,7 @@ log.new = function(config, standalone)
 			local fp = io.open(outfile, 'a')
 			local str =
 				string.format('[%-6s%s] %s: %s\n', nameupper, os.date(), lineinfo, msg)
+			assert(fp, 'cannot open file: ' .. ' to write logs')
 			fp:write(str)
 			fp:close()
 		end
@@ -162,4 +163,5 @@ log.new = function(config, standalone)
 end
 
 log.new(default_config, true)
--- }}}
+
+return log
diff --git a/tests/java/java_spec.lua b/tests/java/java_spec.lua

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-local log = require('java-core.utils.log')`
	`1`	`+local log = require('java.utils.log')`
`2`	`2`
`3`	`3`	`local pkgs = {`
`4`	`4`	`{`