Android Studio compatibility fixed

Author: Mighty16

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.mighty16.json.kotlin.class</id>
     <name>Generate Kotlin data classes from JSON</name>
-    <version>0.9.5</version>
+    <version>0.9.6</version>
     <vendor email="mighty16.developer@gmail.com">Mighty16</vendor>
 
     <description><![CDATA[Plugin generates Kotlin data classes from JSON text.
@@ -25,10 +25,9 @@
         <a href="mailto:mighty16.developer@gmail.com">mighty16.developer@gmail.com</a>]]>
     </description>
 
-    <idea-version since-build="145.0"/>
+    <idea-version since-build="193"/>
 
-    <extensions defaultExtensionNs="com.intellij">
-    </extensions>
+    <depends>com.intellij.modules.platform</depends>
 
     <actions>
         <action id="com.mighty16.json.ClassFromJSONAction"

src/com/mighty16/json/ClassFromJSONAction.java

@@ -4,6 +4,7 @@
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.Navigatable;
@@ -30,7 +31,8 @@
 import java.awt.event.ComponentEvent;
 import java.util.List;
 
-public class ClassFromJSONAction extends AnAction implements JSONEditDialog.JSONEditCallbacks, ModelTableDialog.ModelTableCallbacks {
+public class ClassFromJSONAction extends AnAction implements JSONEditDialog.JSONEditCallbacks,
+        ModelTableDialog.ModelTableCallbacks {
 
     private PsiDirectory directory;
     private Point lastDialogLocation;
@@ -49,20 +51,21 @@ public void actionPerformed(AnActionEvent event) {
         Project project = event.getProject();
         if (project == null) return;
         DataContext dataContext = event.getDataContext();
-        final Module module = DataKeys.MODULE.getData(dataContext);
-        if (module == null) return;
-        final Navigatable navigatable = DataKeys.NAVIGATABLE.getData(dataContext);
+        final Navigatable navigatable = PlatformDataKeys.NAVIGATABLE.getData(dataContext);
 
         if (navigatable != null) {
             if (navigatable instanceof PsiDirectory) {
                 directory = (PsiDirectory) navigatable;
-            }
-        }
-
-        if (directory == null) {
-            ModuleRootManager root = ModuleRootManager.getInstance(module);
-            for (VirtualFile file : root.getSourceRoots()) {
-                directory = PsiManager.getInstance(project).findDirectory(file);
+            } else{
+                final VirtualFile projectFile = project.getProjectFile();
+                if (projectFile == null) throw new NullPointerException("Project file not found");
+                Module module = ProjectRootManager.getInstance(project).getFileIndex().getModuleForFile(projectFile);
+                if (module!=null){
+                    ModuleRootManager root = ModuleRootManager.getInstance(module);
+                    for (VirtualFile file : root.getSourceRoots()) {
+                        directory = PsiManager.getInstance(project).findDirectory(file);
+                    }
+                }
             }
         }
 

src/com/mighty16/json/IDEFileSaver.java

@@ -1,6 +1,5 @@
 package com.mighty16.json;
 
-
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.PsiDirectory;
@@ -24,9 +23,7 @@ public IDEFileSaver(PsiFileFactory factory, PsiDirectory directory, FileType fil
     public void saveFile(String fileName, String fileContent) {
         PsiFile classFile = factory.createFileFromText(fileName, fileType, fileContent);
         PsiFile oldFile = directory.findFile(fileName);
-
         if (oldFile != null) {
-
             if (listener != null && listener.shouldOverwriteFile(fileName)) {
                 WriteCommandAction.runWriteCommandAction(directory.getProject(), () -> {
                     oldFile.delete();
@@ -38,6 +35,5 @@ public void saveFile(String fileName, String fileContent) {
                 directory.add(classFile);
             });
         }
-
     }
 }