From 93223d561e7f0281cc473cecc0de5e6404c0cf2b Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 15 Feb 2018 17:06:07 -0800 Subject: [PATCH] More attempt to fix vscode-spring-boot launcher code --- vscode-extensions/vscode-spring-boot/lib/Main.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/vscode-extensions/vscode-spring-boot/lib/Main.ts b/vscode-extensions/vscode-spring-boot/lib/Main.ts index 17f8e2ecc..a07ad3734 100644 --- a/vscode-extensions/vscode-spring-boot/lib/Main.ts +++ b/vscode-extensions/vscode-spring-boot/lib/Main.ts @@ -8,7 +8,7 @@ import * as FS from 'fs'; import * as Net from 'net'; import * as ChildProcess from 'child_process'; import {LanguageClient, LanguageClientOptions, SettingMonitor, ServerOptions, StreamInfo} from 'vscode-languageclient'; -import {TextDocument} from 'vscode'; +import { workspace, TextDocument } from 'vscode'; import * as commons from 'commons-vscode'; @@ -22,7 +22,8 @@ export function activate(context: VSCode.ExtensionContext) { DEBUG: false, CONNECT_TO_LS: false, extensionId: 'vscode-spring-boot', - launcher: (context: VSCode.ExtensionContext) => Path.resolve(context.extensionPath, 'jars/language-server.jar'), + preferJdk: true, + launcher: (context: VSCode.ExtensionContext) => 'org.springframework.boot.loader.JarLauncher', classpath: (context: VSCode.ExtensionContext, jvm: commons.JVM) => { const classpath = [ Path.resolve(context.extensionPath, 'jars/language-server.jar') @@ -37,7 +38,14 @@ export function activate(context: VSCode.ExtensionContext) { return classpath; }, clientOptions: { - documentSelector: [ PROPERTIES_LANGUAGE_ID, YAML_LANGUAGE_ID, JAVA_LANGUAGE_ID ] + documentSelector: [ PROPERTIES_LANGUAGE_ID, YAML_LANGUAGE_ID, JAVA_LANGUAGE_ID ], + synchronize: { + configurationSection: 'boot-java' + }, + initializationOptions: { + workspaceFolders: workspace.workspaceFolders ? workspace.workspaceFolders.map(f => f.uri.toString()) : null + }, + } }; let clientPromise = commons.activate(options, context);