Skip to content

Commit 7532aa3

Browse files
committed
Strictly specify application.properties for LS process at launch
1 parent 0954e39 commit 7532aa3

File tree

8 files changed

+17
-3
lines changed

8 files changed

+17
-3
lines changed

eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ private List<String> getJVMArgs() {
4444
// args.add("-Xrunjdwp:server=y,transport=dt_socket,address=1044,suspend=n");
4545
args.add("-Xmx1024m");
4646
args.add("-XX:TieredStopAtLevel=1");
47+
args.add("-Dspring.config.location=classpath:/application.properties");
4748

4849
addCustomJVMArgs(args);
4950

eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public BoshLanguageServer() {
3030
"bosh-language-server",
3131
Arrays.asList(
3232
"-Dlsp.lazy.completions.disable=true",
33-
"-XX:TieredStopAtLevel=1"
33+
"-XX:TieredStopAtLevel=1",
34+
"-Dspring.config.location=classpath:/application.properties"
3435
)
3536
);
3637

eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ public CloudFoundryManifestLanguageServer() {
4646
"manifest-yaml-language-server",
4747
Arrays.asList(
4848
"-Dlsp.lazy.completions.disable=true",
49-
"-XX:TieredStopAtLevel=1"
49+
"-XX:TieredStopAtLevel=1",
50+
"-Dspring.config.location=classpath:/application.properties"
5051
)
5152
);
5253

eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public ConcourseLanguageServer() {
3030
"concourse-language-server",
3131
Arrays.asList(
3232
"-Dlsp.lazy.completions.disable=true",
33-
"-XX:TieredStopAtLevel=1"
33+
"-XX:TieredStopAtLevel=1",
34+
"-Dspring.config.location=classpath:/application.properties"
3435
)
3536
);
3637

vscode-extensions/vscode-bosh/lib/Main.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ export function activate(context: VSCode.ExtensionContext) {
2727
CONNECT_TO_LS: false,
2828
extensionId: 'vscode-bosh',
2929
jvmHeap: "48m",
30+
vmArgs: [
31+
"-Dspring.config.location=classpath:/application.properties"
32+
],
3033
workspaceOptions: VSCode.workspace.getConfiguration("bosh.ls"),
3134
clientOptions: {
3235
documentSelector: [

vscode-extensions/vscode-concourse/lib/Main.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ export function activate(context: VSCode.ExtensionContext) {
3030
CONNECT_TO_LS: false,
3131
extensionId: 'vscode-concourse',
3232
jvmHeap: "48m",
33+
vmArgs: [
34+
"-Dspring.config.location=classpath:/application.properties"
35+
],
3336
workspaceOptions: VSCode.workspace.getConfiguration("concourse.ls"),
3437
clientOptions: {
3538
documentSelector: [

vscode-extensions/vscode-manifest-yaml/lib/Main.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ export function activate(context: VSCode.ExtensionContext) {
2828
extensionId: 'vscode-manifest-yaml',
2929
workspaceOptions: VSCode.workspace.getConfiguration("cloudfoundry-manifest.ls"),
3030
jvmHeap: '64m',
31+
vmArgs: [
32+
"-Dspring.config.location=classpath:/application.properties"
33+
],
3134
clientOptions: {
3235
documentSelector: [
3336
{

vscode-extensions/vscode-spring-boot/lib/Main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export function activate(context: ExtensionContext): Thenable<ExtensionAPI> {
4848
preferJdk: true,
4949
jvmHeap: '1024m',
5050
vmArgs: [
51+
"-Dspring.config.location=classpath:/application.properties"
5152
],
5253
checkjvm: (context: ExtensionContext, jvm: commons.JVM) => {
5354
let version = jvm.getMajorVersion();

0 commit comments

Comments
 (0)