Skip to content

Nre/remove general send message #240

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

Open
NiklasRentzCAU wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Nre/remove general send message #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f21572
use LSP's showMessage feature instead of custom extension. Deprecate old
NiklasRentzCAU Jan 28, 2026
318c6de
remove deprecated general/sendMessage notification
NiklasRentzCAU Jan 28, 2026
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
8 changes: 1 addition & 7 deletions ...ns/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLanguageClient.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* http://rtsys.informatik.uni-kiel.de/kieler
*
* Copyright 2020 by
* Copyright 2020-2026 by
* + Kiel University
* + Department of Computer Science
* + Real-Time and Embedded Systems Group
Expand All @@ -27,12 +27,6 @@ import org.eclipse.lsp4j.services.LanguageClient
*/
interface KGraphLanguageClient extends LanguageClient {

/**
* Send to client if some message should be displayed. {@code type} is one of "info", "warn", and "error".
*/
@JsonNotification("general/sendMessage")
def void sendMessage(String message, String type)

/**
* Send to the client to replace the given range of the file given by the URI by the code string.
*/
Expand Down
10 changes: 6 additions & 4 deletions ....cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLanguageServerExtension.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* http://rtsys.informatik.uni-kiel.de/kieler
*
* Copyright 2018-2025 by
* Copyright 2018-2026 by
* + Kiel University
* + Department of Computer Science
* + Real-Time and Embedded Systems Group
Expand Down Expand Up @@ -48,6 +48,8 @@ import org.eclipse.emf.ecore.resource.Resource
import org.eclipse.lsp4j.DocumentHighlight
import org.eclipse.lsp4j.DocumentHighlightParams
import org.eclipse.lsp4j.InitializeParams
import org.eclipse.lsp4j.MessageParams
import org.eclipse.lsp4j.MessageType
import org.eclipse.lsp4j.services.LanguageClient
import org.eclipse.sprotty.ActionMessage
import org.eclipse.sprotty.DiagramOptions
Expand Down Expand Up @@ -616,23 +618,23 @@ class KGraphLanguageServerExtension extends SyncDiagramLanguageServer

override sendError(String message) {
if (this.kgraphLanguageClient !== null) {
this.kgraphLanguageClient.sendMessage(LSPUtil.escapeHtml(message), "error")
this.kgraphLanguageClient.showMessage(new MessageParams(MessageType.Error, LSPUtil.escapeHtml(message)))
return true
}
return false
}

override sendWarning(String message) {
if (this.kgraphLanguageClient !== null) {
this.kgraphLanguageClient.sendMessage(LSPUtil.escapeHtml(message), "warn")
this.kgraphLanguageClient.showMessage(new MessageParams(MessageType.Warning, LSPUtil.escapeHtml(message)))
return true
}
return false
}

override sendInfo(String message) {
if (this.kgraphLanguageClient !== null) {
this.kgraphLanguageClient.sendMessage(LSPUtil.escapeHtml(message), "info")
this.kgraphLanguageClient.showMessage(new MessageParams(MessageType.Info, LSPUtil.escapeHtml(message)))
return true
}
return false
Expand Down
14 changes: 8 additions & 6 deletions ...e.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLsCreator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* http://rtsys.informatik.uni-kiel.de/kieler
*
* Copyright 2019-2021 by
* Copyright 2019-2026 by
* + Kiel University
* + Department of Computer Science
* + Real-Time and Embedded Systems Group
Expand Down Expand Up @@ -41,6 +41,8 @@ import java.util.function.Function
import org.apache.log4j.AsyncAppender
import org.apache.log4j.Logger
import org.eclipse.core.runtime.IStatus
import org.eclipse.lsp4j.MessageParams
import org.eclipse.lsp4j.MessageType
import org.eclipse.lsp4j.jsonrpc.Launcher.Builder
import org.eclipse.lsp4j.jsonrpc.MessageConsumer
import org.eclipse.lsp4j.services.LanguageClient
Expand Down Expand Up @@ -181,18 +183,18 @@ abstract class AbstractLsCreator implements ILsCreator {
// Register a new status handler that forwards the messages to the client.
Klighd.setStatusManager( [status, style |
if (style !== IKlighdStatusManager.NONE) {
var String type
var MessageType type
switch (status.getSeverity()) {
case IStatus.INFO:
type = "info"
type = MessageType.Info
case IStatus.WARNING:
type = "warn"
type = MessageType.Warning
case IStatus.ERROR:
type = "error"
type = MessageType.Error
default:
return
}
languageClient.sendMessage(statusToMessage(status), type)
languageClient.showMessage(new MessageParams(type, statusToMessage(status)))
}
])
}
Expand Down