Merge pull request #786 from bohdan-harniuk/uct-sort-errors-by-lines

UCT-768: Sort errors by lines

Author: andrewbess

src/com/magento/idea/magento2uct/execution/GenerateUctReportCommand.java

@@ -32,6 +32,7 @@
 import com.magento.idea.magento2uct.inspections.UctProblemsHolder;
 import com.magento.idea.magento2uct.packages.SupportedIssue;
 import com.magento.idea.magento2uct.settings.UctSettingsService;
+import com.magento.idea.magento2uct.util.inspection.SortDescriptorResultsUtil;
 import java.nio.file.Paths;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -129,7 +130,9 @@ public void execute() {
                         }
 
                         for (final ProblemDescriptor descriptor
-                                : fileProblemsHolder.getResults()) {
+                                : SortDescriptorResultsUtil.sort(
+                                        fileProblemsHolder.getResults()
+                        )) {
                             final Integer code = fileProblemsHolder.getErrorCodeForDescriptor(
                                     descriptor
                             );

src/com/magento/idea/magento2uct/execution/output/Summary.java

@@ -44,7 +44,7 @@ public Summary(
      * @return String
      */
     public String getInstalledVersion() {
-        return installedVersion == null ? "" : installedVersion.getVersion();
+        return installedVersion == null ? "Less than 2.3.0" : installedVersion.getVersion();
     }
 
     /**

src/com/magento/idea/magento2uct/inspections/UctInspectionManager.java

@@ -62,9 +62,10 @@ public UctInspectionManager(final @NotNull Project project) {
                 psiFile,
                 false
         );
+        final List<PsiElementVisitor> visitors = SupportedIssue.getVisitors(problemsHolder);
 
         for (final PsiElement element : collectElements(phpClass)) {
-            for (final PsiElementVisitor visitor : SupportedIssue.getVisitors(problemsHolder)) {
+            for (final PsiElementVisitor visitor : visitors) {
                 element.accept(visitor);
             }
         }

src/com/magento/idea/magento2uct/settings/UctSettingsService.java

@@ -161,6 +161,17 @@ public void setCurrentVersion(final @Nullable SupportedVersion version) {
         return SupportedVersion.getVersion(currentVersion);
     }
 
+    /**
+     * Get current version or default version instead.
+     *
+     * @return SupportedVersion
+     */
+    public @NotNull SupportedVersion getCurrentVersionOrDefault() {
+        final SupportedVersion currentVersion = getCurrentVersion();
+
+        return currentVersion == null ? SupportedVersion.V230 : currentVersion;
+    }
+
     /**
      * Set target version.
      *

src/com/magento/idea/magento2uct/ui/ConfigurationDialog.java

@@ -127,7 +127,14 @@ private void onOK() {
             return;
         }
         settingsService.setEnabled(enable.isSelected());
-        final String currentVersionValue = currentVersion.getSelectedItem().toString();
+
+        final ComboBoxItemData currentVersionItemData =
+                (ComboBoxItemData) currentVersion.getSelectedItem();
+        String currentVersionValue = "";
+
+        if (currentVersionItemData != null) {
+            currentVersionValue = currentVersionItemData.getKey();
+        }
 
         settingsService.setCurrentVersion(
                 currentVersionValue.isEmpty()

src/com/magento/idea/magento2uct/util/inspection/SortDescriptorResultsUtil.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2uct.util.inspection;
+
+import com.intellij.codeInspection.ProblemDescriptor;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
+public final class SortDescriptorResultsUtil {
+
+    private SortDescriptorResultsUtil() {
+    }
+
+    /**
+     * Get problems sorted by its lines.
+     *
+     * @param problems List[ProblemDescriptor]
+     *
+     * @return List[ProblemDescriptor]
+     */
+    public static List<ProblemDescriptor> sort(final List<ProblemDescriptor> problems) {
+        if (problems.isEmpty()) {
+            return problems;
+        }
+        problems.sort(Comparator.comparingInt(ProblemDescriptor::getLineNumber));
+
+        return new LinkedList<>(problems);
+    }
+}

src/com/magento/idea/magento2uct/versioning/VersionStateManager.java

@@ -42,7 +42,7 @@ public static synchronized VersionStateManager getInstance(
 
         if (instance == null
                 || !instance.isValidFor(settingsService.shouldIgnoreCurrentVersion(),
-                settingsService.getCurrentVersion(),
+                settingsService.getCurrentVersionOrDefault(),
                 settingsService.getTargetVersion()
         )) {
             instance = new VersionStateManager(project);
@@ -111,7 +111,7 @@ public boolean isApi(final @NotNull String fqn) {
     private VersionStateManager(final @NotNull Project project) {
         final UctSettingsService settingsService = UctSettingsService.getInstance(project);
         isSetIgnoreFlag = settingsService.shouldIgnoreCurrentVersion();
-        currentVersion = settingsService.getCurrentVersion();
+        currentVersion = settingsService.getCurrentVersionOrDefault();
         targetVersion = settingsService.getTargetVersion();
         versionsToLoad = new LinkedList<>();