Remove dependency on an internal IDEA module

Layoric · Layoric · commit 217603e23960 · 2016-04-12T20:20:03.000+10:00
Android Studio no longer supports maven projects so we can't use it
anymore if we are going to support multiple IDEA based IDEs with this
one plugin.
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackRefHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackRefHandler.java
@@ -12,7 +12,6 @@
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiPackage;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.idea.maven.project.MavenProjectsManager;
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -43,9 +42,7 @@ public static void handleOk(String addressUrl, String qualifiedPackageName,
         if (javaCodeLines == null) return;
         defaultNativeTypesHandler = IDEAUtils.getDefaultNativeTypesHandler(module);
         boolean showDto = true;
-        final MavenProjectsManager mavenProjectsManager = MavenProjectsManager.getInstance(module.getProject());
-
-        boolean isMavenModule = mavenProjectsManager != null && mavenProjectsManager.isMavenizedModule(module);
+        boolean isMavenModule = IDEAPomFileHelper.isMavenModule(module);
         if(isMavenModule) {
             showDto = !tryAddMavenDependency(module);
         } else {
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackReference.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackReference.java
@@ -16,7 +16,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import org.jetbrains.idea.maven.project.MavenProjectsManager;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -146,17 +145,15 @@ private PsiPackage testPackage(Module module, String packageName, List<String> p
 
     @Override
     public void update(AnActionEvent e) {
-        Module m = getModule(e);
-        if(m == null) {
+        Module module = getModule(e);
+        if(module == null) {
             e.getPresentation().setEnabled(false);
             return;
         }
 
-        final MavenProjectsManager mavenProjectsManager = MavenProjectsManager.getInstance(m.getProject());
-
-        boolean isMavenModule = mavenProjectsManager != null && mavenProjectsManager.isMavenizedModule(m);
+        boolean isMavenModule =  IDEAPomFileHelper.isMavenModule(module);
 
-        if (isAndroidProject(m) || isMavenModule) {
+        if (isAndroidProject(module) || isMavenModule) {
             e.getPresentation().setEnabled(true);
         } else {
             e.getPresentation().setEnabled(false);
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/IDEAPomFileHelper.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/IDEAPomFileHelper.java
@@ -7,11 +7,11 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.search.FilenameIndex;
 import com.intellij.psi.search.GlobalSearchScope;
-import org.jetbrains.idea.maven.project.MavenProjectsManager;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -56,7 +56,12 @@ public static String findNearestModulePomFile(Module module) {
         PsiFile[] pomLibFiles = FilenameIndex.getFilesByName(module.getProject(), "pom.xml", GlobalSearchScope.allScope(module.getProject()));
         String pomFilePath = null;
         for(PsiFile psiPom : pomLibFiles) {
-            if(psiPom.getParent().getVirtualFile().getPath().equals(module.getModuleFile().getParent().getPath())) {
+            PsiDirectory psiPomParent = psiPom.getParent();
+            VirtualFile moduleVirtualFile = module.getModuleFile();
+            if(psiPomParent == null || moduleVirtualFile == null) {
+                continue;
+            }
+            if(psiPomParent.getVirtualFile().getPath().equals(moduleVirtualFile.getParent().getPath())) {
                 pomFilePath = psiPom.getVirtualFile().getPath();
             }
         }
@@ -193,8 +198,11 @@ private static boolean pomDependencyElementMatch(Node dependencyElement, String
         return groupIdMatch && artifactIdMatch;
     }
 
+    public static boolean isMavenModule(Module module) {
+        return findNearestModulePomFile(module) != null;
+    }
+
     public static boolean isMavenProjectWithKotlin(Module module) {
-        final MavenProjectsManager mavenProjectsManager = MavenProjectsManager.getInstance(module.getProject());
-        return mavenProjectsManager.isMavenizedModule(module) && pomHasKotlinDependency(module);
+        return isMavenModule(module) && pomHasKotlinDependency(module);
     }
 }
diff --git a/src/ServiceStackIDEA/src/main/resources/META-INF/plugin.xml b/src/ServiceStackIDEA/src/main/resources/META-INF/plugin.xml
@@ -26,7 +26,6 @@
   <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
        on how to target different products -->
   <depends>com.intellij.modules.lang</depends>
-  <depends>org.jetbrains.idea.maven</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->
