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

EA-73818 - NPE: DescriptorUtil.getPluginId

Browse Source
This commit is contained in:
Yann Cébron
2015-10-01 09:54:38 +02:00
parent a03c47dd01
commit cc854b6cc9
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/src/inspections/DevKitInspectionBase.java
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -82,8 +82,9 @@ public abstract class DevKitInspectionBase extends BaseJavaLocalInspectionTool {
@Nullable
private static Set<PsiClass> checkModule(Module module, PsiClass psiClass, @Nullable Set<PsiClass> types, boolean includeActions) {
final XmlFile pluginXml = PluginModuleType.getPluginXml(module);
if (!DescriptorUtil.isPluginXml(pluginXml)) return types;
assert pluginXml != null;
if (pluginXml == null) return null;
final DomFileElement<IdeaPlugin> fileElement = DescriptorUtil.getIdeaPlugin(pluginXml);
if (fileElement == null) return null;
final String qualifiedName = psiClass.getQualifiedName();
if (qualifiedName != null) {
@@ -93,7 +94,6 @@ public abstract class DevKitInspectionBase extends BaseJavaLocalInspectionTool {
processPluginXml(pluginXml, finder, includeActions);
// <depends> plugin.xml files
final DomFileElement<IdeaPlugin> fileElement = DescriptorUtil.getIdeaPlugin(pluginXml);
for (Dependency dependency : fileElement.getRootElement().getDependencies()) {
final GenericAttributeValue<PathReference> configFileAttribute = dependency.getConfigFile();
if (!DomUtil.hasXml(configFileAttribute)) continue;
plugins/devkit/src/util/DescriptorUtil.java
+10 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import com.intellij.psi.xml.XmlTag;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.xml.DomFileElement;
import com.intellij.util.xml.DomManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.devkit.DevKitBundle;
import org.jetbrains.idea.devkit.dom.IdeaPlugin;
@@ -79,7 +80,12 @@ public class DescriptorUtil {
if (pluginXml == null) {
return null;
}
return getIdeaPlugin(pluginXml).getRootElement().getPluginId();
final DomFileElement<IdeaPlugin> ideaPlugin = getIdeaPlugin(pluginXml);
if (ideaPlugin == null) {
return null;
}
return ideaPlugin.getRootElement().getPluginId();
}
public static boolean isPluginXml(PsiFile file) {
@@ -87,7 +93,8 @@ public class DescriptorUtil {
return getIdeaPlugin((XmlFile)file) != null;
}
public static DomFileElement<IdeaPlugin> getIdeaPlugin(XmlFile file) {
@Nullable
public static DomFileElement<IdeaPlugin> getIdeaPlugin(@NotNull XmlFile file) {
return DomManager.getDomManager(file.getProject()).getFileElement(file, IdeaPlugin.class);
}
}