refactor: moved compilation function to another module

Author: rcasia

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

@@ -1,21 +1,5 @@
-local jdtls_compiler = require("neotest-java.core.spec_builder.compiler.jdtls")
-
----@class NeotestJavaCompiler.Opts
----@field cwd string
----@field classpath_file_dir string
----@field compile_mode string
-
---- Interface for Java compilers
----@class NeotestJavaCompiler
-local NeotestJavaCompiler = {}
-
----@param opts NeotestJavaCompiler.Opts
----@return string classpath_file_arg
-function NeotestJavaCompiler.compile(opts) end
-
----@type table<string, NeotestJavaCompiler>
 local compilers = {
-	jdtls = jdtls_compiler,
+	jdtls = require("neotest-java.core.spec_builder.compiler.jdtls"),
 }
 
 return compilers

lua/neotest-java/core/spec_builder/compiler/jdtls.lua

@@ -3,31 +3,35 @@ local nio = require("nio")
 local _jdtls = require("neotest-java.command.jdtls")
 local scan = require("plenary.scandir")
 
----@type NeotestJavaCompiler
-local jdtls_compiler = {
-	compile = function(args)
-		-- check that required dependencies are present
-		local ok_jdtls, jdtls = pcall(require, "jdtls")
-		assert(ok_jdtls, "neotest-java requires nvim-jdtls to tests")
+---@class NeotestJava.compilerOpts
+---@field cwd string
+---@field classpath_file_dir string
+---@field compile_mode string
 
-		-- check there is an active java client
-		local has_jdtls_client = #nio.lsp.get_clients({ name = "jdtls" }) ~= 0
-		assert(has_jdtls_client, "there is no jdtls client attached.")
+---@param args NeotestJava.compilerOpts
+---@return string classpath_file_arg
+local function compile(args)
+	-- check that required dependencies are present
+	local ok_jdtls, jdtls = pcall(require, "jdtls")
+	assert(ok_jdtls, "neotest-java requires nvim-jdtls to tests")
 
-		logger.debug(("compilation in %s mode"):format(args.compile_mode))
-		nio.run(function(_)
-			nio.scheduler()
-			jdtls.compile(args.compile_mode)
-		end):wait()
-		logger.debug("compilation complete!")
+	-- check there is an active java client
+	local has_jdtls_client = #nio.lsp.get_clients({ name = "jdtls" }) ~= 0
+	assert(has_jdtls_client, "there is no jdtls client attached.")
 
-		local resources = scan.scan_dir(args.cwd, {
-			only_dirs = true,
-			search_pattern = "test/resources$",
-		})
+	logger.debug(("compilation in %s mode"):format(args.compile_mode))
+	nio.run(function(_)
+		nio.scheduler()
+		jdtls.compile(args.compile_mode)
+	end):wait()
+	logger.debug("compilation complete!")
 
-		return _jdtls.get_classpath_file_argument(args.classpath_file_dir, resources)
-	end,
-}
+	local resources = scan.scan_dir(args.cwd, {
+		only_dirs = true,
+		search_pattern = "test/resources$",
+	})
 
-return jdtls_compiler
+	return _jdtls.get_classpath_file_argument(args.classpath_file_dir, resources)
+end
+
+return compile

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

@@ -16,7 +16,7 @@ local compatible_path = require("neotest-java.util.compatible_path")
 local Project = require("neotest-java.types.project")
 local ch = require("neotest-java.context_holder")
 local find_module_by_filepath = require("neotest-java.util.find_module_by_filepath")
-local _jdtls = require("neotest-java.command.jdtls")
+local compiler = require("neotest-java.core.spec_builder.compiler")
 
 local SpecBuilder = {}
 
@@ -25,12 +25,6 @@ local SpecBuilder = {}
 ---@param config neotest-java.ConfigOpts
 ---@return nil | neotest.RunSpec | neotest.RunSpec[]
 function SpecBuilder.build_spec(args, project_type, config)
-	local scan = require("plenary.scandir")
-
-	-- check that required dependencies are present
-	local ok_jdtls, jdtls = pcall(require, "jdtls")
-	assert(ok_jdtls, "neotest-java requires nvim-jdtls to tests")
-
 	if args.strategy == "dap" then
 		local ok_dap, _ = pcall(require, "dap")
 		assert(ok_dap, "neotest-java requires nvim-dap to run debug tests")