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

Bootfication: convert xml completion engine into bean

Browse Source
This commit is contained in:
Kris De Volder
2020-10-03 10:06:59 -07:00
parent cd0eebcc15
commit a23cf242f8
8 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/composable/CompositeLanguageServerComponents.java
View File

@@ -71,9 +71,9 @@ public class CompositeLanguageServerComponents implements LanguageServerComponen
//Create composite Completion engine
this.completionEngine = new CompositeCompletionEngine();
for (Entry<LanguageId, LanguageServerComponents> entry : componentsByLanguageId.entrySet()) {
ICompletionEngine engine = entry.getValue().getCompletionEngine();
ICompletionEngine engine = entry.getValue().getCompletionEngine().orElse(null);
if (engine!=null) {
completionEngine.add(entry.getKey(), entry.getValue().getCompletionEngine());
completionEngine.add(entry.getKey(), engine);
}
}
if (builder.completionEngines!=null) {
@@ -127,8 +127,8 @@ public class CompositeLanguageServerComponents implements LanguageServerComponen
}
@Override
public ICompletionEngine getCompletionEngine() {
return completionEngine;
public Optional<ICompletionEngine> getCompletionEngine() {
return Optional.ofNullable(completionEngine);
}
@Override

11
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/composable/LanguageServerComponents.java
View File

@@ -16,12 +16,21 @@ import java.util.Set;
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine;
import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine;
import org.springframework.ide.vscode.commons.languageserver.util.HoverHandler;
import org.springframework.ide.vscode.commons.languageserver.util.LanguageSpecific;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
public interface LanguageServerComponents {
Set<LanguageId> getInterestingLanguages();
default Optional<IReconcileEngine> getReconcileEngine() { return Optional.empty(); }
ICompletionEngine getCompletionEngine();
/**
* Don't use language server components. Instead create a bean of type ICompletionEngine that implements
* {@link LanguageSpecific}. The bean will be automatically wired up to handle completion requests for
* documents of the language(s) it handles.
*/
@Deprecated
default Optional<ICompletionEngine> getCompletionEngine() { return Optional.empty(); }
HoverHandler getHoverProvider();
}

11
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java
View File

@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
import org.springframework.boot.autoconfigure.context.ConfigurationPropertiesAutoConfiguration;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
@@ -44,8 +46,10 @@ import org.springframework.ide.vscode.boot.metadata.LoggerNameProvider;
import org.springframework.ide.vscode.boot.metadata.ProjectBasedPropertyIndexProvider;
import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndex;
import org.springframework.ide.vscode.boot.metadata.ValueProviderRegistry;
import org.springframework.ide.vscode.boot.xml.SpringXMLCompletionEngine;
import org.springframework.ide.vscode.boot.yaml.completions.ApplicationYamlAssistContext;
import org.springframework.ide.vscode.commons.languageserver.LanguageServerRunner;
import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
import org.springframework.ide.vscode.commons.languageserver.util.DocumentEventListenerManager;
import org.springframework.ide.vscode.commons.languageserver.util.LspClient;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
@@ -73,8 +77,9 @@ import reactor.core.publisher.Hooks;
ConfigurationPropertiesAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class
})
@EnableConfigurationProperties(BootLsConfigProperties.class)
@ComponentScan
@EnableConfigurationProperties(BootLsConfigProperties.class)
//@SpringBootApplication
public class BootLanguagServerBootApp {
private static final String SERVER_NAME = "boot-language-server";
@@ -141,6 +146,10 @@ public class BootLanguagServerBootApp {
return new CompilationUnitCache(params.projectFinder, server, params.projectObserver);
}
@Bean SpringXMLCompletionEngine xmlCompletionEngine(SimpleLanguageServer server, JavaProjectFinder projectFinder, SpringSymbolIndex symbolIndex, BootJavaConfig config) {
return new SpringXMLCompletionEngine(server, projectFinder, symbolIndex, config);
}
@Bean JavaDocumentUriProvider javaDocumentUriProvider() {
switch (LspClient.currentClient()) {
case ECLIPSE:

3
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java
View File

@@ -11,6 +11,7 @@
package org.springframework.ide.vscode.boot.app;
import java.util.List;
import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -99,7 +100,7 @@ public class BootLanguageServerInitializer implements InitializingBean {
});
});
ICompletionEngine completionEngine = components.getCompletionEngine();
ICompletionEngine completionEngine = components.getCompletionEngine().orElse(null);
if (completionEngine!=null) {
completionEngineAdapter = server.createCompletionEngineAdapter(completionEngine);
completionEngineAdapter.setMaxCompletions(100);

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java
View File

@@ -239,8 +239,8 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent
}
@Override
public ICompletionEngine getCompletionEngine() {
return createCompletionEngine(projectFinder, propertyIndexProvider, adHocPropertyIndexProvider);
public Optional<ICompletionEngine> getCompletionEngine() {
return Optional.of(createCompletionEngine(projectFinder, propertyIndexProvider, adHocPropertyIndexProvider));
}
@Override

6
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerComponents.java
View File

@@ -127,10 +127,10 @@ public class BootPropertiesLanguageServerComponents implements LanguageServerCom
}
@Override
public ICompletionEngine getCompletionEngine() {
public Optional<ICompletionEngine> getCompletionEngine() {
ICompletionEngine propertiesCompletions = new SpringPropertiesCompletionEngine(indexProvider, typeUtilProvider, javaProjectFinder, sourceLinks);
ICompletionEngine yamlCompletions = new YamlCompletionEngine(yamlStructureProvider, yamlAssistContextProvider, COMPLETION_OPTIONS);
return (TextDocument document, int offset) -> {
return Optional.of((TextDocument document, int offset) -> {
String uri = document.getUri();
if (uri!=null) {
if (uri.endsWith(PROPERTIES)) {
@@ -144,7 +144,7 @@ public class BootPropertiesLanguageServerComponents implements LanguageServerCom
}
}
return ImmutableList.of();
};
});
}
@Override

20
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLCompletionEngine.java
View File

@@ -63,22 +63,30 @@ import org.springframework.ide.vscode.boot.xml.completions.TypeCompletionProposa
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine;
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
import org.springframework.ide.vscode.commons.languageserver.util.LanguageSpecific;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import org.springframework.ide.vscode.commons.util.text.TextDocument;
import com.google.common.collect.ImmutableList;
/**
* @author Martin Lippert
* @author Kris De Volder
*/
public class SpringXMLCompletionEngine implements ICompletionEngine {
public class SpringXMLCompletionEngine implements ICompletionEngine, LanguageSpecific {
private final Map<XMLElementKey, XMLCompletionProvider> completionProviders;
private final BootJavaConfig config;
public SpringXMLCompletionEngine(SpringXMLLanguageServerComponents springXMLLanguageServerComponents,
SimpleLanguageServer server, JavaProjectFinder projectFinder, SpringSymbolIndex symbolIndex, BootJavaConfig config) {
public SpringXMLCompletionEngine(
SimpleLanguageServer server,
JavaProjectFinder projectFinder,
SpringSymbolIndex symbolIndex,
BootJavaConfig config
) {
this.config = config;
this.completionProviders = new HashMap<>();
TypeCompletionProposalProvider classesOnlyProvider = new TypeCompletionProposalProvider(server, projectFinder, true, true, false, false);
@@ -166,4 +174,8 @@ public class SpringXMLCompletionEngine implements ICompletionEngine {
return Collections.emptyList();
}
@Override
public Collection<LanguageId> supportedLanguages() {
return ImmutableList.of(LanguageId.XML);
}
}

19
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLLanguageServerComponents.java
View File

@@ -13,12 +13,9 @@ package org.springframework.ide.vscode.boot.xml;
import java.util.Optional;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.boot.app.BootJavaConfig;
import org.springframework.ide.vscode.boot.app.BootLanguageServerParams;
import org.springframework.ide.vscode.boot.app.SpringSymbolIndex;
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine;
import org.springframework.ide.vscode.commons.languageserver.composable.LanguageServerComponents;
import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine;
@@ -35,31 +32,20 @@ public class SpringXMLLanguageServerComponents implements LanguageServerComponen
public static final Set<LanguageId> LANGUAGES = ImmutableSet.of(LanguageId.XML);
private static final Logger log = LoggerFactory.getLogger(SpringXMLLanguageServerComponents.class);
private final SimpleLanguageServer server;
private final BootLanguageServerParams serverParams;
private final JavaProjectFinder projectFinder;
private final SpringSymbolIndex symbolIndex;
private final SpringXMLCompletionEngine completionEngine;
private final SpringXMLReconcileEngine reconcileEngine;
public SpringXMLLanguageServerComponents(
SimpleLanguageServer server,
SpringSymbolIndex springIndexer,
BootLanguageServerParams serverParams,
BootJavaConfig config) {
this.server = server;
this.serverParams = serverParams;
this.projectFinder = serverParams.projectFinder;
this.symbolIndex = springIndexer;
server.doOnInitialized(this::initialized);
server.onShutdown(this::shutdown);
this.completionEngine = new SpringXMLCompletionEngine(this, server, projectFinder, symbolIndex, config);
this.reconcileEngine = new SpringXMLReconcileEngine(projectFinder);
config.addListener(ignore -> {
@@ -73,11 +59,6 @@ public class SpringXMLLanguageServerComponents implements LanguageServerComponen
return LANGUAGES;
}
@Override
public ICompletionEngine getCompletionEngine() {
return this.completionEngine;
}
@Override
public Optional<IReconcileEngine> getReconcileEngine() {
return Optional.of(this.reconcileEngine);