vscode-spring-boot 1.57 版本打包了 spring-boot-server jar

JavaHello · JavaHello · commit 581762aec50a · 2024-09-13T13:58:24.000+08:00
添加 exploded_ls_jar_data 来区分使用 -jar 启动还是 mainClass 启动
diff --git a/lua/spring_boot/config.lua b/lua/spring_boot/config.lua
@@ -4,10 +4,12 @@
 ---@field java_cmd? string The path to the java command.
 ---@field log_file? string|function The path to the spring boot ls log file.
 ---@field server vim.lsp.ClientConfig The language server configuration.
+---@field exploded_ls_jar_data boolean The exploded language server jar data.
 
 ---@type bootls.Config
 local M = {
   ls_path = nil,
+  exploded_ls_jar_data = false,
   jdtls_name = "jdtls",
   java_cmd = nil,
   log_file = nil,
diff --git a/lua/spring_boot/launch.lua b/lua/spring_boot/launch.lua
@@ -45,29 +45,44 @@ local function bootls_cmd(rt_dir, java_cmd)
     vim.notify("Spring Boot LS is not installed", vim.log.levels.WARN)
     return
   end
-  local boot_classpath = {}
-  table.insert(boot_classpath, boot_path .. "/BOOT-INF/classes")
-  table.insert(boot_classpath, boot_path .. "/BOOT-INF/lib/*")
+  if config.exploded_ls_jar_data then
+    local boot_classpath = {}
+    table.insert(boot_classpath, boot_path .. "/BOOT-INF/classes")
+    table.insert(boot_classpath, boot_path .. "/BOOT-INF/lib/*")
 
-  local cmd = {
-    java_cmd or util.java_bin(),
-    "-XX:TieredStopAtLevel=1",
-    "-Xmx1G",
-    "-XX:+UseZGC",
-    "-cp",
-    table.concat(boot_classpath, util.is_win and ";" or ":"),
-    "-Dsts.lsp.client=vscode",
-    "-Dsts.log.file=" .. logfile(rt_dir),
-    "-Dspring.config.location=file:" .. boot_path .. "/BOOT-INF/classes/application.properties",
-    -- "-Dlogging.level.org.springframework=DEBUG",
-    "org.springframework.ide.vscode.boot.app.BootLanguageServerBootApp",
-  }
-
-  return cmd
+    local cmd = {
+      java_cmd or util.java_bin(),
+      "-XX:TieredStopAtLevel=1",
+      "-Xmx1G",
+      "-XX:+UseZGC",
+      "-cp",
+      table.concat(boot_classpath, util.is_win and ";" or ":"),
+      "-Dsts.lsp.client=vscode",
+      "-Dsts.log.file=" .. logfile(rt_dir),
+      "-Dspring.config.location=file:" .. boot_path .. "/BOOT-INF/classes/application.properties",
+      -- "-Dlogging.level.org.springframework=DEBUG",
+      "org.springframework.ide.vscode.boot.app.BootLanguageServerBootApp",
+    }
+    return cmd
+  else
+    local server_jar = vim.split(vim.fn.glob(boot_path .. "/spring-boot-language-server*.jar"), "\n")
+    if #server_jar == 0 then
+      vim.notify("Spring Boot LS jar not found", vim.log.levels.WARN)
+      return
+    end
+    local cmd = {
+      java_cmd or util.java_bin(),
+      "-XX:TieredStopAtLevel=1",
+      "-Xmx1G",
+      "-XX:+UseZGC",
+      "-jar",
+      server_jar[1],
+    }
+    return cmd
+  end
 end
 
 local ls_config = {
-  -- cmd = bootls_cmd(),
   name = "spring-boot",
   filetypes = { "java", "yaml", "jproperties" },
   -- root_dir = root_dir,
