refactor: changes after dap apis transfer from java core to java dap (nvim-java#39)

s1n7ax · web-flow · commit cff44483bd87 · 2023-12-03T01:32:41.000+05:30
* refactor: changes related to dap API transfer from java-core to java-dap

* chore: remove unwanted test config

* fix(test): add missing dep to java-dap for testing
diff --git a/lua/java/dap/init.lua b/lua/java/dap/init.lua
@@ -5,16 +5,17 @@ local win_util = require('java.utils.window')
 local async = require('java-core.utils.async').sync
 local notify = require('java-core.utils.notify')
 
-local JavaCoreDap = require('java-core.dap')
+local DapSetup = require('java-dap.api.setup')
+local DapRunner = require('java-dap.api.runner')
+
 local JavaCoreTestApi = require('java-core.api.test')
 local JavaCoreTestClient = require('java-core.ls.clients.java-test-client')
-local JavaCoreDapRunner = require('java-core.dap.runner')
 
 ---@class JavaDap
 ---@field private client LspClient
 ---@field private dap JavaCoreDap
 ---@field private test_api java_core.TestApi
----@field private test_client java_core.TestClient
+---@field private test_client java-core.TestClient
 local M = {}
 
 ---@param args { client: LspClient }
@@ -26,16 +27,10 @@ function M:new(args)
 
 	o.test_api = JavaCoreTestApi:new({
 		client = args.client,
-		runner = JavaCoreDapRunner:new(),
-	})
-
-	o.test_client = JavaCoreTestClient:new({
-		client = args.client,
+		runner = DapRunner(),
 	})
 
-	o.dap = JavaCoreDap:new({
-		client = args.client,
-	})
+	o.dap = DapSetup(args.client)
 
 	setmetatable(o, self)
 	self.__index = self
diff --git a/tests/minimal_init.lua b/tests/minimal_init.lua
diff --git a/tests/prepare-config.lua b/tests/prepare-config.lua
@@ -1,5 +1,12 @@
 local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
 
+---@diagnostic disable: assign-type-mismatch
+---@param path string
+---@return string|nil
+local function local_plug(path)
+	return vim.fn.isdirectory(path) == 1 and path or nil
+end
+
 if not vim.loop.fs_stat(lazypath) then
 	vim.fn.system({
 		'git',
@@ -14,8 +21,6 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 local temp_path = './.test_plugins'
-local java_core_path = vim.fn.expand('~/Workspace/nvim-java-core')
-local java_test_path = vim.fn.expand('~/Workspace/nvim-java-test')
 
 require('lazy').setup({
 	{
@@ -25,13 +30,19 @@ require('lazy').setup({
 	{
 		'nvim-java/nvim-java-test',
 		---@diagnostic disable-next-line: assign-type-mismatch
-		dir = vim.fn.isdirectory(java_test_path) == 1 and java_test_path or nil,
+		dir = local_plug('~/Workspace/nvim-java-test'),
 		lazy = false,
 	},
 	{
 		'nvim-java/nvim-java-core',
 		---@diagnostic disable-next-line: assign-type-mismatch
-		dir = vim.fn.isdirectory(java_core_path) == 1 and java_core_path or nil,
+		dir = local_plug('~/Workspace/nvim-java-core'),
+		lazy = false,
+	},
+	{
+		'nvim-java/nvim-java-dap',
+		---@diagnostic disable-next-line: assign-type-mismatch
+		dir = local_plug('~/Workspace/nvim-java-dap'),
 		lazy = false,
 	},
 	{
diff --git a/tests/test-config.lua b/tests/test-config.lua
@@ -1,16 +1,25 @@
-local java_core_path = vim.fn.expand('~/Workspace/nvim-java-core')
-local java_test_path = vim.fn.expand('~/Workspace/nvim-java-test')
+---@diagnostic disable: assign-type-mismatch
+---@param dev_path string
+---@param plug_path string
+---@return string|nil
+local function local_plug(dev_path, plug_path)
+	return (vim.fn.isdirectory(dev_path) == 1) and dev_path or plug_path
+end
 
 local plug_path = './.test_plugins'
 
-java_core_path = (vim.fn.isdirectory(java_core_path) == 1) and java_core_path
-	or (plug_path .. '/nvim-java-core')
-
-java_test_path = (vim.fn.isdirectory(java_test_path) == 1) and java_test_path
-	or (plug_path .. '/nvim-java-test')
-
 vim.opt.rtp:append(plug_path .. '/plenary.nvim')
 vim.opt.rtp:append(plug_path .. '/nvim-lspconfig')
 vim.opt.rtp:append(plug_path .. '/mason.nvim')
-vim.opt.rtp:append(java_core_path)
-vim.opt.rtp:append(java_test_path)
+
+vim.opt.rtp:append(
+	local_plug('~/Workspace/nvim-java-core', plug_path .. '/nvim-java-core')
+)
+
+vim.opt.rtp:append(
+	local_plug('~/Workspace/nvim-java-test', plug_path .. '/nvim-java-test')
+)
+
+vim.opt.rtp:append(
+	local_plug('~/Workspace/nvim-java-dap', plug_path .. '/nvim-java-dap')
+)
