Skip to content

added basic scaffolding that should implement log and show message but it does not work yet. #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

added basic scaffolding that should implement log and show message but it does not work yet. #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b9e882
added basic scaffolding that should implement log and show message bu…
jurgenvinju Oct 3, 2022
99069d7
Merge branch 'main' into implement-log-and-show-message
jurgenvinju Oct 31, 2023
0a8520c
forgot to remove <<< HEAD
jurgenvinju Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/LSPIDEServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import org.apache.logging.log4j.Logger;
import org.eclipse.lsp4j.ApplyWorkspaceEditParams;
import org.eclipse.lsp4j.Diagnostic;
import org.eclipse.lsp4j.MessageParams;
import org.eclipse.lsp4j.MessageType;
import org.eclipse.lsp4j.ProgressParams;
import org.eclipse.lsp4j.PublishDiagnosticsParams;
import org.eclipse.lsp4j.ShowDocumentParams;
Expand Down Expand Up @@ -356,4 +358,37 @@ public void unregisterDiagnostics(IList resources) {
}
}

@Override
public void logMessage(IConstructor msg) {
languageClient.logMessage(new MessageParams(getMessageType(msg), getMessageString(msg)));
}

@Override
public void showMessage(IConstructor msg) {
languageClient.showMessage(new MessageParams(getMessageType(msg), getMessageString(msg)));
}

private String getMessageString(IConstructor msg) {
return ((IString) msg.get("msg")).getValue();
}

private MessageType getMessageType(IConstructor msg) {
MessageType type = null;
switch (msg.getName()) {
case "error":
type = MessageType.Error;
break;
case "warning":
type = MessageType.Warning;
break;
case "info":
type = MessageType.Info;
break;
default:
type = MessageType.Log;
break;
}
return type;
}

}
12 changes: 12 additions & 0 deletions rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/terminal/ITerminalIDEServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import java.util.Base64.Decoder;
import java.util.Base64.Encoder;
import java.util.concurrent.CompletableFuture;

import org.eclipse.lsp4j.MessageParams;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.eclipse.lsp4j.ShowDocumentParams;
Expand Down Expand Up @@ -93,6 +95,16 @@ default void showHTML(BrowseParameter content) {
throw new UnsupportedOperationException();
}

@JsonNotification("window/showMessage")
default void showMessage(MessageParams messageParams) {
throw new UnsupportedOperationException();
}

@JsonNotification("window/logMessage")
default void logMessage(MessageParams messageParams) {
throw new UnsupportedOperationException();
}

@JsonRequest("rascal/jobStart")
default CompletableFuture<Void> jobStart(JobStartParameter param) {
throw new UnsupportedOperationException();
Expand Down
36 changes: 36 additions & 0 deletions rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/terminal/TerminalIDEClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
import java.net.URI;
import java.util.concurrent.ExecutionException;

import org.eclipse.lsp4j.MessageParams;
import org.eclipse.lsp4j.MessageType;
import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.ShowDocumentParams;
import org.eclipse.lsp4j.jsonrpc.Launcher;
import org.rascalmpl.exceptions.RuntimeExceptionFactory;
Expand Down Expand Up @@ -250,6 +253,39 @@ public void unregisterDiagnostics(IList resources) {
server.unregisterDiagnostics(new UnRegisterDiagnosticsParameters(resources));
}

@Override
public void logMessage(IConstructor msg) {
server.logMessage(new MessageParams(getMessageType(msg), getMessageString(msg)));
}

@Override
public void showMessage(IConstructor msg) {
server.showMessage(new MessageParams(getMessageType(msg), getMessageString(msg)));
}

private String getMessageString(IConstructor msg) {
return ((IString) msg.get("msg")).getValue();
}

private MessageType getMessageType(IConstructor msg) {
MessageType type = null;
switch (msg.getName()) {
case "error":
type = MessageType.Error;
break;
case "warning":
type = MessageType.Warning;
break;
case "info":
type = MessageType.Info;
break;
default:
type = MessageType.Log;
break;
}
return type;
}

public void startDebuggingSession(int serverPort){
server.startDebuggingSession(serverPort);
}
Expand Down
10 changes: 10 additions & 0 deletions rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/terminal/TerminalIDEServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,16 @@ public CompletableFuture<ShowDocumentResult> edit(ShowDocumentParams edit) {
return languageClient.showDocument(edit);
}

@Override
public void logMessage(MessageParams msg) {
languageClient.logMessage(msg);
}

@Override
public void showMessage(MessageParams msg) {
languageClient.logMessage(msg);
}

@Override
public CompletableFuture<SourceLocationParameter> resolveProjectLocation(SourceLocationParameter loc) {
logger.trace("resolveProjectLocation({})", loc);
Expand Down