633: Fixed NoSuchElementException when creating new controller

Author: Iamwade

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.java

@@ -249,12 +249,13 @@ private String getNamespace() {
         );
 
         return String.format(
-                "%s%s%s%s%s%s",
+                "%s%s%s%s%s%s%s",
                 parts[0],
                 Package.fqnSeparator,
                 parts[1],
                 Package.fqnSeparator,
                 directoryPart,
+                Package.fqnSeparator,
                 controllerPart
         );
     }

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleControllerClassGenerator.java

@@ -148,6 +148,10 @@ private String getControllerFqn() {
     private PhpClass createControllerClass(final String actionName) {
         PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(getControllerModule());
+
+        if (parentDirectory == null) {
+            return null;
+        }
         final PsiFile controllerFile;
         final String[] controllerDirectories = data.getActionDirectory().split(
                 File.separator

src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java

@@ -14,6 +14,7 @@
 import com.intellij.psi.PsiElement;
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.util.IsClickedDirectoryInsideProject;
+import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import javax.swing.Icon;
@@ -45,18 +46,28 @@ public void update(final AnActionEvent event) {
         }
 
         final Project project = event.getData(PlatformDataKeys.PROJECT);
-        if (!IsClickedDirectoryInsideProject.getInstance()
+
+        if (project == null
+                || !Settings.isEnabled(project)
+                || !IsClickedDirectoryInsideProject.getInstance()
                 .execute(project, (PsiDirectory) psiElement)) {
             event.getPresentation().setVisible(false);
             return;
         }
 
         final String moduleName = GetModuleNameByDirectoryUtil
                 .execute((PsiDirectory) psiElement, project);
-        if (Settings.isEnabled(project) && moduleName != null) {
-            event.getPresentation().setVisible(true);
-            return;
+
+        if (moduleName != null) {
+            final PsiDirectory moduleDirectory = new ModuleIndex(project)
+                    .getModuleDirectoryByModuleName(moduleName);
+
+            if (moduleDirectory != null) {
+                event.getPresentation().setVisible(true);
+                return;
+            }
         }
+
         event.getPresentation().setVisible(false);
     }
 }

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

@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.jetbrains.annotations.Nullable;
 
 public final class ModuleIndex {
 
@@ -116,7 +117,7 @@ private List<String> getNames(
      * @param moduleName String
      * @return PsiDirectory
      */
-    public PsiDirectory getModuleDirectoryByModuleName(final String moduleName) {
+    public @Nullable PsiDirectory getModuleDirectoryByModuleName(final String moduleName) {
         final FileBasedIndex index = FileBasedIndex
                 .getInstance();
         final Collection<VirtualFile> files = index.getContainingFiles(
@@ -126,6 +127,10 @@ public PsiDirectory getModuleDirectoryByModuleName(final String moduleName) {
                     GlobalSearchScope.allScope(project),
                     PhpFileType.INSTANCE
             ));
+
+        if (files.isEmpty()) {
+            return null;
+        }
         final VirtualFile virtualFile = files.iterator().next();
 
         return PsiManager.getInstance(project).findDirectory(virtualFile.getParent());