From 0ad16c95137c853fcb52cb7dd9a550a2d342156d Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 10 Oct 2018 18:17:27 +0300 Subject: [PATCH] platform: make utility methods used in Java plugin public (IDEA-200277) --- .../codeInspection/ex/HTMLComposerImpl.java | 16 ++++++++-------- .../find/findUsages/FindUsagesHelper.java | 10 +++++----- .../psi/impl/search/PsiSearchHelperImpl.java | 2 +- .../codeInsight/completion/CompletionUtil.java | 2 +- .../codeInsight/editorActions/TypedHandler.java | 2 +- .../execution/util/ProgramParametersUtil.java | 4 ++-- .../copy/CopyFilesOrDirectoriesHandler.java | 2 +- .../intellij/refactoring/copy/CopyHandler.java | 2 +- .../usages/impl/rules/FileGroupingRule.java | 2 +- .../vcs/checkout/ProjectCheckoutListener.java | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java index c5b1faead894..9f7493a72d7e 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java @@ -32,15 +32,15 @@ public abstract class HTMLComposerImpl extends HTMLComposer { private final Map myExtensions = new HashMap<>(); private final Map myLanguageExtensions = new HashMap<>(); @NonNls protected static final String BR = "
"; - @NonNls protected static final String NBSP = " "; - @NonNls protected static final String CODE_CLOSING = ""; - @NonNls protected static final String CODE_OPENING = ""; - @NonNls protected static final String B_OPENING = ""; - @NonNls protected static final String B_CLOSING = ""; + @NonNls public static final String NBSP = " "; + @NonNls public static final String CODE_CLOSING = ""; + @NonNls public static final String CODE_OPENING = ""; + @NonNls public static final String B_OPENING = ""; + @NonNls public static final String B_CLOSING = ""; @NonNls protected static final String CLOSE_TAG = "\">"; - @NonNls protected static final String A_HREF_OPENING = " stringToSearch, - @NotNull GlobalSearchScope searchScope, - @NotNull Processor processor) { +public class FindUsagesHelper { + public static boolean processUsagesInText(@NotNull final PsiElement element, + @NotNull Collection stringToSearch, + @NotNull GlobalSearchScope searchScope, + @NotNull Processor processor) { final TextRange elementTextRange = ReadAction.compute(() -> !element.isValid() || element instanceof PsiCompiledElement ? null : element.getTextRange()); UsageInfoFactory factory = (usage, startOffset, endOffset) -> { if (!element.isValid()) return new UsageInfo(usage, startOffset, endOffset, true); diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index 660b7fb48e68..8b86b34a9778 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -211,7 +211,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { return progress; } - static boolean shouldProcessInjectedPsi(@NotNull SearchScope scope) { + public static boolean shouldProcessInjectedPsi(@NotNull SearchScope scope) { return !(scope instanceof LocalSearchScope) || !((LocalSearchScope)scope).isIgnoreInjectedPsi(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionUtil.java index a78529f59772..bac95f9b2216 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionUtil.java @@ -141,7 +141,7 @@ public class CompletionUtil { } - static InsertionContext emulateInsertion(InsertionContext oldContext, int newStart, final LookupElement item) { + public static InsertionContext emulateInsertion(InsertionContext oldContext, int newStart, final LookupElement item) { final InsertionContext newContext = newContext(oldContext, item); emulateInsertion(item, newStart, newContext); return newContext; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java index c18fc4f85c3b..0bffd17cb0d5 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java @@ -583,7 +583,7 @@ public class TypedHandler extends TypedActionHandlerBase { indentBrace(project, editor, '}'); } - static void indentOpenedBrace(@NotNull Project project, @NotNull Editor editor){ + public static void indentOpenedBrace(@NotNull Project project, @NotNull Editor editor){ indentBrace(project, editor, '{'); } diff --git a/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersUtil.java b/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersUtil.java index a513136a5af9..369eb15c54c0 100644 --- a/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersUtil.java +++ b/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersUtil.java @@ -36,12 +36,12 @@ public class ProgramParametersUtil { new ProgramParametersConfigurator().checkWorkingDirectoryExist(configuration, project, module); } - protected static String expandPath(String path, Module module, Project project) { + public static String expandPath(String path, Module module, Project project) { return new ProgramParametersConfigurator().expandPath(path, module, project); } @Nullable - protected static Module getModule(CommonProgramRunConfigurationParameters configuration) { + public static Module getModule(CommonProgramRunConfigurationParameters configuration) { return new ProgramParametersConfigurator().getModule(configuration); } } diff --git a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java index 932d8f41b7e2..5e35704a92d1 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java @@ -357,7 +357,7 @@ public class CopyFilesOrDirectoriesHandler extends CopyHandlerDelegateBase { } @Nullable - protected static PsiDirectory resolveDirectory(@NotNull PsiDirectory defaultTargetDirectory) { + public static PsiDirectory resolveDirectory(@NotNull PsiDirectory defaultTargetDirectory) { final Project project = defaultTargetDirectory.getProject(); final Boolean showDirsChooser = defaultTargetDirectory.getCopyableUserData(CopyPasteDelegator.SHOW_CHOOSER_KEY); if (showDirsChooser != null && showDirsChooser.booleanValue()) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyHandler.java b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyHandler.java index 391e788a4ee5..1d919cc72862 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyHandler.java @@ -70,7 +70,7 @@ public class CopyHandler { } } - static void updateSelectionInActiveProjectView(@NotNull PsiElement newElement, Project project, boolean selectInActivePanel) { + public static void updateSelectionInActiveProjectView(@NotNull PsiElement newElement, Project project, boolean selectInActivePanel) { String id = ToolWindowManager.getInstance(project).getActiveToolWindowId(); if (id != null) { ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(id); diff --git a/platform/usageView/src/com/intellij/usages/impl/rules/FileGroupingRule.java b/platform/usageView/src/com/intellij/usages/impl/rules/FileGroupingRule.java index 391ed89e1d43..a0a4d496efb1 100644 --- a/platform/usageView/src/com/intellij/usages/impl/rules/FileGroupingRule.java +++ b/platform/usageView/src/com/intellij/usages/impl/rules/FileGroupingRule.java @@ -58,7 +58,7 @@ public class FileGroupingRule extends SingleParentUsageGroupingRule implements D return null; } - protected static class FileUsageGroup implements UsageGroup, TypeSafeDataProvider, NamedPresentably { + public static class FileUsageGroup implements UsageGroup, TypeSafeDataProvider, NamedPresentably { private final Project myProject; private final VirtualFile myFile; private String myPresentableName; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/ProjectCheckoutListener.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/ProjectCheckoutListener.java index 2623c449e017..2cd394020198 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/ProjectCheckoutListener.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkout/ProjectCheckoutListener.java @@ -33,7 +33,7 @@ public class ProjectCheckoutListener implements CheckoutListener { @Override public void processOpenedProject(Project lastOpenedProject) { } - static String getProductNameWithArticle() { + public static String getProductNameWithArticle() { // examples: "to create an IntelliJ IDEA project" (full product name is ok), "to create a PyCharm project" String productName = ApplicationNamesInfo.getInstance().getFullProductName(); String article = StringUtil.isVowel(Character.toLowerCase(productName.charAt(0))) ? "an " : "a ";