From 59943bfd19c263e215171d7b2b18c11ad4f3ee09 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 11 Oct 2018 10:17:59 +0300
Subject: [PATCH] refactor PatternDialectProvider: pull method
 getGroupModulePattern up and mark protected

This is needed to avoid accessing package-private members of platform modules from java modules (IDEA-200277).
---
 .../ui/PackagePatternProvider.java                    |  2 +-
 .../ui/PatternDialectProvider.java                    | 11 +++++++++++
 .../ui/ProjectPatternProvider.java                    | 11 -----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java b/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java
index 170eebdb97e5..f5902829af46 100644
--- a/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java
+++ b/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java
@@ -54,7 +54,7 @@ public class PackagePatternProvider extends PatternDialectProvider {
     final String scope = scope1;
     if (node instanceof ModuleGroupNode){
       if (!recursively) return null;
-      return new PatternPackageSet("*..*", scope, ProjectPatternProvider.getGroupModulePattern((ModuleGroupNode)node));
+      return new PatternPackageSet("*..*", scope, PatternDialectProvider.getGroupModulePattern((ModuleGroupNode)node));
     } else if (node instanceof ModuleNode) {
       if (!recursively) return null;
       final String modulePattern = ((ModuleNode)node).getModuleName();
diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/PatternDialectProvider.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/PatternDialectProvider.java
index f369e37accfa..ceee9fb253d6 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/PatternDialectProvider.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/PatternDialectProvider.java
@@ -4,6 +4,7 @@ package com.intellij.packageDependencies.ui;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.module.ModuleGrouperKt;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.PsiFile;
@@ -54,4 +55,14 @@ public abstract class PatternDialectProvider {
   }
 
   public abstract Icon getIcon();
+
+  @NotNull
+  protected static String getGroupModulePattern(ModuleGroupNode node) {
+    if (ModuleGrouperKt.isQualifiedModuleNamesEnabled(node.getProject())) {
+      return node.getModuleGroup().getQualifiedName() + "*";
+    }
+    else {
+      return "group:" + node.getModuleGroup().toString();
+    }
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java
index 1189b791aa61..87d5a56d52b6 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleGrouperKt;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectRootManager;
@@ -127,16 +126,6 @@ public class ProjectPatternProvider extends PatternDialectProvider {
     return AllIcons.General.ProjectTab;
   }
 
-  @NotNull
-  static String getGroupModulePattern(ModuleGroupNode node) {
-    if (ModuleGrouperKt.isQualifiedModuleNamesEnabled(node.getProject())) {
-      return node.getModuleGroup().getQualifiedName() + "*";
-    }
-    else {
-      return "group:" + node.getModuleGroup().toString();
-    }
-  }
-
   private static final class CompactEmptyMiddlePackagesAction extends ToggleAction {
     private final Runnable myUpdate;