From 7c297749c58ca59f268bb4c91965c4aec213cfee Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 7 Jun 2019 17:48:00 +0300 Subject: [PATCH] cleanup GitOrigin-RevId: 5ea5ad0b8ea51bdf9f474ace20644e355dae034e --- .../findUsages/JavaFindUsagesHandlerFactory.java | 3 ++- .../search/searches/OverridingMethodsSearch.java | 1 + .../navigation/actions/GotoDeclarationAction.java | 14 ++++++-------- .../navigation/actions/GotoDeclarationHandler.java | 1 - .../find/findUsages/FindUsagesManager.java | 3 +-- .../src/com/intellij/openapi/util/io/FileUtil.java | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandlerFactory.java b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandlerFactory.java index 98fe1e486489..a6d3400bea40 100644 --- a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandlerFactory.java +++ b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandlerFactory.java @@ -52,7 +52,8 @@ public class JavaFindUsagesHandlerFactory extends FindUsagesHandlerFactory { if (operationMode == OperationMode.USAGES_WITH_DEFAULT_OPTIONS && Registry.is("java.find.usages.always.use.top.hierarchy.methods")) { methods = SuperMethodWarningUtil.getTargetMethodCandidates(method, Collections.emptyList()); - } else { + } + else { methods = SuperMethodWarningUtil.checkSuperMethods(method, JavaFindUsagesHandler.ACTION_STRING); } diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/OverridingMethodsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/OverridingMethodsSearch.java index 8092b38bfb4a..d3097bb57092 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/OverridingMethodsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/OverridingMethodsSearch.java @@ -61,6 +61,7 @@ public class OverridingMethodsSearch extends ExtensibleQueryFactory search(@NotNull PsiMethod method, @NotNull SearchScope scope, final boolean checkDeep) { if (ReadAction.compute(() -> !PsiUtil.canBeOverridden(method))) return EmptyQuery.getEmptyQuery(); // Optimization return INSTANCE.createUniqueResultsQuery(new SearchParameters(method, scope, checkDeep)); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java index c75ba367e1c5..519382e3850d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java @@ -83,7 +83,9 @@ public class GotoDeclarationAction extends BaseCodeInsightAction implements Code if (elements.length != 1) { if (elements.length == 0 && suggestCandidates(TargetElementUtil.findReference(editor, offset)).isEmpty()) { PsiElement element = findElementToShowUsagesOf(editor, editor.getCaretModel().getOffset()); - if (startFindUsages(editor, project, element)) { + + if (element != null) { + startFindUsages(editor, project, element); return; } @@ -95,8 +97,8 @@ public class GotoDeclarationAction extends BaseCodeInsightAction implements Code } PsiElement element = elements[0]; - if (element == findElementToShowUsagesOf(editor, editor.getCaretModel().getOffset()) && - startFindUsages(editor, project, element)) { + if (element == findElementToShowUsagesOf(editor, editor.getCaretModel().getOffset())) { + startFindUsages(editor, project, element); return; } @@ -114,10 +116,7 @@ public class GotoDeclarationAction extends BaseCodeInsightAction implements Code } } - private static boolean startFindUsages(@NotNull Editor editor, @NotNull Project project, PsiElement element) { - if (element == null) { - return false; - } + public static void startFindUsages(@NotNull Editor editor, @NotNull Project project, @NotNull PsiElement element) { if (DumbService.getInstance(project).isDumb()) { AnAction action = ActionManager.getInstance().getAction(ShowUsagesAction.ID); String name = action.getTemplatePresentation().getText(); @@ -127,7 +126,6 @@ public class GotoDeclarationAction extends BaseCodeInsightAction implements Code RelativePoint popupPosition = JBPopupFactory.getInstance().guessBestPopupLocation(editor); new ShowUsagesAction().startFindUsages(element, popupPosition, editor, ShowUsagesAction.getUsagesPageSize()); } - return true; } static T underModalProgress(@NotNull Project project, diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationHandler.java index eaba711a3454..4f8ede39bf0e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationHandler.java @@ -20,7 +20,6 @@ public interface GotoDeclarationHandler { * * @param sourceElement input PSI element * @param offset offset in the file - * @param editor * @return all target declarations as an array of {@code PsiElement} or null if none were found */ @Nullable diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java index 18357c7142bd..89dae7a23ad2 100644 --- a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java +++ b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java @@ -20,7 +20,6 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.TextEditor; -import com.intellij.openapi.fileEditor.TextEditorLocation; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; @@ -157,7 +156,7 @@ public class FindUsagesManager { } @Nullable - public FindUsagesHandler getFindUsagesHandler(@NotNull PsiElement element, OperationMode operationMode) { + public FindUsagesHandler getFindUsagesHandler(@NotNull PsiElement element, @NotNull OperationMode operationMode) { for (FindUsagesHandlerFactory factory : FindUsagesHandlerFactory.EP_NAME.getExtensions(myProject)) { if (factory.canFindUsages(element)) { final FindUsagesHandler handler = factory.createFindUsagesHandler(element, operationMode); diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java index f1e4fa913462..32d749d2f0df 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java @@ -971,7 +971,7 @@ public class FileUtil extends FileUtilRt { } @NotNull - public static String sanitizeFileName(@NotNull String name, boolean strict, String replacement) { + public static String sanitizeFileName(@NotNull String name, boolean strict, @NotNull String replacement) { StringBuilder result = null; int last = 0;