Merge branch '4.2.2-develop' of github.com:magento/magento2-phpstorm-plugin into 654-fix-ClassCastException-in-WebApiTypeIndex

Author: bohdan-harniuk

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

@@ -21,10 +21,13 @@
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import javax.swing.JOptionPane;
 
 public class MessageQueueClassGenerator extends FileGenerator {
+
     private final MessageQueueClassData messageQueueClassDataName;
     private final Project project;
     private final DirectoryGenerator directoryGenerator;
@@ -33,6 +36,7 @@ public class MessageQueueClassGenerator extends FileGenerator {
     private final CommonBundle commonBundle;
     private final String moduleName;
     private final GetFirstClassOfFile getFirstClassOfFile;
+    private final List<String> errors = new ArrayList<>();
 
     /**
      * Message queue handler constructor.
@@ -68,40 +72,34 @@ public PsiFile generate(final String actionName) {
             );
 
             if (handler != null) {
-                final String errorMessage = this.validatorBundle.message(
+                errors.add(validatorBundle.message(
                         "validator.file.alreadyExists",
                         "Handler Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
+                ));
                 return;
             }
-
             handler = createHandlerClass(actionName);
 
             if (handler == null) {
-                final String errorMessage = this.validatorBundle.message(
+                errors.add(validatorBundle.message(
                         "validator.file.cantBeCreated",
                         "Handler Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
+                ));
                 return;
             }
 
             handlerFiles[0] = handler.getContainingFile();
         });
 
+        for (final String errorMessage : errors) {
+            JOptionPane.showMessageDialog(
+                    null,
+                    errorMessage,
+                    commonBundle.message("common.error"),
+                    JOptionPane.ERROR_MESSAGE
+            );
+        }
+
         return handlerFiles[0];
     }
 

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

@@ -31,6 +31,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
 import javax.swing.JOptionPane;
 
 public class ModuleControllerClassGenerator extends FileGenerator {
@@ -73,47 +74,49 @@ public ModuleControllerClassGenerator(
     @Override
     public PsiFile generate(final String actionName) {
         final PsiFile[] controllerFiles = new PsiFile[1];
+        final AtomicBoolean isControllerExists = new AtomicBoolean(false);
+        final AtomicBoolean isControllerCanNotBeCreated = new AtomicBoolean(false);
 
         WriteCommandAction.runWriteCommandAction(project, () -> {
             PhpClass controller = GetPhpClassByFQN.getInstance(project).execute(
                     getControllerFqn()
             );
 
             if (controller != null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.alreadyExists",
-                        "Controller Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
+                isControllerExists.set(true);
                 return;
             }
-
             controller = createControllerClass(actionName);
 
             if (controller == null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.cantBeCreated",
-                        "Controller Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
+                isControllerCanNotBeCreated.set(true);
                 return;
             }
-
             controllerFiles[0] = controller.getContainingFile();
         });
 
+        if (isControllerExists.get()) {
+            JOptionPane.showMessageDialog(
+                    null,
+                    validatorBundle.message(
+                            "validator.file.alreadyExists",
+                            "Controller Class"
+                    ),
+                    commonBundle.message("common.error"),
+                    JOptionPane.ERROR_MESSAGE
+            );
+        } else if (isControllerCanNotBeCreated.get()) {
+            JOptionPane.showMessageDialog(
+                    null,
+                    validatorBundle.message(
+                            "validator.file.cantBeCreated",
+                            "Controller Class"
+                    ),
+                    commonBundle.message("common.error"),
+                    JOptionPane.ERROR_MESSAGE
+            );
+        }
+
         return controllerFiles[0];
     }
 

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

@@ -5,6 +5,7 @@
 
 package com.magento.idea.magento2plugin.indexes;
 
+import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -118,8 +119,12 @@ private List<String> getNames(
      * @return PsiDirectory
      */
     public @Nullable PsiDirectory getModuleDirectoryByModuleName(final String moduleName) {
+        if (DumbService.getInstance(project).isDumb()) {
+            return null;
+        }
         final FileBasedIndex index = FileBasedIndex
                 .getInstance();
+
         final Collection<VirtualFile> files = index.getContainingFiles(
                 ModuleNameIndex.KEY,
                 moduleName,

src/com/magento/idea/magento2plugin/project/diagnostic/github/GitHubNewIssueBodyBuilderUtil.java

@@ -51,13 +51,22 @@ public static String buildNewBugReportBody(
         if (encode(stackTrace).length() <= maxAllowedStackTraceLength) {
             return buildTemplate(project, bugDescription, stackTrace);
         }
+        boolean isFound = false;
+        int step = 1;
+        String encodedCutStackTrace = "";
+
+        while (!isFound) {
+            final String cutStackTrace = stackTrace.substring(0, maxAllowedStackTraceLength - step);
+            encodedCutStackTrace = encode(cutStackTrace);
+
+            if (encodedCutStackTrace.length() <= maxAllowedStackTraceLength) {
+                isFound = true;
+            } else {
+                step += 10;
+            }
+        }
 
-        final String cutStackTrace = encode(stackTrace).substring(
-                0,
-                maxAllowedStackTraceLength - 1
-        );
-
-        return buildTemplate(project, bugDescription, decode(cutStackTrace));
+        return buildTemplate(project, bugDescription, decode(encodedCutStackTrace));
     }
 
     /**