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

do less work in JavaDomApplicationComponent

Browse Source
This commit is contained in:
peter
2018-12-13 09:27:46 +01:00
parent 4c6c0e5204
commit 5cd574dd93
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/META-INF/JavaPlugin.xml
+9
View File
@@ -227,6 +227,15 @@
<lang.treePatcher language="JAVA" implementationClass="com.intellij.psi.templateLanguages.MiddleTreePatcher"/>
<generation.topLevelFactory language="JAVA" implementationClass="com.intellij.psi.impl.JavaFactoryProvider"/>
<dom.uiControlsProvider implementation="com.intellij.util.xml.impl.JavaDomApplicationComponent"/>
<dom.converter interfaceClass="com.intellij.util.xml.JvmPsiTypeConverter"
implementationClass="com.intellij.util.xml.JvmPsiTypeConverterImpl"/>
<dom.converter interfaceClass="com.intellij.util.xml.CanonicalPsiTypeConverter"
implementationClass="com.intellij.util.xml.CanonicalPsiTypeConverterImpl"/>
<dom.converter interfaceClass="com.intellij.util.xml.converters.values.ClassValueConverter"
implementationClass="com.intellij.util.xml.converters.ClassValueConverterImpl"/>
<dom.converter interfaceClass="com.intellij.util.xml.converters.values.ClassArrayConverter"
implementationClass="com.intellij.util.xml.converters.ClassArrayConverterImpl"/>
<resolveScopeEnlarger implementation="com.intellij.psi.NonClasspathResolveScopeEnlarger"/>
<psiViewerExtension implementation="com.intellij.internal.psiView.PsiViewerExpressionExtension"/>
<psiViewerExtension implementation="com.intellij.internal.psiView.PsiViewerCodeFragmentExtension"/>
java/java-impl/src/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java
+1 -2
View File
@@ -35,7 +35,6 @@ import org.jetbrains.annotations.Nullable;
public class CanonicalPsiTypeConverterImpl extends CanonicalPsiTypeConverter implements CustomReferenceConverter<PsiType> {
@NonNls static final String[] PRIMITIVES = {"boolean", "byte", "char", "double", "float", "int", "long", "short"};
@NonNls private static final String ARRAY_PREFIX = "[L";
private static final JavaClassReferenceProvider CLASS_REFERENCE_PROVIDER = new JavaClassReferenceProvider();
@Override
public PsiType fromString(final String s, final ConvertContext context) {
@@ -82,7 +81,7 @@ public class CanonicalPsiTypeConverterImpl extends CanonicalPsiTypeConverter imp
}
final boolean isPrimitiveType = type instanceof PsiPrimitiveType;
return new JavaClassReferenceSet(trimmed, element, offset, false, CLASS_REFERENCE_PROVIDER) {
return new JavaClassReferenceSet(trimmed, element, offset, false, new JavaClassReferenceProvider()) {
@Override
@NotNull
protected JavaClassReference createReference(int refIndex, @NotNull String subRefText, @NotNull TextRange textRange, boolean staticImport) {
java/java-impl/src/com/intellij/util/xml/impl/JavaDomApplicationComponent.java
+7 -15
View File
@@ -18,13 +18,13 @@ package com.intellij.util.xml.impl;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiType;
import com.intellij.util.Consumer;
import com.intellij.util.Function;
import com.intellij.util.xml.*;
import com.intellij.util.xml.converters.values.ClassValueConverter;
import com.intellij.util.xml.converters.values.ClassArrayConverter;
import com.intellij.util.xml.ui.*;
import javax.swing.table.TableCellEditor;
import com.intellij.util.xml.CanonicalPsiTypeConverterImpl;
import com.intellij.util.xml.ConverterManager;
import com.intellij.util.xml.PsiClassConverter;
import com.intellij.util.xml.ui.DomUIFactory;
import com.intellij.util.xml.ui.PsiClassControl;
import com.intellij.util.xml.ui.PsiClassTableCellEditor;
import com.intellij.util.xml.ui.PsiTypeControl;
/**
* @author peter
@@ -33,14 +33,6 @@ public class JavaDomApplicationComponent implements Consumer<DomUIFactory> {
public JavaDomApplicationComponent(ConverterManager converterManager) {
converterManager.addConverter(PsiClass.class, new PsiClassConverter());
converterManager.addConverter(PsiType.class, new CanonicalPsiTypeConverterImpl());
converterManager.registerConverterImplementation(JvmPsiTypeConverter.class, new JvmPsiTypeConverterImpl());
converterManager.registerConverterImplementation(CanonicalPsiTypeConverter.class, new CanonicalPsiTypeConverterImpl());
final ClassValueConverter classValueConverter = ClassValueConverter.getClassValueConverter();
converterManager.registerConverterImplementation(ClassValueConverter.class, classValueConverter);
final ClassArrayConverter classArrayConverter = ClassArrayConverter.getClassArrayConverter();
converterManager.registerConverterImplementation(ClassArrayConverter.class, classArrayConverter);
}
@Override