Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-work java services registration for VSCode

Browse Source
This commit is contained in:
aboyko
2023-01-10 15:40:04 -05:00
parent b16c7894a8
commit 3737f03e5a
7 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vscode-extensions/commons-vscode/src/classpath.ts
View File

@@ -12,11 +12,6 @@ export function registerClasspathService(client : LanguageClient) : void {
const javaExt = VSCode.extensions.getExtension('redhat.java');
const javaApi = javaExt?.exports;
if (javaApi) {
VSCode.commands.executeCommand(CMD_STS_ENABLE_CLASSPATH_LISTENER, javaApi.serverMode === JDT_SERVER_STANDARD_MODE);
javaApi.onDidServerModeChange(e => VSCode.commands.executeCommand(CMD_STS_ENABLE_CLASSPATH_LISTENER, javaApi.serverMode === JDT_SERVER_STANDARD_MODE));
}
let addRequest = new RequestType<ClasspathListenerParams, ClasspathListenerResponse, void>("sts/addClasspathListener");
client.onRequest(addRequest, async (params: ClasspathListenerParams) => {
if (javaApi?.serverMode === 'LightWeight') {
@@ -30,6 +25,11 @@ export function registerClasspathService(client : LanguageClient) : void {
return <ClasspathListenerResponse> await VSCode.commands.executeCommand("java.execute.workspaceCommand", "sts.java.removeClasspathListener", params.callbackCommandId);
});
if (javaApi) {
VSCode.commands.executeCommand(CMD_STS_ENABLE_CLASSPATH_LISTENER, javaApi.serverMode === JDT_SERVER_STANDARD_MODE);
javaApi.onDidServerModeChange(e => VSCode.commands.executeCommand(CMD_STS_ENABLE_CLASSPATH_LISTENER, javaApi.serverMode === JDT_SERVER_STANDARD_MODE));
}
}
interface ClasspathListenerParams {

4
vscode-extensions/commons-vscode/src/index.ts
View File

@@ -1,4 +1,6 @@
import {activate, ActivatorOptions} from './launch-util';
import {JVM} from '@pivotal-tools/jvm-launch-utils';
import { registerClasspathService } from './classpath';
import {registerJavaDataService} from "./java-data";
export {activate, JVM, ActivatorOptions};
export {activate, JVM, ActivatorOptions, registerClasspathService, registerJavaDataService};

7
vscode-extensions/commons-vscode/src/launch-util.ts
View File

@@ -18,9 +18,7 @@ import * as P2C from 'vscode-languageclient/lib/common/protocolConverter';
import {HighlightService, HighlightParams} from './highlight-service';
import { log } from 'util';
import { JVM, findJvm, findJdk } from '@pivotal-tools/jvm-launch-utils';
import { registerClasspathService } from './classpath';
import {HighlightCodeLensProvider} from "./code-lens-service";
import {registerJavaDataService} from "./java-data";
const p2c = P2C.createConverter(undefined, false, false);
@@ -42,7 +40,6 @@ export interface ActivatorOptions {
highlightCodeLensSettingKey?: string;
explodedLsJarData?: ExplodedLsJarData;
vmArgs?: string[];
requiresJavaLs?: boolean;
}
export interface ExplodedLsJarData {
@@ -392,10 +389,6 @@ function setupLanguageClient(context: VSCode.ExtensionContext, createServer: Ser
}
return {applied: true};
});
if (options.requiresJavaLs) {
registerClasspathService(client);
registerJavaDataService(client);
}
return Promise.resolve(client);
}