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

to avoid static initialization issues, extract extension point interface to top level

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-06-13 14:15:53 +02:00
parent 8e3173382f
commit 753a50e890
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java
+3 -3
View File
@@ -23,7 +23,7 @@ import com.intellij.lang.xml.XmlASTFactory;
import com.intellij.openapi.application.PluginPathManager;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.psi.xml.XmlChildRole;
import com.intellij.psi.xml.StartTagEndTokenProvider;
import com.intellij.testFramework.ParsingTestCase;
public class AntParsingTest extends ParsingTestCase {
@@ -36,8 +36,8 @@ public class AntParsingTest extends ParsingTestCase {
protected void setUp() throws Exception {
super.setUp();
addExplicitExtension(LanguageASTFactory.INSTANCE, XMLLanguage.INSTANCE, new XmlASTFactory());
registerExtensionPoint(new ExtensionPointName<XmlChildRole.StartTagEndTokenProvider>("com.intellij.xml.startTagEndToken"),
XmlChildRole.StartTagEndTokenProvider.class);
registerExtensionPoint(new ExtensionPointName<StartTagEndTokenProvider>("com.intellij.xml.startTagEndToken"),
StartTagEndTokenProvider.class);
}
@Override
xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java
+1 -2
View File
@@ -49,8 +49,7 @@ public class XmlParsingTest extends ParsingTestCase {
addExplicitExtension(LanguageParserDefinitions.INSTANCE, DTDLanguage.INSTANCE, new DTDParserDefinition());
addExplicitExtension(LanguageASTFactory.INSTANCE, XMLLanguage.INSTANCE, new XmlASTFactory());
addExplicitExtension(LanguageASTFactory.INSTANCE, DTDLanguage.INSTANCE, new XmlASTFactory());
registerExtensionPoint(new ExtensionPointName<XmlChildRole.StartTagEndTokenProvider>("com.intellij.xml.startTagEndToken"),
XmlChildRole.StartTagEndTokenProvider.class);
registerExtensionPoint(StartTagEndTokenProvider.EP_NAME, StartTagEndTokenProvider.class);
}
@Override
xml/xml-psi-impl/src/com/intellij/psi/xml/StartTagEndTokenProvider.java
+10
View File
@@ -0,0 +1,10 @@
package com.intellij.psi.xml;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.psi.tree.IElementType;
public interface StartTagEndTokenProvider {
ExtensionPointName<StartTagEndTokenProvider> EP_NAME = new ExtensionPointName<StartTagEndTokenProvider>("com.intellij.xml.startTagEndToken");
IElementType[] getTypes();
}
xml/xml-psi-impl/src/com/intellij/psi/xml/XmlChildRole.java
+1 -9
View File
@@ -16,11 +16,9 @@
package com.intellij.psi.xml;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.DefaultRoleFinder;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.RoleFinder;
import com.intellij.util.ArrayUtil;
import com.intellij.xml.util.XmlTagUtil;
@@ -29,12 +27,6 @@ import org.jetbrains.annotations.Nullable;
public interface XmlChildRole {
interface StartTagEndTokenProvider {
IElementType[] getTypes();
}
ExtensionPointName<StartTagEndTokenProvider> EP_NAME = new ExtensionPointName<StartTagEndTokenProvider>("com.intellij.xml.startTagEndToken");
RoleFinder START_TAG_NAME_FINDER = new RoleFinder() {
public ASTNode findChild(@NotNull ASTNode parent) {
final PsiElement element = XmlTagUtil.getStartTagNameElement((XmlTag)parent.getPsi());
@@ -65,7 +57,7 @@ public interface XmlChildRole {
RoleFinder ATTRIBUTE_VALUE_VALUE_FINDER = new DefaultRoleFinder(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN);
RoleFinder START_TAG_END_FINDER = new DefaultRoleFinder(XmlTokenType.XML_TAG_END) {
{
final StartTagEndTokenProvider[] tokenProviders = Extensions.getExtensions(EP_NAME);
final StartTagEndTokenProvider[] tokenProviders = Extensions.getExtensions(StartTagEndTokenProvider.EP_NAME);
for (StartTagEndTokenProvider tokenProvider : tokenProviders) {
myElementTypes = ArrayUtil.mergeArrays(myElementTypes, tokenProvider.getTypes());
}
xml/xml-psi-impl/src/com/intellij/xml/XmlCoreEnvironment.java
+2 -2
View File
@@ -26,7 +26,7 @@ import com.intellij.psi.impl.cache.impl.id.IdIndexers;
import com.intellij.psi.impl.cache.impl.idCache.XmlIdIndexer;
import com.intellij.psi.impl.source.xml.XmlElementDescriptorProvider;
import com.intellij.psi.meta.MetaDataContributor;
import com.intellij.psi.xml.XmlChildRole;
import com.intellij.psi.xml.StartTagEndTokenProvider;
import com.intellij.psi.xml.XmlFileNSInfoProvider;
import com.intellij.util.indexing.FileBasedIndexExtension;
import com.intellij.xml.index.XmlNamespaceIndex;
@@ -57,7 +57,7 @@ public class XmlCoreEnvironment {
appEnvironment.addExplicitExtension(IdIndexers.INSTANCE, XmlFileType.INSTANCE, new XmlIdIndexer());
appEnvironment.addExplicitExtension(IdIndexers.INSTANCE, DTDFileType.INSTANCE, new XmlIdIndexer());
CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), XmlChildRole.EP_NAME, XmlChildRole.StartTagEndTokenProvider.class);
CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), StartTagEndTokenProvider.EP_NAME, StartTagEndTokenProvider.class);
CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), XmlSuppressionProvider.EP_NAME, XmlSuppressionProvider.class);
CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), XmlFileNSInfoProvider.EP_NAME, XmlFileNSInfoProvider.class);
CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), XmlSchemaProvider.EP_NAME, XmlSchemaProvider.class);