Fix #60

avast · Jul 17, 2015 · e94a968 · e94a968
1 parent d980c72
commit e94a968
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
 	<id>eu.inmite.android.plugin.butterknifezelezny</id>
 	<name>Android ButterKnife Zelezny</name>
-	<version>1.4-SNAPSHOT</version>
+	<version>1.3.2</version>
 	<vendor email="android@avast.com" url="http://github.com/avast">Avast</vendor>
 
 	<description><![CDATA[
@@ -11,8 +11,9 @@
 	<change-notes><![CDATA[
 <html>
 
-  <b>1.4-SNAPSHOT</b>
+  <b>1.3.2</b> (7/17/2015)
   <ul>
+    <li>Fixed plugin crash (#60)</li>
   </ul>
 
   <b>1.3.1</b> (7/16/2015)

diff --git a/src/com/avast/android/butterknifezelezny/InjectAction.java b/src/com/avast/android/butterknifezelezny/InjectAction.java
@@ -110,6 +110,9 @@ protected void showDialog(Project project, Editor editor, ArrayList<Element> ele
         PsiClass clazz = getTargetClass(editor, file);
 
         final IButterKnife butterKnife = ButterKnifeFactory.findButterKnifeForPsiElement(project, file);
+        if (butterKnife == null) {
+            return;
+        }
 
         // get parent classes and check if it's an adapter
         boolean createHolder = false;

diff --git a/src/com/avast/android/butterknifezelezny/common/Utils.java b/src/com/avast/android/butterknifezelezny/common/Utils.java
@@ -5,6 +5,7 @@
 import com.avast.android.butterknifezelezny.model.Element;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.ProjectJdkTable;
@@ -311,7 +312,11 @@ public static boolean isEmptyString(String text) {
      * @since 1.3
      */
     public static boolean isClassAvailableForPsiFile(@NotNull Project project, @NotNull PsiElement psiElement, @NotNull String className) {
-        GlobalSearchScope moduleScope = ModuleUtil.findModuleForPsiElement(psiElement).getModuleWithDependenciesAndLibrariesScope(false);
+        Module module = ModuleUtil.findModuleForPsiElement(psiElement);
+        if (module == null) {
+            return false;
+        }
+        GlobalSearchScope moduleScope = module.getModuleWithDependenciesAndLibrariesScope(false);
         PsiClass classInModule = JavaPsiFacade.getInstance(project).findClass(className, moduleScope);
         return classInModule != null;
     }