From b3dfaa02496215eaf085f049d146af1c6adb4f85 Mon Sep 17 00:00:00 2001 From: Mikhail Pyltsin Date: Sun, 3 Sep 2023 15:24:09 +0200 Subject: [PATCH] IJ-CR-113485 IJ-CR-112205 [java-completion] IDEA-324073 Complete static methods with the first argument as qualifier - prefiltered private methods GitOrigin-RevId: b911e038dfb9328323414f47ed53e05059c84bd9 --- .../completion/JavaQualifierAsArgumentContributor.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaQualifierAsArgumentContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaQualifierAsArgumentContributor.java index 50120dba3fec..437bbe4a79d2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaQualifierAsArgumentContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaQualifierAsArgumentContributor.java @@ -77,6 +77,10 @@ public class JavaQualifierAsArgumentContributor extends CompletionContributor im @NotNull CompletionResultSet result) { PsiElement position = parameters.getPosition(); + PsiFile file = position.getContainingFile(); + if (file == null) { + return; + } GlobalSearchScope scope = position.getResolveScope(); Project project = position.getProject(); if (project.isDefault()) { @@ -96,6 +100,10 @@ public class JavaQualifierAsArgumentContributor extends CompletionContributor im if (!(member instanceof PsiMethod method && method.hasModifier(JvmModifier.STATIC))) { return true; } + PsiFile currentFile = method.getContainingFile(); + if (method.hasModifier(JvmModifier.PRIVATE) && !file.isEquivalentTo(currentFile)) { + return true; + } PsiClass containingClass = method.getContainingClass(); String methodName = method.getName(); if (containingClass == null) {