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

do not configure boot ls as server for general xml docs and instead use watch files mechanism to detect changes to XML files

Browse Source
This commit is contained in:
Martin Lippert
2019-01-22 10:52:45 +01:00
parent 923a21132a
commit e8f2840966
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
View File

@@ -14,10 +14,6 @@
contentType="org.eclipse.jdt.core.javaSource"
id="org.eclipse.languageserver.languages.springboot">
</contentTypeMapping>
<contentTypeMapping
contentType="org.eclipse.core.runtime.xml"
id="org.eclipse.languageserver.languages.springboot">
</contentTypeMapping>
<contentTypeMapping
contentType="org.springframework.boot.ide.properties.application.properties"
id="org.eclipse.languageserver.languages.springboot"

48
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringSymbolIndex.java
View File

@@ -96,6 +96,10 @@ public class SpringSymbolIndex {
private SpringIndexerXML springIndexerXML;
private SpringIndexerJava springIndexerJava;
private String watchXMLDeleteRegistration;
private String watchXMLCreatedRegistration;
private String watchXMLChangedRegistration;
private SimpleWorkspaceService getWorkspaceService() {
return server.getServer().getWorkspaceService();
}
@@ -143,8 +147,7 @@ public class SpringSymbolIndex {
}
public void serverInitialized() {
List<String> globPattern = Arrays.stream(this.indexer).map(indexer ->
indexer.getFileWatchPatterns()).flatMap(Arrays::stream).collect(Collectors.toList());
List<String> globPattern = Arrays.asList(springIndexerJava.getFileWatchPatterns());
getWorkspaceService().getFileObserver().onFileDeleted(globPattern, (file) -> {
deleteDocument(new TextDocumentIdentifier(file).getUri());
@@ -157,6 +160,38 @@ public class SpringSymbolIndex {
});
}
public void configureIndexer(boolean springXMLSupportEnabled) {
synchronized (this) {
if (springXMLSupportEnabled && !(Arrays.asList(this.indexer).contains(springIndexerXML))) {
this.indexer = new SpringIndexer[] {springIndexerJava, springIndexerXML};
List<String> globPattern = Arrays.asList(springIndexerXML.getFileWatchPatterns());
watchXMLDeleteRegistration = getWorkspaceService().getFileObserver().onFileDeleted(globPattern, (file) -> {
deleteDocument(new TextDocumentIdentifier(file).getUri());
});
watchXMLCreatedRegistration = getWorkspaceService().getFileObserver().onFileCreated(globPattern, (file) -> {
createDocument(new TextDocumentIdentifier(file).getUri());
});
watchXMLChangedRegistration = getWorkspaceService().getFileObserver().onFileChanged(globPattern, (file) -> {
updateDocument(new TextDocumentIdentifier(file).getUri(), null);
});
}
else if (!springXMLSupportEnabled && Arrays.asList(this.indexer).contains(springIndexerXML)) {
this.indexer = new SpringIndexer[] {springIndexerJava};
getWorkspaceService().getFileObserver().unsubscribe(watchXMLChangedRegistration);
getWorkspaceService().getFileObserver().unsubscribe(watchXMLCreatedRegistration);
getWorkspaceService().getFileObserver().unsubscribe(watchXMLDeleteRegistration);
watchXMLChangedRegistration = null;
watchXMLCreatedRegistration = null;
watchXMLDeleteRegistration = null;
}
}
}
public void shutdown() {
try {
synchronized(this) {
@@ -173,15 +208,6 @@ public class SpringSymbolIndex {
}
}
public void configureIndexer(boolean springXMLSupportEnabled) {
if (springXMLSupportEnabled) {
this.indexer = new SpringIndexer[] {springIndexerJava, springIndexerXML};
}
else {
this.indexer = new SpringIndexer[] {springIndexerJava};
}
}
public CompletableFuture<Void> initializeProject(IJavaProject project) {
try {
if (SpringProjectUtil.isBootProject(project) || SpringProjectUtil.isSpringProject(project)) {