fix: update plugin dependency checks, fixes #402

Author: AkibaAT

src/main/java/de/php_perfect/intellij/ddev/node/AutoConfigureNodeInterpreterListener.java

@@ -6,10 +6,17 @@
 import de.php_perfect.intellij.ddev.cmd.Description;
 import de.php_perfect.intellij.ddev.dockerCompose.DdevComposeFileLoader;
 import de.php_perfect.intellij.ddev.settings.DdevSettingsState;
+import de.php_perfect.intellij.ddev.util.PluginChecker;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 public final class AutoConfigureNodeInterpreterListener implements DescriptionChangedListener {
+    private static final List<String> REQUIRED_PLUGINS = List.of(
+            "NodeJS",
+            "org.jetbrains.plugins.node-remote-interpreter"
+    );
 
     private final @NotNull Project project;
 
@@ -27,6 +34,10 @@ public void onDescriptionChanged(@Nullable Description description) {
             return;
         }
 
+        if (PluginChecker.isMissingRequiredPlugins(this.project, REQUIRED_PLUGINS)) {
+            return;
+        }
+
         final VirtualFile composeFile = DdevComposeFileLoader.getInstance(this.project).load();
 
         if (composeFile == null || !composeFile.exists()) {

src/main/java/de/php_perfect/intellij/ddev/node/NodeInterpreterProviderImpl.java

@@ -15,6 +15,7 @@
 import de.php_perfect.intellij.ddev.dockerCompose.DockerComposeCredentialProvider;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Collection;
 import java.util.List;
 
 public final class NodeInterpreterProviderImpl implements NodeInterpreterProvider {
@@ -28,9 +29,27 @@ public NodeInterpreterProviderImpl(final @NotNull Project project) {
 
     public void configureNodeInterpreter(final @NotNull NodeInterpreterConfig nodeInterpreterConfig) {
         final NodeRemoteInterpreters nodeRemoteInterpreters = NodeRemoteInterpreters.getInstance();
+        final Collection<NodeJSRemoteSdkAdditionalData> interpreters = nodeRemoteInterpreters.getInterpreters();
 
-        if (!nodeRemoteInterpreters.getInterpreters().isEmpty()) {
-            return;
+        // Normalize the target compose file path for comparison
+        String normalizedTargetPath = normalizePath(nodeInterpreterConfig.composeFilePath());
+
+        // Check if we already have the remote interpreter set up
+        if (!interpreters.isEmpty()) {
+            for (NodeJSRemoteSdkAdditionalData interpreter : interpreters) {
+                Object credentialsObj = interpreter.connectionCredentials().getCredentials();
+                // Check if the credentials are of the expected type
+                if (credentialsObj instanceof DockerComposeCredentialsHolder credentials && credentials.getComposeFilePaths() != null) {
+                    for (String composeFilePath : credentials.getComposeFilePaths()) {
+                        // Normalize the existing compose file path for comparison
+                        String normalizedExistingPath = normalizePath(composeFilePath);
+                        if (normalizedExistingPath.contains(normalizedTargetPath)) {
+                            LOG.debug("Found existing nodejs interpreter");
+                            return;
+                        }
+                    }
+                }
+            }
         }
 
         LOG.debug("Creating nodejs interpreter");
@@ -60,4 +79,19 @@ private PathMappingSettings loadPathMappings(NodeJSRemoteSdkAdditionalData sdkDa
             return null;
         }
     }
+
+    /**
+     * Normalizes a file path by replacing backslashes with forward slashes
+     * and ensuring consistent path separators for comparison.
+     *
+     * @param path The path to normalize
+     * @return The normalized path
+     */
+    private String normalizePath(String path) {
+        if (path == null) {
+            return "";
+        }
+        // Replace backslashes with forward slashes for consistent comparison
+        return path.replace('\\', '/');
+    }
 }

src/main/java/de/php_perfect/intellij/ddev/php/ConfigurationProviderImpl.java

@@ -1,22 +1,20 @@
 package de.php_perfect.intellij.ddev.php;
 
-import com.intellij.ide.plugins.PluginManager;
-import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import de.php_perfect.intellij.ddev.cmd.Description;
 import de.php_perfect.intellij.ddev.dockerCompose.DdevComposeFileLoader;
-import de.php_perfect.intellij.ddev.notification.DdevNotifier;
 import de.php_perfect.intellij.ddev.settings.DdevSettingsState;
+import de.php_perfect.intellij.ddev.util.PluginChecker;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
 public final class ConfigurationProviderImpl implements ConfigurationProvider {
     private static final List<String> REQUIRED_PLUGINS = List.of(
+            "com.jetbrains.php",
             "org.jetbrains.plugins.phpstorm-remote-interpreter",
-            "org.jetbrains.plugins.phpstorm-docker",
-            "Docker"
+            "org.jetbrains.plugins.phpstorm-docker"
     );
 
     private final @NotNull Project project;
@@ -35,21 +33,14 @@ public void configure(@NotNull Description description) {
             return;
         }
 
-        final VirtualFile composeFile = DdevComposeFileLoader.getInstance(this.project).load();
-
-        if (composeFile == null || !composeFile.exists()) {
+        if (PluginChecker.isMissingRequiredPlugins(this.project, REQUIRED_PLUGINS)) {
             return;
         }
 
-        final var pluginManager = PluginManager.getInstance();
-
-        for (final String id : REQUIRED_PLUGINS) {
-            final PluginId pluginId = PluginId.findId(id);
+        final VirtualFile composeFile = DdevComposeFileLoader.getInstance(this.project).load();
 
-            if (pluginId == null || pluginManager.findEnabledPlugin(pluginId) == null) {
-                DdevNotifier.getInstance(this.project).notifyMissingPlugin(id);
-                return;
-            }
+        if (composeFile == null || !composeFile.exists()) {
+            return;
         }
 
         final DdevInterpreterConfig ddevInterpreterConfig = new DdevInterpreterConfig(description.getName(), "php" + description.getPhpVersion(), composeFile.getPath());

src/main/java/de/php_perfect/intellij/ddev/util/PluginChecker.java

@@ -0,0 +1,41 @@
+package de.php_perfect.intellij.ddev.util;
+
+import com.intellij.ide.plugins.PluginManager;
+import com.intellij.openapi.extensions.PluginId;
+import com.intellij.openapi.project.Project;
+import de.php_perfect.intellij.ddev.notification.DdevNotifier;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Utility class to check for required plugins.
+ */
+public final class PluginChecker {
+    private PluginChecker() {
+        // Utility class, no instances
+    }
+
+    /**
+     * Checks if any required plugin is missing.
+     * If any plugin is missing, it will notify the user and return true.
+     *
+     * @param project The current project
+     * @param requiredPlugins List of plugin IDs to check
+     * @return true if any plugin is missing, false if all are available
+     */
+    public static boolean isMissingRequiredPlugins(@NotNull Project project, @NotNull List<String> requiredPlugins) {
+        final var pluginManager = PluginManager.getInstance();
+
+        for (final String id : requiredPlugins) {
+            final PluginId pluginId = PluginId.findId(id);
+
+            if (pluginId == null || pluginManager.findEnabledPlugin(pluginId) == null) {
+                DdevNotifier.getInstance(project).notifyMissingPlugin(id);
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

src/main/resources/META-INF/DdevIntegration-withDocker.xml

@@ -1,6 +1,4 @@
 <idea-plugin>
-    <depends>Docker</depends>
-
     <extensions defaultExtensionNs="com.intellij">
         <applicationService
                 serviceImplementation="de.php_perfect.intellij.ddev.dockerCompose.DockerComposeCredentialProviderImpl"

src/main/resources/META-INF/DdevIntegration-withNodeRemoteInterpreter.xml

@@ -1,6 +1,6 @@
 <idea-plugin>
     <depends>NodeJS</depends>
-    <depends>org.jetbrains.plugins.phpstorm-docker</depends>
+    <depends>org.jetbrains.plugins.node-remote-interpreter</depends>
 
     <extensions defaultExtensionNs="com.intellij">
         <projectService serviceImplementation="de.php_perfect.intellij.ddev.node.NodeInterpreterProviderImpl"

src/main/resources/META-INF/plugin.xml

@@ -22,10 +22,13 @@
 
     <idea-version since-build="232.8660.185" until-build="241.*"/>
     <depends>com.intellij.modules.platform</depends>
+    <!-- Required dependencies -->
+    <depends>intellij.platform.ijent.impl</depends> <!-- Remote Execution Agent -->
+    <depends config-file="DdevIntegration-withDocker.xml">Docker</depends>
+
+    <!-- Optional dependencies -->
     <depends config-file="DdevIntegration-withTerminal.xml" optional="true">org.jetbrains.plugins.terminal</depends>
     <depends config-file="DdevIntegration-withDatabase.xml" optional="true">com.intellij.database</depends>
-    <depends config-file="DdevIntegration-withDocker.xml" optional="true">org.jetbrains.plugins.phpstorm-docker
-    </depends>
     <depends config-file="DdevIntegration-withPhp.xml" optional="true">
         org.jetbrains.plugins.phpstorm-remote-interpreter
     </depends>