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

Merge branch 'main' of github.com:spring-projects/sts4 into main

Browse Source
This commit is contained in:
Kris De Volder
2022-04-06 08:07:53 -07:00
parent bf7389ca9e f7ec7590a9
commit 93bc0504d2
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessCommandHandler.java
View File

@@ -205,10 +205,10 @@ public class SpringProcessCommandHandler {
private CompletableFuture<Object> get(ExecuteCommandParams params) {
String processKey = getProcessKey(params);
String dataKey = getArgumentByKey(params, "dataKey");
String endpoint = getArgumentByKey(params, "endpoint");
if (processKey != null) {
SpringProcessLiveData data = connectorService.getLiveData(processKey);
switch(dataKey) {
switch(endpoint) {
case "properties": {
return CompletableFuture.completedFuture(data.getLiveProperties());
}

5
vscode-extensions/vscode-spring-boot/lib/apiManager.ts
View File

@@ -9,17 +9,16 @@ export class ApiManager {
private onDidLiveProcessDisconnectEmitter: Emitter<string> = new Emitter<string>();
private onDidLiveProcessUpdateEmitter: Emitter<string> = new Emitter<string>();
public constructor(private client: LanguageClient) {
public constructor(client: LanguageClient) {
const onDidLiveProcessConnect = this.onDidLiveProcessConnectEmitter.event;
const onDidLiveProcessDisconnect = this.onDidLiveProcessDisconnectEmitter.event;
const onDidLiveProcessUpdate = this.onDidLiveProcessUpdateEmitter.event;
const COMMAND_LIVEDATA_GET = "sts/livedata/get";
const getLiveProcessData = async (query) => {
await commands.executeCommand(COMMAND_LIVEDATA_GET, query);
return await commands.executeCommand(COMMAND_LIVEDATA_GET, query);
}
// TODO: STS server should send corresponding notification back.
client.onNotification(LiveProcessConnectedNotification.type, (processKey: string) => this.onDidLiveProcessConnectEmitter.fire(processKey));
client.onNotification(LiveProcessDisconnectedNotification.type, (processKey: string) => this.onDidLiveProcessDisconnectEmitter.fire(processKey));
client.onNotification(LiveProcessUpdatedNotification.type, (processKey: string) => this.onDidLiveProcessUpdateEmitter.fire(processKey));