Merge pull request #894 from Iamwade/842-incomplete-trailing-escape

842 incomplete trailing escape

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/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));
     }
 
     /**