From e53e08271cd592a100de7ac0656edb6abb51aae2 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 19 Jul 2017 16:16:32 -0700 Subject: [PATCH] Use stale asts for hoverinfo provider (makes it work slightly better responsive when file doesn't presently parse) --- .../springframework/ide/vscode/bosh/BoshLanguageServer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshLanguageServer.java b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshLanguageServer.java index 42bd25011..31757f0cc 100644 --- a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshLanguageServer.java +++ b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshLanguageServer.java @@ -22,7 +22,6 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguage import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; import org.springframework.ide.vscode.commons.util.text.LanguageId; import org.springframework.ide.vscode.commons.util.text.TextDocument; -import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider; import org.springframework.ide.vscode.commons.yaml.ast.YamlAstCache; import org.springframework.ide.vscode.commons.yaml.completion.SchemaBasedYamlAssistContextProvider; import org.springframework.ide.vscode.commons.yaml.completion.YamlAssistContextProvider; @@ -43,7 +42,6 @@ public class BoshLanguageServer extends SimpleLanguageServer { public BoshLanguageServer(DynamicModelProvider cloudConfigProvider) { super("vscode-bosh"); YamlAstCache asts = new YamlAstCache(); - YamlASTProvider parser = asts.getAstProvider(false); SimpleTextDocumentService documents = getTextDocumentService(); ASTTypeCache astTypeCache = new ASTTypeCache(); @@ -54,10 +52,10 @@ public class BoshLanguageServer extends SimpleLanguageServer { YamlCompletionEngine yamlCompletionEngine = new YamlCompletionEngine(structureProvider, contextProvider, YamlCompletionEngineOptions.DEFAULT); completionEngine = new VscodeCompletionEngineAdapter(this, yamlCompletionEngine); completionEngine.setLazyCompletionResolver(completionResolver); - HoverInfoProvider infoProvider = new YamlHoverInfoProvider(parser, structureProvider, contextProvider); + HoverInfoProvider infoProvider = new YamlHoverInfoProvider(asts.getAstProvider(true), structureProvider, contextProvider); VscodeHoverEngine hoverEngine = new VscodeHoverEngineAdapter(this, infoProvider); YamlQuickfixes quickfixes = new YamlQuickfixes(getQuickfixRegistry(), getTextDocumentService(), structureProvider); - YamlSchemaBasedReconcileEngine engine = new YamlSchemaBasedReconcileEngine(parser, schema, quickfixes); + YamlSchemaBasedReconcileEngine engine = new YamlSchemaBasedReconcileEngine(asts.getAstProvider(false), schema, quickfixes); engine.setTypeCollector(astTypeCache); documents.onDocumentSymbol(new TypeBasedYamlSymbolHandler(documents, astTypeCache, schema.getDefinitionTypes()));