Improved file path handling and refreshed module tree for better directory management

Author: VitaliyBoyko

src/main/java/com/magento/idea/magento2plugin/indexes/ModuleIndex.java

@@ -8,6 +8,7 @@
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
@@ -187,13 +188,12 @@ private void collectEditableFilesystemModuleNames(
             return null;
         }
 
-        for (final VirtualFile packagesRoot : getEditablePackagesRoots()) {
-            final VirtualFile vendorDirectory = packagesRoot.findChild(nameParts[0]);
-            if (vendorDirectory == null || !vendorDirectory.isDirectory()) {
-                continue;
-            }
-
-            final VirtualFile moduleDirectory = vendorDirectory.findChild(nameParts[1]);
+        final LocalFileSystem fileSystem = LocalFileSystem.getInstance();
+        for (final String rootPath : getMagentoRootCandidates()) {
+            final String modulePath = FileUtil.toSystemIndependentName(
+                    Paths.get(rootPath, Package.packagesRoot, nameParts[0], nameParts[1]).normalize().toString()
+            );
+            final VirtualFile moduleDirectory = fileSystem.refreshAndFindFileByPath(modulePath);
             if (moduleDirectory == null || !moduleDirectory.isDirectory()) {
                 continue;
             }
@@ -213,7 +213,9 @@ private Collection<VirtualFile> getEditablePackagesRoots() {
 
         for (final String rootPath : getMagentoRootCandidates()) {
             final VirtualFile packagesRoot = fileSystem.refreshAndFindFileByPath(
-                    Paths.get(rootPath, Package.packagesRoot).normalize().toString()
+                    FileUtil.toSystemIndependentName(
+                            Paths.get(rootPath, Package.packagesRoot).normalize().toString()
+                    )
             );
             if (packagesRoot != null && packagesRoot.isDirectory()) {
                 packagesRoots.add(packagesRoot);
@@ -230,15 +232,19 @@ private Collection<String> getMagentoRootCandidates() {
             return candidates;
         }
 
-        candidates.add(configuredRoot);
+        candidates.add(FileUtil.toSystemIndependentName(configuredRoot));
 
         final String basePath = project.getBasePath();
         if (basePath != null) {
             final String rootWithoutLeadingSlash = configuredRoot.startsWith("/")
                     ? configuredRoot.substring(1)
                     : configuredRoot;
-            candidates.add(Paths.get(basePath, rootWithoutLeadingSlash).normalize().toString());
-            candidates.add(Paths.get(basePath, configuredRoot).normalize().toString());
+            candidates.add(FileUtil.toSystemIndependentName(
+                    Paths.get(basePath, rootWithoutLeadingSlash).normalize().toString()
+            ));
+            candidates.add(FileUtil.toSystemIndependentName(
+                    Paths.get(basePath, configuredRoot).normalize().toString()
+            ));
         }
 
         return candidates;

src/main/kotlin/com/magento/idea/magento2plugin/mcp/MagentoModuleCommands.kt

@@ -9,7 +9,9 @@ import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.WriteAction
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.LocalFileSystem
+import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiManager
@@ -136,6 +138,8 @@ internal object MagentoModuleCommands {
             return "Magento module \"$moduleFullName\" could not be created completely. Partial changes were rolled back."
         }
 
+        refreshCreatedModuleTree(magentoRootDirectory, moduleDirectoryResult.directory)
+
         val lines = mutableListOf(
             "Created Magento module \"$moduleFullName\".",
             "moduleName: $moduleFullName",
@@ -263,6 +267,11 @@ internal object MagentoModuleCommands {
         return "${camelCaseToHyphen.convert(packageName)}/module-${camelCaseToHyphen.convert(moduleName)}"
     }
 
+    private fun refreshCreatedModuleTree(vararg directories: PsiDirectory) {
+        val virtualFiles = directories.map { it.virtualFile }.toTypedArray()
+        VfsUtil.markDirtyAndRefresh(false, true, true, *virtualFiles)
+    }
+
     private fun resolveMagentoRootDirectory(project: Project, configuredRoot: String): PsiDirectory? {
         return ReadAction.compute<PsiDirectory?, RuntimeException> {
             val fileSystem = LocalFileSystem.getInstance()
@@ -274,6 +283,7 @@ internal object MagentoModuleCommands {
             }
 
             val virtualFile = candidates.asSequence()
+                .map(FileUtil::toSystemIndependentName)
                 .mapNotNull { path -> fileSystem.refreshAndFindFileByPath(path) ?: fileSystem.findFileByPath(path) }
                 .firstOrNull { it.isDirectory }
             if (virtualFile != null) {

src/main/kotlin/com/magento/idea/magento2plugin/mcp/MagentoModuleQueries.kt

@@ -20,7 +20,12 @@ internal object MagentoModuleQueries {
         }
 
         val moduleIndex = ModuleIndex(project)
-        val matches = MagentoMcpSupport.prioritizeMatches(moduleIndex.moduleNames, query)
+        val candidateNames = linkedSetOf<String>()
+        candidateNames += moduleIndex.moduleNames
+        if (moduleIndex.getModuleDirectoryByModuleName(query) != null) {
+            candidateNames += query
+        }
+        val matches = MagentoMcpSupport.prioritizeMatches(candidateNames, query)
         if (matches.isEmpty()) {
             return "No Magento modules matched \"$query\"."
         }