Skip to content

fix: normalize missing names in workspaceFolder responses #156

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

Merged
bentsherman merged 2 commits into from
Jun 8, 2026
+14 −3
Merged

fix: normalize missing names in workspaceFolder responses #156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62a435a
fix: normalise missing names in workspaceFolder responses
Sam-Sims May 14, 2026
1f30e1a
cleanup
bentsherman Jun 8, 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
17 changes: 14 additions & 3 deletions src/main/java/nextflow/lsp/NextflowLanguageServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
import org.eclipse.lsp4j.TextDocumentSyncKind;
import org.eclipse.lsp4j.TextEdit;
import org.eclipse.lsp4j.WorkspaceEdit;
import org.eclipse.lsp4j.WorkspaceFolder;
import org.eclipse.lsp4j.WorkspaceFoldersOptions;
import org.eclipse.lsp4j.WorkspaceServerCapabilities;
import org.eclipse.lsp4j.WorkspaceSymbol;
Expand Down Expand Up @@ -135,7 +136,7 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
var workspaceFolders = params.getWorkspaceFolders();
if( workspaceFolders != null && !workspaceFolders.isEmpty() ) {
for( var workspaceFolder : workspaceFolders ) {
var name = workspaceFolder.getName();
var name = workspaceFolderName(workspaceFolder);
var uri = workspaceFolder.getUri();
addWorkspaceFolder(name, uri);
}
Expand Down Expand Up @@ -516,14 +517,14 @@ public void didChangeWatchedFiles(DidChangeWatchedFilesParams params) {
public void didChangeWorkspaceFolders(DidChangeWorkspaceFoldersParams params) {
var event = params.getEvent();
for( var workspaceFolder : event.getRemoved() ) {
var name = workspaceFolder.getName();
var name = workspaceFolderName(workspaceFolder);
log.debug("workspace/didChangeWorkspaceFolders remove " + name);
workspaceRoots.remove(name);
configServices.remove(name).clearDiagnostics();
scriptServices.remove(name).clearDiagnostics();
}
for( var workspaceFolder : event.getAdded() ) {
var name = workspaceFolder.getName();
var name = workspaceFolderName(workspaceFolder);
var uri = workspaceFolder.getUri();
log.debug("workspace/didChangeWorkspaceFolders add " + name + " " + uri);
addWorkspaceFolder(name, uri);
Expand Down Expand Up @@ -629,6 +630,16 @@ private void addWorkspaceFolder(String name, String uri) {
scriptServices.put(name, scriptService);
}

private static String workspaceFolderName(WorkspaceFolder workspaceFolder) {
var name = workspaceFolder.getName();
var uri = workspaceFolder.getUri();
if( name == null || !name.isEmpty() || uri == null )
return name;

var path = Path.of(URI.create(uri)).getFileName();
return path != null ? path.toString() : name;
}

private String relativePath(String uri) {
return workspaceRoots.entrySet().stream()
.filter((entry) -> entry.getValue() != null && uri.startsWith(entry.getValue()))
Expand Down
Loading