Merge branch '4.2.2-develop' of github.com:magento/magento2-phpstorm-plugin into 633-no-such-element-exception-when-creating-new-controller

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/magento/packages/MessageQueueConnections.java

@@ -9,8 +9,9 @@
 import java.util.List;
 
 public enum MessageQueueConnections {
+
     DB("db"),
-    AMPQ("ampq");
+    AMPQ("amqp");
 
     private final String type;
 
@@ -32,16 +33,6 @@ public String getType() {
         return type;
     }
 
-    /**
-     * Get connection type by name.
-     *
-     * @param typeName type name
-     * @return Request Interface
-     */
-    public static String getConnectionTypeByName(final String typeName) {
-        return MessageQueueConnections.valueOf(typeName).getType();
-    }
-
     /**
      * Get list of connection types.
      *
@@ -51,7 +42,7 @@ public static List<String> getList() {
         final List<String> typeList = new ArrayList<>();
 
         for (final MessageQueueConnections type: MessageQueueConnections.values()) {
-            typeList.add(getConnectionTypeByName(type.name()));
+            typeList.add(type.getType());
         }
 
         return typeList;

src/com/magento/idea/magento2uct/util/php/MagentoTypeEscapeUtil.java

@@ -32,7 +32,13 @@ private MagentoTypeEscapeUtil() {
         String result = typeFqn;
 
         while (matcher.find()) {
-            result = result.substring(0, matcher.start(0)) + result.substring(matcher.end(0));
+            final int begin = matcher.start(0);
+            final int end = matcher.end(0);
+
+            if (begin < 0 || begin > end || end > result.length()) {
+                continue;
+            }
+            result = result.substring(0, begin) + result.substring(end);
         }
 
         return typeFqn.equals(result) ? typeFqn : result;