Strictly specify application.properties for LS process at launch

spring-projects · Oct 11, 2024 · 7532aa3 · 7532aa3
1 parent 0954e39
commit 7532aa3
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 3 deletions.
diff --git a/...ork.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java b/...ork.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java
@@ -44,6 +44,7 @@ private List<String> getJVMArgs() {
 //		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/...framework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java b/...framework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java
@@ -30,7 +30,8 @@ public BoshLanguageServer() {
 				"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/.../springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java b/.../springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
@@ -46,7 +46,8 @@ public CloudFoundryManifestLanguageServer() {
 				"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/...ng.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java b/...ng.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java
@@ -30,7 +30,8 @@ public ConcourseLanguageServer() {
 				"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
@@ -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
@@ -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
@@ -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
@@ -48,6 +48,7 @@ export function activate(context: ExtensionContext): Thenable<ExtensionAPI> {
         preferJdk: true,
         jvmHeap: '1024m',
         vmArgs: [
+            "-Dspring.config.location=classpath:/application.properties"
         ],
         checkjvm: (context: ExtensionContext, jvm: commons.JVM) => {
             let version = jvm.getMajorVersion();