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

Fix multi-root initialization in SimpleWorkspaceService

Browse Source
This commit is contained in:
Kris De Volder
2018-03-05 15:51:34 -08:00
parent 3c92ce60cc
commit 5171b0c4fe
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
View File

@@ -70,6 +70,9 @@ import org.springframework.ide.vscode.commons.util.Log;
import org.springframework.ide.vscode.commons.util.text.TextDocument;
import com.google.common.collect.ImmutableList;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Scheduler;
@@ -233,6 +236,7 @@ public class SimpleLanguageServer implements Sts4LanguageServer, LanguageClientA
if (ih!=null){
ih.accept(params);
}
Log.info("IntializeResult = {}");
return CompletableFuture.completedFuture(result);
}
@@ -251,23 +255,23 @@ public class SimpleLanguageServer implements Sts4LanguageServer, LanguageClientA
List<WorkspaceFolder> initialFolders = new ArrayList<>();
Object initOptions = params.getInitializationOptions();
if (initOptions != null && initOptions instanceof Map) {
Map<?, ?> initializationOptions = (Map<?, ?>) initOptions;
Object folders = initializationOptions.get("workspaceFolders");
if (folders != null && folders instanceof List) {
List<?> workspaceFolders = (List<?>) folders;
for (Object object : workspaceFolders) {
String folderPath = object.toString();
if (initOptions != null && initOptions instanceof JsonObject) {
JsonObject initializationOptions = (JsonObject) initOptions;
JsonElement folders = initializationOptions.get("workspaceFolders");
if (folders != null && folders instanceof JsonArray) {
JsonArray workspaceFolders = (JsonArray) folders;
for (JsonElement object : workspaceFolders) {
String folderUri = object.getAsString();
String folderName = null;
int folderNameStart = folderPath.lastIndexOf("/");
int folderNameStart = folderUri.lastIndexOf("/");
if (folderNameStart > 0) {
folderName = folderPath.substring(folderPath.lastIndexOf("/") + 1);
folderName = folderUri.substring(folderUri.lastIndexOf("/") + 1);
}
WorkspaceFolder folder = new WorkspaceFolder();
folder.setName(folderName);
folder.setUri(object.toString());
folder.setUri(folderUri);
initialFolders.add(folder);
}

6
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleWorkspaceService.java
View File

@@ -26,6 +26,8 @@ import org.eclipse.lsp4j.WorkspaceFolder;
import org.eclipse.lsp4j.WorkspaceFoldersChangeEvent;
import org.eclipse.lsp4j.WorkspaceSymbolParams;
import org.eclipse.lsp4j.services.WorkspaceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.util.Assert;
import org.springframework.ide.vscode.commons.util.FileObserver;
import org.springframework.ide.vscode.commons.util.Log;
@@ -36,6 +38,8 @@ import reactor.core.publisher.Mono;
public class SimpleWorkspaceService implements WorkspaceService {
private static Logger log = LoggerFactory.getLogger(SimpleWorkspaceService.class);
private SimpleLanguageServer server;
private Set<WorkspaceFolder> workspaceRoots = new HashSet<>();
@@ -160,7 +164,7 @@ public class SimpleWorkspaceService implements WorkspaceService {
public synchronized void setWorkspaceFolders(List<WorkspaceFolder> workspaceFolders) {
workspaceRoots = new HashSet<>();
workspaceRoots.addAll(workspaceFolders);
log.debug("workspaceFolders = {}", workspaceFolders);
}
}

1
headless-services/commons/commons-language-server/src/main/resources/simplelogger.properties Normal file
View File

@@ -0,0 +1 @@
#org.slf4j.simpleLogger.log.org.springframework.ide.vscode.commons.languageserver.util.SimpleWorkspaceService=debug