Code review fixes

Vitaliy Boyko · Vitaliy Boyko · commit 65a9262bd1f5 · 2020-04-09T16:19:00.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@
     * RequireJS mapping support (reference navigation, completion)
     * Plugin class methods generation
     * Plugin declaration inspection in the scope of a Plugin Class
-    * MFTF support (reference navigation, completion)
+    * MFTF support MVP (reference navigation, completion)
     * Fixed support of 2020.* versions of IDE's
     * Create a New Magento 2 Module action
     * Code Inspection: Duplicated Observer Usage in events XML
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleComposerJsonData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleComposerJsonData.java
@@ -72,6 +72,7 @@ public List<String> getModuleDependencies() {
         return moduleDependencies;
     }
 
-    public boolean getCreateModuleDirs() { return this.createModuleDirs; }
-
+    public boolean getCreateModuleDirs() {
+        return this.createModuleDirs;
+    }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleRegistrationPhpData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleRegistrationPhpData.java
@@ -36,5 +36,7 @@ public PsiDirectory getBaseDir() {
         return this.baseDir;
     }
 
-    public boolean getCreateModuleDirs() { return this.createModuleDirs; }
+    public boolean getCreateModuleDirs() {
+        return this.createModuleDirs;
+    }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java
@@ -36,5 +36,7 @@ public PsiDirectory getBaseDir() {
         return this.baseDir;
     }
 
-    public boolean getCreateModuleDirs() { return this.createModuleDirs; }
+    public boolean getCreateModuleDirs() {
+        return this.createModuleDirs;
+    }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java
@@ -9,7 +9,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
-import com.intellij.util.indexing.FileBasedIndex;
 import com.magento.idea.magento2plugin.actions.generation.NewModuleAction;
 import com.magento.idea.magento2plugin.actions.generation.data.ModuleComposerJsonData;
 import com.magento.idea.magento2plugin.actions.generation.data.ModuleRegistrationPhpData;
@@ -24,16 +23,13 @@
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.project.Settings;
-import com.magento.idea.magento2plugin.stubs.indexes.ModuleNameIndex;
 import com.magento.idea.magento2plugin.util.CamelCaseToHyphen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import java.awt.event.*;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Vector;
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java
@@ -45,9 +45,8 @@ public PsiFile generate(String actionName) {
         if (moduleComposerJsonData.getCreateModuleDirs()) {
             ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleComposerJsonData.getPackageName(), moduleComposerJsonData.getModuleName(), moduleComposerJsonData.getBaseDir());
             return fileFromTemplateGenerator.generate(ComposerJson.getInstance(), getAttributes(), moduleDirectoriesData.getModuleDirectory(), actionName);
-        } else {
-            return fileFromTemplateGenerator.generate(ComposerJson.getInstance(), getAttributes(), moduleComposerJsonData.getBaseDir(), actionName);
         }
+        return fileFromTemplateGenerator.generate(ComposerJson.getInstance(), getAttributes(), moduleComposerJsonData.getBaseDir(), actionName);
     }
 
     protected void fillAttributes(Properties attributes) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleRegistrationPhpGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleRegistrationPhpGenerator.java
@@ -31,9 +31,8 @@ public PsiFile generate(String actionName) {
         if (moduleRegistrationPhpData.getCreateModuleDirs()) {
             ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleRegistrationPhpData.getPackageName(), moduleRegistrationPhpData.getModuleName(), moduleRegistrationPhpData.getBaseDir());
             return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleDirectoriesData.getModuleDirectory(), actionName);
-        } else {
-            return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleRegistrationPhpData.getBaseDir(), actionName);
         }
+        return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleRegistrationPhpData.getBaseDir(), actionName);
     }
 
     protected void fillAttributes(Properties attributes) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java
@@ -34,10 +34,9 @@ public PsiFile generate(String actionName) {
         if (moduleXmlData.getCreateModuleDirs()) {
             ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleXmlData.getPackageName(), moduleXmlData.getModuleName(), moduleXmlData.getBaseDir());
             return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), moduleDirectoriesData.getModuleEtcDirectory(), actionName);
-        } else {
-            PsiDirectory etcDirectory = directoryGenerator.findOrCreateSubdirectory(moduleXmlData.getBaseDir(), Package.MODULE_BASE_AREA_DIR);
-            return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), etcDirectory, actionName);
         }
+        PsiDirectory etcDirectory = directoryGenerator.findOrCreateSubdirectory(moduleXmlData.getBaseDir(), Package.MODULE_BASE_AREA_DIR);
+        return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), etcDirectory, actionName);
     }
 
     protected void fillAttributes(Properties attributes) {
diff --git a/src/com/magento/idea/magento2plugin/generation/MagentoModuleGenerator.java b/src/com/magento/idea/magento2plugin/generation/MagentoModuleGenerator.java
@@ -28,7 +28,6 @@
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-
 import java.util.ArrayList;
 
 public class MagentoModuleGenerator extends WebProjectTemplate<MagentoProjectGeneratorSettings> {
diff --git a/src/com/magento/idea/magento2plugin/generation/MagentoProjectGeneratorSettings.java b/src/com/magento/idea/magento2plugin/generation/MagentoProjectGeneratorSettings.java
@@ -5,7 +5,6 @@
 package com.magento.idea.magento2plugin.generation;
 
 import com.magento.idea.magento2plugin.project.Settings;
-
 import java.util.List;
 
 public class MagentoProjectGeneratorSettings {
diff --git a/src/com/magento/idea/magento2plugin/init/ConfigurationManager.java b/src/com/magento/idea/magento2plugin/init/ConfigurationManager.java
@@ -87,7 +87,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                         ContentEntry[] entries = contentEntries;
                         int length = contentEntries.length;
 
-                        for(int i = 0; i < length; ++i) {
+                        for (int i = 0; i < length; ++i) {
                             ContentEntry entry = entries[i];
                             VirtualFile entryFile = entry.getFile();
                             if (entryFile != null && VfsUtilCore.isAncestor(entryFile, project.getBaseDir(), false)) {
@@ -215,7 +215,7 @@ private static boolean isFileInsideModule(@NotNull VirtualFile magentoFile, @Not
         VirtualFile[] roots = contentRoots;
         int length = contentRoots.length;
 
-        for(int i = 0; i < length; ++i) {
+        for (int i = 0; i < length; ++i) {
             VirtualFile root = roots[i];
             if (VfsUtilCore.isAncestor(root, magentoFile, false)) {
                 return true;
@@ -237,7 +237,7 @@ public static void notifyGlobally(@Nullable Project project, String title, Strin
         Function[] functions = actions;
         int length = actions.length;
 
-        for(int i = 0; i < length; ++i) {
+        for (int i = 0; i < length; ++i) {
             Function<Notification, AnAction> generator = functions[i];
             notification.addAction(generator.apply(notification));
         }

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public List<String> getModuleDependencies() {`
`72`	`72`	`return moduleDependencies;`
`73`	`73`	`}`
`74`	`74`
`75`		`- public boolean getCreateModuleDirs() { return this.createModuleDirs; }`
`76`		`-`
	`75`	`+ public boolean getCreateModuleDirs() {`
	`76`	`+ return this.createModuleDirs;`
	`77`	`+ }`
`77`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,7 @@ public PsiDirectory getBaseDir() {`
`36`	`36`	`return this.baseDir;`
`37`	`37`	`}`
`38`	`38`
`39`		`- public boolean getCreateModuleDirs() { return this.createModuleDirs; }`
	`39`	`+ public boolean getCreateModuleDirs() {`
	`40`	`+ return this.createModuleDirs;`
	`41`	`+ }`
`40`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,8 @@ public PsiFile generate(String actionName) {`
`45`	`45`	`if (moduleComposerJsonData.getCreateModuleDirs()) {`
`46`	`46`	`ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleComposerJsonData.getPackageName(), moduleComposerJsonData.getModuleName(), moduleComposerJsonData.getBaseDir());`
`47`	`47`	`return fileFromTemplateGenerator.generate(ComposerJson.getInstance(), getAttributes(), moduleDirectoriesData.getModuleDirectory(), actionName);`
`48`		`- } else {`
`49`		`- return fileFromTemplateGenerator.generate(ComposerJson.getInstance(), getAttributes(), moduleComposerJsonData.getBaseDir(), actionName);`
`50`	`48`	`}`
	`49`	`+ return fileFromTemplateGenerator.generate(ComposerJson.getInstance(), getAttributes(), moduleComposerJsonData.getBaseDir(), actionName);`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`protected void fillAttributes(Properties attributes) {`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,8 @@ public PsiFile generate(String actionName) {`
`31`	`31`	`if (moduleRegistrationPhpData.getCreateModuleDirs()) {`
`32`	`32`	`ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleRegistrationPhpData.getPackageName(), moduleRegistrationPhpData.getModuleName(), moduleRegistrationPhpData.getBaseDir());`
`33`	`33`	`return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleDirectoriesData.getModuleDirectory(), actionName);`
`34`		`- } else {`
`35`		`- return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleRegistrationPhpData.getBaseDir(), actionName);`
`36`	`34`	`}`
	`35`	`+ return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleRegistrationPhpData.getBaseDir(), actionName);`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`protected void fillAttributes(Properties attributes) {`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,9 @@ public PsiFile generate(String actionName) {`
`34`	`34`	`if (moduleXmlData.getCreateModuleDirs()) {`
`35`	`35`	`ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleXmlData.getPackageName(), moduleXmlData.getModuleName(), moduleXmlData.getBaseDir());`
`36`	`36`	`return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), moduleDirectoriesData.getModuleEtcDirectory(), actionName);`
`37`		`- } else {`
`38`		`- PsiDirectory etcDirectory = directoryGenerator.findOrCreateSubdirectory(moduleXmlData.getBaseDir(), Package.MODULE_BASE_AREA_DIR);`
`39`		`- return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), etcDirectory, actionName);`
`40`	`37`	`}`
	`38`	`+ PsiDirectory etcDirectory = directoryGenerator.findOrCreateSubdirectory(moduleXmlData.getBaseDir(), Package.MODULE_BASE_AREA_DIR);`
	`39`	`+ return fileFromTemplateGenerator.generate(ModuleXml.getInstance(), getAttributes(), etcDirectory, actionName);`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`protected void fillAttributes(Properties attributes) {`