From 0c7b45ceba29147357db42c65ab8ebdc1fc0ec4d Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 22 May 2019 10:16:25 +0200 Subject: [PATCH] moved util-namespace-based elements to correct definition --- .../ide/vscode/boot/xml/SpringXMLCompletionEngine.java | 5 +++-- .../ide/vscode/boot/xml/XmlConfigConstants.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLCompletionEngine.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLCompletionEngine.java index 8b31fea70..efbb30234 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLCompletionEngine.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLCompletionEngine.java @@ -61,8 +61,6 @@ public class SpringXMLCompletionEngine implements ICompletionEngine { this.completionProviders.put(new XMLElementKey(BEANS_NAMESPACE, null, CONSTRUCTOR_ARG_ELEMENT, TYPE_ATTRIBUTE), classesAndInterfacesProvider); this.completionProviders.put(new XMLElementKey(BEANS_NAMESPACE, null, ARG_TYPE_ELEMENT, MATCH_ATTRIBUTE), classesAndInterfacesProvider); this.completionProviders.put(new XMLElementKey(BEANS_NAMESPACE, null, VALUE_ELEMENT, TYPE_ATTRIBUTE), classesAndInterfacesProvider); - this.completionProviders.put(new XMLElementKey(BEANS_NAMESPACE, null, null, VALUE_TYPE_ATTRIBUTE), classesAndInterfacesProvider); - this.completionProviders.put(new XMLElementKey(BEANS_NAMESPACE, null, null, KEY_TYPE_ATTRIBUTE), classesAndInterfacesProvider); this.completionProviders.put(new XMLElementKey(BEANS_NAMESPACE, null, BEAN_ELEMENT, PARENT_ATTRIBUTE), beanRefProvider); this.completionProviders.put(new XMLElementKey(BEANS_NAMESPACE, null, BEAN_ELEMENT, DEPENDS_ON_ATTRIBUTE), beanRefProvider); @@ -79,6 +77,9 @@ public class SpringXMLCompletionEngine implements ICompletionEngine { this.completionProviders.put(new XMLElementKey(BEANS_NAMESPACE, BEAN_ELEMENT, PROPERTY_ELEMENT, NAME_ATTRIBUTE), propertyNameProvider); + this.completionProviders.put(new XMLElementKey(UTIL_NAMESPACE, null, null, VALUE_TYPE_ATTRIBUTE), classesAndInterfacesProvider); + this.completionProviders.put(new XMLElementKey(UTIL_NAMESPACE, null, null, KEY_TYPE_ATTRIBUTE), classesAndInterfacesProvider); + this.completionProviders.put(new XMLElementKey(CONTEXT_NAMESPACE, null, COMPONENT_SCAN_ELEMENT, BASE_PACKAGE_ATTRIBUTE), packagesProvider); this.completionProviders.put(new XMLElementKey(CONTEXT_NAMESPACE, null, COMPONENT_SCAN_ELEMENT, NAME_GENERATOR_ATTRIBUTE), beanRefProvider); this.completionProviders.put(new XMLElementKey(CONTEXT_NAMESPACE, null, COMPONENT_SCAN_ELEMENT, SCOPE_RESOLVER_ATTRIBUTE), beanRefProvider); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XmlConfigConstants.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XmlConfigConstants.java index cb795b048..5cffc51eb 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XmlConfigConstants.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/XmlConfigConstants.java @@ -34,8 +34,6 @@ public class XmlConfigConstants { public static final String NAME_ATTRIBUTE = "name"; public static final String REF_ATTRIBUTE = "ref"; public static final String MATCH_ATTRIBUTE = "match"; - public static final String VALUE_TYPE_ATTRIBUTE = "value-type"; - public static final String KEY_TYPE_ATTRIBUTE = "key-type"; public static final String PARENT_ATTRIBUTE = "parent"; public static final String DEPENDS_ON_ATTRIBUTE = "depends-on"; public static final String FACTORY_BEAN_ATTRIBUTE = "factory-bean"; @@ -53,5 +51,9 @@ public class XmlConfigConstants { public static final String NAME_GENERATOR_ATTRIBUTE = "name-generator"; public static final String SCOPE_RESOLVER_ATTRIBUTE = "scope-resolver"; + public static final String UTIL_NAMESPACE = "http://www.springframework.org/schema/util"; + + public static final String VALUE_TYPE_ATTRIBUTE = "value-type"; + public static final String KEY_TYPE_ATTRIBUTE = "key-type"; }