Fixed static test failures

Author: drpayyne

src/com/magento/idea/magento2plugin/linemarker/php/PluginTargetLineMarkerProvider.java

@@ -2,24 +2,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.linemarker.php;
 
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
 import com.intellij.codeInsight.daemon.LineMarkerProvider;
 import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
 import com.intellij.icons.AllIcons;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.magento.files.Plugin;
 import com.magento.idea.magento2plugin.project.Settings;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.magento.idea.magento2plugin.util.magento.plugin.GetTargetClassNamesByPluginClassName;
-import com.intellij.psi.util.PsiTreeUtil;
-
-import java.util.*;
 
 public class PluginTargetLineMarkerProvider implements LineMarkerProvider {
     @Nullable
@@ -29,23 +32,28 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
     }
 
     @Override
-    public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNull Collection<LineMarkerInfo> collection) {
+    public void collectSlowLineMarkers(
+            @NotNull List<PsiElement> psiElements,
+            @NotNull Collection<LineMarkerInfo> collection
+    ) {
         if (psiElements.size() > 0) {
             if (!Settings.isEnabled(psiElements.get(0).getProject())) {
                 return;
             }
         }
         PluginClassCache pluginClassCache = new PluginClassCache();
-        TargetClassesCollector TargetClassesCollector = new TargetClassesCollector(pluginClassCache);
-        TargetMethodsCollector TargetMethodsCollector = new TargetMethodsCollector(pluginClassCache);
+        TargetClassesCollector targetClassesCollector =
+                new TargetClassesCollector(pluginClassCache);
+        TargetMethodsCollector targetMethodsCollector =
+                new TargetMethodsCollector(pluginClassCache);
 
         for (PsiElement psiElement : psiElements) {
             if (psiElement instanceof PhpClass || psiElement instanceof Method) {
                 List<? extends PsiElement> results;
 
                 if (psiElement instanceof PhpClass) {
-                    results = TargetClassesCollector.collect((PhpClass) psiElement);
-                    if (results.size() > 0 ) {
+                    results = targetClassesCollector.collect((PhpClass) psiElement);
+                    if (results.size() > 0) {
                         collection.add(NavigationGutterIconBuilder
                                 .create(AllIcons.Nodes.Class)
                                 .setTargets(results)
@@ -54,8 +62,8 @@ public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNu
                         );
                     }
                 } else {
-                    results = TargetMethodsCollector.collect((Method) psiElement);
-                    if (results.size() > 0 ) {
+                    results = targetMethodsCollector.collect((Method) psiElement);
+                    if (results.size() > 0) {
                         collection.add(NavigationGutterIconBuilder
                                 .create(AllIcons.Nodes.Method)
                                 .setTargets(results)
@@ -70,16 +78,21 @@ public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNu
     }
 
     private static class PluginClassCache {
-        private HashMap<String, List<PhpClass>> pluginClassesMap = new HashMap<String, List<PhpClass>>();
+        private HashMap<String, List<PhpClass>> pluginClassesMap =
+                new HashMap<String, List<PhpClass>>();
 
-        List<PhpClass> getTargetClassesForPlugin(@NotNull PhpClass phpClass, @NotNull String classFQN) {
+        List<PhpClass> getTargetClassesForPlugin(
+                @NotNull PhpClass phpClass,
+                @NotNull String classFQN
+        ) {
             List<PhpClass> results = new ArrayList<>();
 
             if (pluginClassesMap.containsKey(classFQN)) {
                 return pluginClassesMap.get(classFQN);
             }
 
-            GetTargetClassNamesByPluginClassName targetClassesService = GetTargetClassNamesByPluginClassName.getInstance(phpClass.getProject());
+            GetTargetClassNamesByPluginClassName targetClassesService =
+                    GetTargetClassNamesByPluginClassName.getInstance(phpClass.getProject());
             ArrayList<String> targetClassNames = targetClassesService.execute(classFQN);
 
             if (targetClassNames.size() == 0) {
@@ -103,7 +116,9 @@ List<PhpClass> getTargetClassesForPlugin(@NotNull PhpClass phpClass, @NotNull St
         }
 
         List<PhpClass> getTargetClassesForPlugin(@NotNull PhpClass phpClass) {
-            List<PhpClass> classesForPlugin = getTargetClassesForPlugin(phpClass, phpClass.getPresentableFQN());
+            List<PhpClass> classesForPlugin = getTargetClassesForPlugin(
+                    phpClass, phpClass.getPresentableFQN()
+            );
             for (PhpClass parent: phpClass.getSupers()) {
                 classesForPlugin.addAll(getTargetClassesForPlugin(parent));
             }
@@ -171,8 +186,7 @@ public List<Method> collect(@NotNull Method pluginMethod) {
 
         private String getTargetMethodName(Method pluginMethod, String pluginPrefix) {
             String pluginMethodName = pluginMethod.getName();
-            String targetClassMethodName = pluginMethodName.
-                    replace(pluginPrefix, "");
+            String targetClassMethodName = pluginMethodName.replace(pluginPrefix, "");
             if (targetClassMethodName.isEmpty()) {
                 return null;
             }
@@ -181,7 +195,8 @@ private String getTargetMethodName(Method pluginMethod, String pluginPrefix) {
             if (charType == Character.LOWERCASE_LETTER) {
                 return null;
             }
-            return Character.toLowerCase(firstCharOfTargetName) + targetClassMethodName.substring(1);
+            return Character.toLowerCase(firstCharOfTargetName)
+                    + targetClassMethodName.substring(1);
         }
 
         private String getPluginPrefix(Method pluginMethod) {