feat: improve Neos project detection

cvette · Jul 23, 2023 · a21a6a6 · a21a6a6
1 parent fca5095
commit a21a6a6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/src/main/java/de/vette/idea/neos/NeosProjectService.java b/src/main/java/de/vette/idea/neos/NeosProjectService.java
@@ -18,14 +18,24 @@
 
 package de.vette.idea.neos;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.intellij.ide.plugins.newui.SearchQueryParser;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
+import com.jetbrains.php.composer.ComposerConfigUtils;
+import com.jetbrains.php.composer.ComposerDataService;
+import com.jetbrains.php.composer.ComposerUtils;
+import com.jetbrains.php.composer.InstalledPackageData;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
+import java.util.List;
+
 import static com.intellij.openapi.project.ProjectUtil.guessProjectDir;
 
 public class NeosProjectService {
@@ -69,10 +79,24 @@ public boolean isNeosProject() {
     }
 
     public static boolean isNeosProject(Project project) {
-        VirtualFile projectDir = guessProjectDir(project);
-        return (VfsUtil.findRelativeFile(projectDir, "Packages") != null
-                && VfsUtil.findRelativeFile(projectDir, "Configuration") != null
-                && (VfsUtil.findRelativeFile(projectDir, "Packages", "Application", "TYPO3.Neos") != null
-                || VfsUtil.findRelativeFile(projectDir, "Packages", "Application", "Neos.Neos") != null));
+        VirtualFile configFile = ComposerDataService.getInstance(project).getCurrentConfigFile();
+        if (configFile == null) {
+            return false;
+        }
+
+        try {
+            JsonObject root = ComposerConfigUtils.parseJson(configFile).getAsJsonObject();
+
+            if (!root.has("require")) {
+                return false;
+            }
+
+            JsonObject requireObject = root.getAsJsonObject("require");
+            return requireObject.has("neos/neos") || requireObject.has("neos/flow");
+        } catch (IllegalStateException e) {
+            return false;
+        } catch (IOException e) {
+            return false;
+        }
     }
 }
diff --git a/src/main/java/de/vette/idea/neos/util/IdeHelper.java b/src/main/java/de/vette/idea/neos/util/IdeHelper.java
@@ -30,7 +30,7 @@
 public class IdeHelper {
 
     public static void notifyEnableMessage(final Project project) {
-        Notification notification = new Notification("Neos Plugin", "Neos Plugin", "This looks like a Neos CMS project.", NotificationType.INFORMATION);
+        Notification notification = new Notification("Neos Plugin", "Neos Plugin", "This looks like a Neos CMS project. You'll need to enable the plugin for this project in order to use all provided features.", NotificationType.INFORMATION);
         notification.setTitle("Neos CMS Support");
         notification.setIcon(NeosIcons.NODE_TYPE);