MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

tag name completion for facelets fixed

Browse Source
This commit is contained in:
Dmitry Avdeev
2011-12-19 11:40:09 +04:00
parent e33ff13c76
commit 5c8b5e56b0
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java
+3 -3
View File
@@ -57,9 +57,9 @@ public class ExtendedTagInsertHandler extends XmlTagInsertHandler {
public void handleInsert(final InsertionContext context, final LookupElement item) {
final XmlFile contextfile = (XmlFile)context.getFile();
final XmlExtension extension = XmlExtension.getExtension(contextfile);
final XmlFile file = extension.getContainingFile(contextfile);
final XmlFile contextFile = (XmlFile)context.getFile();
final XmlExtension extension = XmlExtension.getExtension(contextFile);
final XmlFile file = extension.getContainingFile(contextFile);
final Project project = context.getProject();
assert file != null;
xml/impl/src/com/intellij/xml/DefaultXmlExtension.java
+20 -11
View File
@@ -52,8 +52,8 @@ public class DefaultXmlExtension extends XmlExtension {
public List<Pair<String,String>> getAvailableTagNames(@NotNull final XmlFile file, @NotNull final XmlTag context) {
final Set<String> namespaces = new HashSet<String>(Arrays.asList(context.knownNamespaces()));
final XmlSchemaProvider provider = XmlSchemaProvider.getAvailableProvider(file);
if (provider != null) {
final List<XmlSchemaProvider> providers = XmlSchemaProvider.getAvailableProviders(file);
for (XmlSchemaProvider provider : providers) {
namespaces.addAll(provider.getAvailableNamespaces(file, null));
}
final ArrayList<String> nsInfo = new ArrayList<String>();
@@ -70,11 +70,13 @@ public class DefaultXmlExtension extends XmlExtension {
@NotNull
public Set<String> getNamespacesByTagName(@NotNull final String tagName, @NotNull final XmlFile context) {
final XmlSchemaProvider provider = XmlSchemaProvider.getAvailableProvider(context);
if (provider == null) {
return Collections.emptySet();
final List<XmlSchemaProvider> providers = XmlSchemaProvider.getAvailableProviders(context);
HashSet<String> set = new HashSet<String>();
for (XmlSchemaProvider provider : providers) {
set.addAll(provider.getAvailableNamespaces(context, tagName));
}
return provider.getAvailableNamespaces(context, tagName);
return set;
}
public static Set<String> filterNamespaces(final Set<String> namespaces, final String tagName, final XmlFile context) {
@@ -181,10 +183,17 @@ public class DefaultXmlExtension extends XmlExtension {
}
}
final XmlSchemaProvider provider = XmlSchemaProvider.getAvailableProvider(file);
final List<XmlSchemaProvider> providers = XmlSchemaProvider.getAvailableProviders(file);
XmlSchemaProvider prefixProvider = null;
String prefix = nsPrefix;
if (prefix == null && provider != null) {
prefix = provider.getDefaultPrefix(namespace, file);
if (prefix == null) {
for (XmlSchemaProvider provider : providers) {
prefix = provider.getDefaultPrefix(namespace, file);
if (prefix != null) {
prefixProvider = provider;
break;
}
}
}
if (prefix == null) {
prefix = "";
@@ -201,8 +210,8 @@ public class DefaultXmlExtension extends XmlExtension {
String location = null;
if (namespace.length() > 0) {
if (provider != null) {
final Set<String> strings = provider.getLocations(namespace, file);
if (prefixProvider != null) {
final Set<String> strings = prefixProvider.getLocations(namespace, file);
if (strings != null && strings.size() > 0) {
location = strings.iterator().next();
}