From d4cbf004f3cfb090c5d026ec16379b69ae6d3ba9 Mon Sep 17 00:00:00 2001
From: Alexander Doroshko <alexander.doroshko@jetbrains.com>
Date: Wed, 21 Nov 2018 12:26:12 +0300
Subject: [PATCH] Move ProjectViewFileNestingService.RULE_COMPARATOR to
 FileNestingInProjectViewDialog

---
 .../projectView/impl/FileNestingInProjectViewDialog.java    | 6 ++++--
 .../ide/projectView/impl/ProjectViewFileNestingService.java | 3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/FileNestingInProjectViewDialog.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/FileNestingInProjectViewDialog.java
index 3ca9a86760e5..22c4a547e542 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/FileNestingInProjectViewDialog.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/FileNestingInProjectViewDialog.java
@@ -24,6 +24,8 @@ import java.util.*;
 import java.util.List;
 
 public class FileNestingInProjectViewDialog extends DialogWrapper {
+  private static final Comparator<NestingRule> RULE_COMPARATOR =
+    Comparator.comparing(o -> o.getParentFileSuffix() + " " + o.getChildFileSuffix());
 
   private final JBCheckBox myUseNestingRulesCheckBox;
   private final JPanel myRulesPanel;
@@ -189,7 +191,7 @@ public class FileNestingInProjectViewDialog extends DialogWrapper {
 
   private void resetTable(@NotNull final List<NestingRule> rules) {
     final SortedMap<String, CombinedNestingRule> result = new TreeMap<>();
-    for (NestingRule rule : ContainerUtil.sorted(rules, ProjectViewFileNestingService.RULE_COMPARATOR)) {
+    for (NestingRule rule : ContainerUtil.sorted(rules, RULE_COMPARATOR)) {
       final CombinedNestingRule r = result.get(rule.getParentFileSuffix());
       if (r == null) {
         result.put(rule.getParentFileSuffix(), new CombinedNestingRule(rule.getParentFileSuffix(), rule.getChildFileSuffix()));
@@ -206,7 +208,7 @@ public class FileNestingInProjectViewDialog extends DialogWrapper {
     useNestingRulesOptionConsumer.consume(myUseNestingRulesCheckBox.isSelected());
 
     if (myUseNestingRulesCheckBox.isSelected()) {
-      final SortedSet<NestingRule> result = new TreeSet<>(ProjectViewFileNestingService.RULE_COMPARATOR);
+      final SortedSet<NestingRule> result = new TreeSet<>(RULE_COMPARATOR);
       for (CombinedNestingRule rule : myTable.getListTableModel().getItems()) {
         for (String childSuffix : StringUtil.split(rule.childSuffixes, ";")) {
           if (!StringUtil.isEmptyOrSpaces(childSuffix)) {
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewFileNestingService.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewFileNestingService.java
index 151638f0113a..7cff20f3e8f0 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewFileNestingService.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewFileNestingService.java
@@ -31,9 +31,6 @@ public class ProjectViewFileNestingService implements PersistentStateComponent<P
   private static final ExtensionPointName<ProjectViewNestingRulesProvider> EP_NAME =
     ExtensionPointName.create("com.intellij.projectViewNestingRulesProvider");
 
-  static final Comparator<NestingRule> RULE_COMPARATOR =
-    Comparator.comparing(o -> o.getParentFileSuffix() + " " + o.getChildFileSuffix());
-
   private MyState myState = new MyState();
   private long myModCount;