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

devkit: fix incorrect warn about unregistered application component

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-08-09 15:40:02 +02:00
parent 89c1e45119
commit 982c472cdd
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/devkit-core/src/inspections/ComponentNotRegisteredInspection.java
+15 -12
View File
@@ -132,23 +132,26 @@ public class ComponentNotRegisteredInspection extends DevKitJvmInspection {
}
for (ComponentType componentType : ComponentType.values()) {
if (!InheritanceUtil.isInheritor(checkedClass, componentType.myClassName)) {
continue;
}
if (findRegistrationType(checkedClass, COMPONENT_TYPE_TO_REGISTRATION_TYPE.get(componentType)) != null) {
if (InheritanceUtil.isInheritor(checkedClass, componentType.myClassName) && checkComponentRegistration(checkedClass, sink, componentType)) {
return;
}
if (!canFix(checkedClass)) {
return;
}
LocalQuickFix fix = new RegisterComponentFix(componentType, org.jetbrains.idea.devkit.util.PsiUtil.createPointer(checkedClass));
sink.highlight(DevKitBundle.message("inspections.component.not.registered.message",
DevKitBundle.message(componentType.myPropertyKey)), fix);
}
}
private static boolean checkComponentRegistration(@NotNull PsiClass checkedClass, @NotNull HighlightSink sink, @NotNull ComponentType componentType) {
if (findRegistrationType(checkedClass, COMPONENT_TYPE_TO_REGISTRATION_TYPE.get(componentType)) != null) {
return true;
}
if (!canFix(checkedClass)) {
return true;
}
LocalQuickFix fix = new RegisterComponentFix(componentType, org.jetbrains.idea.devkit.util.PsiUtil.createPointer(checkedClass));
sink.highlight(DevKitBundle.message("inspections.component.not.registered.message",
DevKitBundle.message(componentType.myPropertyKey)), fix);
return false;
}
private static PsiClass findRegistrationType(@NotNull PsiClass checkedClass, @NotNull RegistrationCheckerUtil.RegistrationType type) {
final Set<PsiClass> types = RegistrationCheckerUtil.getRegistrationTypes(checkedClass, type);
return ContainerUtil.getFirstItem(types);
plugins/devkit/devkit-core/src/util/ComponentType.java
+2 -2
View File
@@ -14,9 +14,9 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.PropertyKey;
public enum ComponentType {
APPLICATION(BaseComponent.class, "application-components", "new.menu.application.component.text"),
MODULE(ModuleComponent.class, "module-components", "new.menu.module.component.text"),
PROJECT(ProjectComponent.class, "project-components", "new.menu.project.component.text"),
MODULE(ModuleComponent.class, "module-components", "new.menu.module.component.text");
APPLICATION(BaseComponent.class, "application-components", "new.menu.application.component.text");
public final String myClassName;
public final String myPropertyKey;