Skip to content

Commit bc034c9

Browse files
authored
Merge pull request #5 from snf/rootUri
fallback to rootUri if workspaceFolders isn't set
2 parents 1df2197 + 46a2af4 commit bc034c9

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/main/java/SouffleLanguageServer.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,15 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams initializ
8989
}
9090
// CompletableFuture.
9191
projectContext = SouffleProjectContext.getInstance();
92+
String directory = null;
9293
List<WorkspaceFolder> workspaceFolders = initializeParams.getWorkspaceFolders();
9394
if(workspaceFolders != null && !workspaceFolders.isEmpty()){
94-
String directory = URI.create(workspaceFolders.get(0).getUri()).getPath();
95+
directory = URI.create(workspaceFolders.get(0).getUri()).getPath();
96+
} else {
97+
// rootUri is deprecated. Here it's only used as a fallback if the client doesn't send any workspaceFolders
98+
directory = URI.create(initializeParams.getRootUri()).getPath();
99+
}
100+
if(directory != null) {
95101
projectContext.setProjectPath(directory);
96102
traverseWorkspace(directory);
97103
}

0 commit comments

Comments
 (0)