From 7532aa35a8078d6576104d4188c32f8b871674b9 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 11 Oct 2024 17:19:23 -0400 Subject: [PATCH] Strictly specify `application.properties` for LS process at launch --- .../tooling/boot/ls/SpringBootLanguageServer.java | 1 + .../springframework/tooling/bosh/ls/BoshLanguageServer.java | 3 ++- .../manifest/ls/CloudFoundryManifestLanguageServer.java | 3 ++- .../tooling/concourse/ls/ConcourseLanguageServer.java | 3 ++- vscode-extensions/vscode-bosh/lib/Main.ts | 3 +++ vscode-extensions/vscode-concourse/lib/Main.ts | 3 +++ vscode-extensions/vscode-manifest-yaml/lib/Main.ts | 3 +++ vscode-extensions/vscode-spring-boot/lib/Main.ts | 1 + 8 files changed, 17 insertions(+), 3 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java index aa210a5d5..53703440b 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java @@ -44,6 +44,7 @@ public class SpringBootLanguageServer extends STS4LanguageServerProcessStreamCon // args.add("-Xrunjdwp:server=y,transport=dt_socket,address=1044,suspend=n"); args.add("-Xmx1024m"); args.add("-XX:TieredStopAtLevel=1"); + args.add("-Dspring.config.location=classpath:/application.properties"); addCustomJVMArgs(args); diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java index 899c5f0c0..b8dae64d5 100644 --- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java +++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java @@ -30,7 +30,8 @@ public class BoshLanguageServer extends STS4LanguageServerProcessStreamConnector "bosh-language-server", Arrays.asList( "-Dlsp.lazy.completions.disable=true", - "-XX:TieredStopAtLevel=1" + "-XX:TieredStopAtLevel=1", + "-Dspring.config.location=classpath:/application.properties" ) ); diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java index 33934ddfe..9a3da732c 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java @@ -46,7 +46,8 @@ public class CloudFoundryManifestLanguageServer extends STS4LanguageServerProces "manifest-yaml-language-server", Arrays.asList( "-Dlsp.lazy.completions.disable=true", - "-XX:TieredStopAtLevel=1" + "-XX:TieredStopAtLevel=1", + "-Dspring.config.location=classpath:/application.properties" ) ); diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java index 0764674dc..19f9d5187 100644 --- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java +++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java @@ -30,7 +30,8 @@ public class ConcourseLanguageServer extends STS4LanguageServerProcessStreamConn "concourse-language-server", Arrays.asList( "-Dlsp.lazy.completions.disable=true", - "-XX:TieredStopAtLevel=1" + "-XX:TieredStopAtLevel=1", + "-Dspring.config.location=classpath:/application.properties" ) ); diff --git a/vscode-extensions/vscode-bosh/lib/Main.ts b/vscode-extensions/vscode-bosh/lib/Main.ts index efa801a61..65e2813db 100644 --- a/vscode-extensions/vscode-bosh/lib/Main.ts +++ b/vscode-extensions/vscode-bosh/lib/Main.ts @@ -27,6 +27,9 @@ export function activate(context: VSCode.ExtensionContext) { CONNECT_TO_LS: false, extensionId: 'vscode-bosh', jvmHeap: "48m", + vmArgs: [ + "-Dspring.config.location=classpath:/application.properties" + ], workspaceOptions: VSCode.workspace.getConfiguration("bosh.ls"), clientOptions: { documentSelector: [ diff --git a/vscode-extensions/vscode-concourse/lib/Main.ts b/vscode-extensions/vscode-concourse/lib/Main.ts index e6055bf39..48f4f7d11 100644 --- a/vscode-extensions/vscode-concourse/lib/Main.ts +++ b/vscode-extensions/vscode-concourse/lib/Main.ts @@ -30,6 +30,9 @@ export function activate(context: VSCode.ExtensionContext) { CONNECT_TO_LS: false, extensionId: 'vscode-concourse', jvmHeap: "48m", + vmArgs: [ + "-Dspring.config.location=classpath:/application.properties" + ], workspaceOptions: VSCode.workspace.getConfiguration("concourse.ls"), clientOptions: { documentSelector: [ diff --git a/vscode-extensions/vscode-manifest-yaml/lib/Main.ts b/vscode-extensions/vscode-manifest-yaml/lib/Main.ts index 0e0ff9230..66609fd26 100644 --- a/vscode-extensions/vscode-manifest-yaml/lib/Main.ts +++ b/vscode-extensions/vscode-manifest-yaml/lib/Main.ts @@ -28,6 +28,9 @@ export function activate(context: VSCode.ExtensionContext) { extensionId: 'vscode-manifest-yaml', workspaceOptions: VSCode.workspace.getConfiguration("cloudfoundry-manifest.ls"), jvmHeap: '64m', + vmArgs: [ + "-Dspring.config.location=classpath:/application.properties" + ], clientOptions: { documentSelector: [ { diff --git a/vscode-extensions/vscode-spring-boot/lib/Main.ts b/vscode-extensions/vscode-spring-boot/lib/Main.ts index 483335889..c5ae4278d 100644 --- a/vscode-extensions/vscode-spring-boot/lib/Main.ts +++ b/vscode-extensions/vscode-spring-boot/lib/Main.ts @@ -48,6 +48,7 @@ export function activate(context: ExtensionContext): Thenable { preferJdk: true, jvmHeap: '1024m', vmArgs: [ + "-Dspring.config.location=classpath:/application.properties" ], checkjvm: (context: ExtensionContext, jvm: commons.JVM) => { let version = jvm.getMajorVersion();