Merge branch '4.4.0-develop' of github.com:magento/magento2-phpstorm-plugin into 1111-context-action-readme-generation

Author: bohdan-harniuk

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

@@ -146,7 +146,7 @@ private void suggestPreferenceDirectory(final PhpClass targetClass) {
         if (fqnParts.length != 0) {
             fqnParts = ArrayUtil.remove(fqnParts, fqnParts.length - 1);
         }
-        if (fqnParts[1] != null) {
+        if (fqnParts.length > 1 && fqnParts[1] != null) {
             fqnParts = ArrayUtil.remove(fqnParts, 1);
         }
         if (fqnParts[0] != null) {

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

@@ -42,7 +42,7 @@ public static String buildNewBugReportBody(
             final @NotNull String stackTrace,
             final int maxAllowedBodyLength
     ) {
-        final int maxAllowedStackTraceLength = getMaxAllowedStackTraceLength(
+        int maxAllowedStackTraceLength = getMaxAllowedStackTraceLength(
                 project,
                 bugDescription,
                 maxAllowedBodyLength
@@ -56,6 +56,9 @@ public static String buildNewBugReportBody(
         String encodedCutStackTrace = "";
 
         while (!isFound) {
+            if (stackTrace.length() < maxAllowedStackTraceLength) {
+                maxAllowedStackTraceLength = stackTrace.length();
+            }
             final String cutStackTrace = stackTrace.substring(0, maxAllowedStackTraceLength - step);
             encodedCutStackTrace = encode(cutStackTrace);