Merge pull request #844 from Iamwade/633-no-such-element-exception-when-creating-new-controller

633: Fixed NoSuchElementException when creating new controller

Author: bohdan-harniuk

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/CLICommandClassGenerator.java

@@ -18,6 +18,7 @@
 import com.magento.idea.magento2plugin.magento.files.CLICommandTemplate;
 import java.util.Properties;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 @SuppressWarnings({
         "PMD.AvoidUncheckedExceptionsInSignatures",
@@ -69,11 +70,17 @@ public PsiFile generate(final String actionName) throws RuntimeException {
         return cliCommandFile;
     }
 
-    private PhpFile createCLICommandClass(final String actionName) {
+    private @Nullable PhpFile createCLICommandClass(final String actionName) {
+        final PsiDirectory parentDirectory = getParentDirectory();
+
+        if (parentDirectory == null) {
+            return null;
+        }
+
         final PsiFile cliCommandFile = fileGenerator.generate(
                 this.getCLICommandTemplate(),
                 getAttributes(),
-                this.getParentDirectory(),
+                parentDirectory,
                 actionName
         );
 
@@ -82,9 +89,14 @@ private PhpFile createCLICommandClass(final String actionName) {
 
     private PsiDirectory getParentDirectory() {
         final String moduleName = this.phpClassData.getModuleName();
-        final String[] subDirectories = this.phpClassData.getParentDirectory().split("/");
         PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
+
+        if (parentDirectory == null) {
+            return null;
+        }
+        final String[] subDirectories = this.phpClassData.getParentDirectory().split("/");
+
         for (final String subDirectory : subDirectories) {
             parentDirectory = dirGenerator.findOrCreateSubdirectory(parentDirectory, subDirectory);
         }

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

@@ -89,12 +89,16 @@ protected void fillAttributes(final Properties attributes) {
      * @return PhpFile
      */
     private PhpFile createCronjobClass(final String actionName) {
-        final String cronjobClassName = this.cronjobClassData.getClassName();
         final String moduleName = this.cronjobClassData.getModuleName();
-        final String[] cronjobSubDirectories = this.cronjobClassData.getDirectory().split("/");
         PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
 
+        if (parentDirectory == null) {
+            return null;
+        }
+        final String cronjobClassName = this.cronjobClassData.getClassName();
+        final String[] cronjobSubDirectories = this.cronjobClassData.getDirectory().split("/");
+
         for (final String cronjobSubDirectory: cronjobSubDirectories) {
             parentDirectory = directoryGenerator
                     .findOrCreateSubdirectory(parentDirectory, cronjobSubDirectory);

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

@@ -114,6 +114,10 @@ protected void fillAttributes(final Properties attributes) {
     private PhpClass createHandlerClass(final String actionName) {
         PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(this.moduleName);
+
+        if (parentDirectory == null) {
+            return null;
+        }
         final PsiFile handlerFile;
         final String[] handlerDirectories = messageQueueClassDataName.getPath().split(
                 File.separator

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

@@ -58,6 +58,7 @@ public ModuleBlockClassGenerator(
      * @param actionName String
      * @return PsiFile
      */
+    @Override
     public PsiFile generate(final String actionName) {
         final String errorTitle = commonBundle.message("common.error");
         final PhpClass block = GetPhpClassByFQN.getInstance(project).execute(getBlockFqn());
@@ -106,7 +107,12 @@ private String getBlockFqn() {
     private PhpFile createBlockClass(final String actionName) {
         PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(getBlockModule());
+
+        if (parentDirectory == null) {
+            return null;
+        }
         final String[] blockDirectories = blockFileData.getBlockDirectory().split(File.separator);
+
         for (final String blockDirectory: blockDirectories) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectory(
                 parentDirectory,
@@ -127,6 +133,7 @@ private PhpFile createBlockClass(final String actionName) {
         return (PhpFile) blockFile;
     }
 
+    @Override
     protected void fillAttributes(final Properties attributes) {
         final String blockClassName = blockFileData.getBlockClassName();
         attributes.setProperty("NAME", blockClassName);

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

@@ -10,6 +10,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
 import com.magento.idea.magento2plugin.actions.generation.data.ModuleComposerJsonData;
 import com.magento.idea.magento2plugin.actions.generation.generator.data.ModuleDirectoriesData;
@@ -120,8 +121,8 @@ private String getDependenciesString(final List dependenciesList) {
         final Object[] dependencies = dependenciesList.toArray();
         result = result.concat(ComposerJson.DEFAULT_DEPENDENCY);
         final boolean noDependency =
-                dependencies.length == 1 && dependencies[0].equals(
-                        ComposerJson.NO_DEPENDENCY_LABEL
+                dependencies.length == 1 && ComposerJson.NO_DEPENDENCY_LABEL.equals(
+                        dependencies[0]
                 );
         if (dependencies.length == 0 || noDependency) {
             result = result.concat("\n");
@@ -161,8 +162,12 @@ private Pair<String, String> getDependencyData(
                 "_-", "/"
         );
         try {
-            final PsiFile virtualFile = moduleIndex.getModuleDirectoryByModuleName(dependency)
-                    .findFile(ComposerJson.FILE_NAME);
+            final PsiDirectory moduleDir = moduleIndex.getModuleDirectoryByModuleName(dependency);
+
+            if (moduleDir == null) {
+                return Pair.create("", "");
+            }
+            final PsiFile virtualFile = moduleDir.findFile(ComposerJson.FILE_NAME);
 
             if (virtualFile != null) { //NOPMD
                 final VirtualFile composerJsonFile = virtualFile.getVirtualFile();

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/generation/generator/ModuleEmailTemplateHtmlGenerator.java

@@ -51,6 +51,7 @@ public ModuleEmailTemplateHtmlGenerator(
      * @param actionName Action name
      * @return PsiFile
      */
+    @Override
     public PsiFile generate(final String actionName) {
         final PsiFile templateFile = FileBasedIndexUtil.findModuleViewFile(
                 this.emailTemplateData.getFileName(),
@@ -67,6 +68,10 @@ public PsiFile generate(final String actionName) {
         PsiDirectory parentDirectory = this.moduleIndex.getModuleDirectoryByModuleName(
                 this.emailTemplateData.getModule()
         );
+
+        if (parentDirectory == null) {
+            return null;
+        }
         final ArrayList<String> fileDirectories = new ArrayList<>();
 
         fileDirectories.add(Package.moduleViewDir);
@@ -96,7 +101,7 @@ protected void fillAttributes(final Properties attributes) {
         attributes.setProperty("SUBJECT", emailTemplateData.getSubject());
         attributes.setProperty("TYPE", emailTemplateData.getType());
 
-        if (emailTemplateData.getType().equals(EmailTemplateHtml.HTML_TYPE)) {
+        if (EmailTemplateHtml.HTML_TYPE.equals(emailTemplateData.getType())) {
             attributes.setProperty("HTML_TYPE", "true");
         }
     }

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

@@ -117,7 +117,7 @@ private int getInsertPos(final PhpClass graphQlResolverClass) {
                 LeafPsiElement.class
         );
         for (final LeafPsiElement leafPsiElement: leafElements) {
-            if (!leafPsiElement.getText().equals(MagentoPhpClass.CLOSING_TAG)) {
+            if (!MagentoPhpClass.CLOSING_TAG.equals(leafPsiElement.getText())) {
                 continue;
             }
             insertPos = leafPsiElement.getTextOffset();
@@ -128,6 +128,10 @@ private int getInsertPos(final PhpClass graphQlResolverClass) {
     private PhpClass createGraphQlResolverClass(final String actionName) {
         PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(graphQlResolverFileData.getGraphQlResolverModule());
+
+        if (parentDirectory == null) {
+            return null;
+        }
         final String[] graphQlResolverDirectories = graphQlResolverFileData
                 .getGraphQlResolverDirectory().split(File.separator);
         for (final String graphQlResolverDirectory: graphQlResolverDirectories) {

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

@@ -58,6 +58,7 @@ public ModuleViewModelClassGenerator(
      * @param actionName String
      * @return PsiFile
      */
+    @Override
     public PsiFile generate(final String actionName) {
         final PhpClass block = GetPhpClassByFQN.getInstance(project).execute(getViewModelFqn());
         final String errorTitle = commonBundle.message("common.error");
@@ -106,6 +107,10 @@ private String getViewModelFqn() {
     private PhpFile createViewModelClass(final String actionName) {
         PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(getViewModelModule());
+
+        if (parentDirectory == null) {
+            return null;
+        }
         final String[] viewModelDirectories = viewModelFileData.getViewModelDirectory()
                 .split(File.separator);
         for (final String viewModelDirectory: viewModelDirectories) {
@@ -128,6 +133,7 @@ private PhpFile createViewModelClass(final String actionName) {
         return (PhpFile) viewModelFile;
     }
 
+    @Override
     protected void fillAttributes(final Properties attributes) {
         final String viewModelClassName = viewModelFileData.getViewModelClassName();
         attributes.setProperty("NAME", viewModelClassName);