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).
This commit is contained in:
nik
2018-10-11 10:29:41 +03:00
parent ae86d8d617
commit 59943bfd19
3 changed files with 12 additions and 12 deletions
@@ -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();
@@ -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();
}
}
}
@@ -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;