Skip to content

Commit e91482b

Browse files
committed
refactor: move out ClasspathProvider and Binaries of the spec_builder module
1 parent 5df8706 commit e91482b

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

lua/neotest-java/core/spec_builder/init.lua

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,28 @@ local Binaries = require("neotest-java.command.binaries")
2828

2929
local SpecBuilder = {}
3030

31+
local should_not_reach_here = function()
32+
error("should not reach here")
33+
end
34+
3135
--- @type neotest-java.BuildSpecDependencies
3236
local DEFAULT_DEPENDENCIES = {
33-
mkdir = function()
34-
error("should not reach here")
35-
end,
36-
37-
chdir = function()
38-
error("should not reach here")
39-
end,
40-
41-
root_getter = function()
42-
error("should not reach here")
43-
end,
44-
37+
binaries = Binaries({
38+
client_provider = should_not_reach_here,
39+
}),
40+
mkdir = should_not_reach_here,
41+
chdir = should_not_reach_here,
42+
root_getter = should_not_reach_here,
43+
classpath_provider = ClasspathProvider({ client_provider = should_not_reach_here }),
44+
45+
-- TODO: pending to remove dependencies from this scope
4546
scan = scan,
46-
4747
compile = function(cwd, compile_mode)
4848
compilers.lsp.compile({
4949
base_dir = cwd,
5050
compile_mode = compile_mode,
5151
})
5252
end,
53-
classpath_provider = ClasspathProvider({ client_provider = client_provider }),
5453
report_folder_name_gen = function(module_dir, build_dir)
5554
local base = (module_dir and module_dir:append(build_dir:to_string())) or build_dir
5655
return base:append("junit-reports"):append(nio.fn.strftime("%d%m%y%H%M%S"))
@@ -61,7 +60,6 @@ local DEFAULT_DEPENDENCIES = {
6160
detect_project_type = function(base_dir)
6261
return detect_project_type(base_dir)
6362
end,
64-
binaries = Binaries({ client_provider = client_provider }),
6563
}
6664

6765
---@param args neotest.RunArgs

lua/neotest-java/init.lua

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
local File = require("neotest.lib.file")
2+
local client_provider = require("neotest-java.core.spec_builder.compiler.client_provider")
23

34
local FileChecker = require("neotest-java.core.file_checker")
45
local root_finder = require("neotest-java.core.root_finder")
@@ -12,6 +13,8 @@ local Path = require("neotest-java.model.path")
1213
local nio = require("nio")
1314
local logger = require("neotest-java.logger")
1415
local install = require("neotest-java.install")
16+
local Binaries = require("neotest-java.command.binaries")
17+
local ClasspathProvider = require("neotest-java.core.spec_builder.compiler.classpath_provider")
1518

1619
local DEFAULT_CONFIG = require("neotest-java.default_config")
1720

@@ -96,6 +99,10 @@ local function NeotestJavaAdapter(config, deps)
9699
check_junit_jar(config.junit_jar, config.default_version)
97100

98101
return spec_builder.build_spec(args, config, {
102+
classpath_provider = ClasspathProvider({ client_provider = client_provider }),
103+
binaries = Binaries({
104+
client_provider = client_provider,
105+
}),
99106
root_getter = root_getter,
100107
mkdir = mkdir,
101108
chdir = chdir,

0 commit comments

Comments
 (0)