MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 22:11:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-completion] IDEA-356673 Support JEP 477. Incorrect import insertion

Browse Source 
- support implicit imports for completions

GitOrigin-RevId: fa685959d367e0560f5d216ca850d50828cbd651
This commit is contained in:
Mikhail Pyltsin
2024-07-22 18:38:03 +02:00
committed by intellij-monorepo-bot
parent 8f3e75e7db
commit ded1094859
2 changed files with 142 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/java-psi-api/src/com/intellij/psi/util/ImportsUtil.java
View File

@@ -3,6 +3,7 @@ package com.intellij.psi.util;
import com.intellij.openapi.util.Comparing;
import com.intellij.psi.*;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -64,11 +65,15 @@ public final class ImportsUtil {
}
public static boolean hasStaticImportOn(final PsiElement expr, final PsiMember member, boolean acceptOnDemand) {
if (expr.getContainingFile() instanceof PsiJavaFile) {
final PsiImportList importList = ((PsiJavaFile)expr.getContainingFile()).getImportList();
if (expr.getContainingFile() instanceof PsiJavaFile ) {
PsiJavaFile file = (PsiJavaFile)expr.getContainingFile();
final PsiImportList importList = file.getImportList();
if (importList != null) {
List<PsiImportStaticStatement> additionalOnDemandImports = ContainerUtil.filterIsInstance(
ContainerUtil.map(file.getImplicitlyImportedElements(), impl -> impl.createImportStatement()),
PsiImportStaticStatement.class);
final PsiImportStaticStatement[] importStaticStatements = importList.getImportStaticStatements();
for (PsiImportStaticStatement stmt : importStaticStatements) {
for (PsiImportStaticStatement stmt : ContainerUtil.append(additionalOnDemandImports, importStaticStatements)) {
final PsiClass containingClass = member.getContainingClass();
final String referenceName = stmt.getReferenceName();
if (containingClass != null && stmt.resolveTargetClass() == containingClass) {

238
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/QualifierCompletionTest.java
View File

@@ -5,6 +5,8 @@ import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.openapi.options.advanced.AdvancedSettings;
import com.intellij.openapi.options.advanced.AdvancedSettingsImpl;
import com.intellij.pom.java.JavaFeature;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.NeedsIndex;
import org.jetbrains.annotations.NotNull;
@@ -22,13 +24,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
void run() {
"test".test3<caret>
}
public static <T extends String> void test3(T t, T t2) { }
public static <T extends String> void test3(T t) { }
}
@@ -36,13 +38,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.complete(CompletionType.BASIC, 3);
myFixture.checkResult("""
package org.test;
public abstract class Test {
void run() {
test3("test"<caret>);
}
public static <T extends String> void test3(T t, T t2) { }
public static <T extends String> void test3(T t) { }
}
@@ -54,13 +56,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
void run() {
"test".test3<caret>
}
public static <T extends String> void test3(T t, T t2) { }
public static <T extends String> void test3(T t) { }
}
@@ -68,13 +70,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.complete(CompletionType.BASIC, 2);
myFixture.checkResult("""
package org.test;
public abstract class Test {
void run() {
test3("test"<caret>);
}
public static <T extends String> void test3(T t, T t2) { }
public static <T extends String> void test3(T t) { }
}
@@ -86,13 +88,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
void run() {
"test".test4<caret>
}
public static <T extends String> void test4(T t, T t2) { }
}
""");
@@ -100,13 +102,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public abstract class Test {
void run() {
test4("test", <caret>);
}
public static <T extends String> void test4(T t, T t2) { }
}
""");
@@ -117,7 +119,7 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.addClass( """
package org.test2;
public abstract class Test2 {
public static <T extends String> void test6(T t, T t2) { }
}
@@ -125,13 +127,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
void run() {
"test".test6<caret>
}
public static <T extends String> void test4(T t, T t2) { }
}
""");
@@ -139,7 +141,7 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
import org.test2.Test2;
public abstract class Test {
@@ -147,7 +149,7 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
void run() {
Test2.test6("test", );
}
public static <T extends String> void test4(T t, T t2) { }
}
""");
@@ -157,13 +159,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
void run() {
1L.test4<caret>
}
public static void test4(Long t) { }
}
""");
@@ -171,13 +173,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public abstract class Test {
void run() {
test4(1L);
}
public static void test4(Long t) { }
}
""");
@@ -188,14 +190,14 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
void run() {
int x = 1;
x.test4<caret>
}
public static void test4(Integer t) { }
}
""");
@@ -203,14 +205,14 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public abstract class Test {
void run() {
int x = 1;
test4(x);
}
public static void test4(Integer t) { }
}
""");
@@ -221,13 +223,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
void run() {
null.test4<caret>
}
public static void test4(Integer t) { }
}
""");
@@ -235,13 +237,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public abstract class Test {
void run() {
test4(null);
}
public static void test4(Integer t) { }
}
""");
@@ -253,13 +255,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.configureByText("Test.java", """
package org.test;
import org.jetbrains.annotations.NotNull;
public abstract class Test {
void run() {
null.test4<caret>
}
public static void test4(@NotNull Integer t) { }
}
""");
@@ -272,13 +274,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
void run() {
"ttt".test4<caret>
}
public static <T extends CharSequence & Comparable<String>> void test4(T t) { }
}
""");
@@ -286,13 +288,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public abstract class Test {
void run() {
test4("ttt");
}
public static <T extends CharSequence & Comparable<String>> void test4(T t) { }
}
""");
@@ -303,13 +305,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
void run() {
"ttt".test4<caret>
}
public static <T extends CharSequence & Comparable<Integer>> void test4(T t) { }
}
""");
@@ -323,9 +325,9 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
package org.test;
import java.util.ArrayList;
import java.util.List;
public abstract class Test {
private static void test2(List<? extends CharSequence> l) {
l.get(0).testPrint<caret>
}
@@ -339,9 +341,9 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
package org.test;
import java.util.ArrayList;
import java.util.List;
public abstract class Test {
private static void test2(List<? extends CharSequence> l) {
testPrint(l.get(0));
}
@@ -358,9 +360,9 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
package org.test;
import java.util.ArrayList;
import java.util.List;
public abstract class Test {
private static void test2(List<? extends CharSequence> l) {
List<String> t = new ArrayList<>();
t.testPrint<caret>
@@ -375,9 +377,9 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
package org.test;
import java.util.ArrayList;
import java.util.List;
public abstract class Test {
private static void test2(List<? extends CharSequence> l) {
List<String> t = new ArrayList<>();
testPrint(t);
@@ -395,9 +397,9 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
package org.test;
import java.util.ArrayList;
import java.util.List;
public abstract class Test {
private static void test2(List<? extends CharSequence> l) {
List<Integer> t = new ArrayList<>();
t.testPrint<caret>
@@ -415,7 +417,7 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.addClass( """
package org.test2;
public abstract class Test2 {
public static <T extends String> void test6(T t, T t2) { }
}
@@ -424,13 +426,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.configureByText("Test.java", """
package org.test;
import static org.test2.Test2.*;
public abstract class Test {
void run() {
"test".test6<caret>
}
public static <T extends String> void test4(T t, T t2) { }
}
""");
@@ -439,13 +441,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.checkResult("""
package org.test;
import static org.test2.Test2.*;
public abstract class Test {
void run() {
test6("test", );
}
public static <T extends String> void test4(T t, T t2) { }
}
""");
@@ -456,13 +458,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
Integer run() {
return "test".test3<caret>
}
public static Integer test3(String t) { return 0; }
}
""");
@@ -470,13 +472,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public abstract class Test {
Integer run() {
return test3("test")
}
public static Integer test3(String t) { return 0; }
}
""");
@@ -487,13 +489,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
Integer run() {
return "test".test3<caret>
}
public static String test3(String t) { return 0; }
}
""");
@@ -506,13 +508,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
String run() {
return "test".test3<caret>
}
public static <T> T test3(T t) { return null; }
}
""");
@@ -520,13 +522,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public abstract class Test {
String run() {
return test3("test")
}
public static <T> T test3(T t) { return null; }
}
""");
@@ -537,13 +539,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
Runnable run() {
return "test".test3<caret>
}
public static <T> T test3(T t) { return null; }
}
""");
@@ -556,13 +558,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true, getTestRootDisposable());
myFixture.configureByText("Test.java", """
package org.test;
public abstract class Test {
Runnable run() {
return "test".test3<caret>
}
public static <T, K extends Runnable> K test3(T t) { return null; }
}
""");
@@ -570,13 +572,13 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public abstract class Test {
Runnable run() {
return test3("test")
}
public static <T, K extends Runnable> K test3(T t) { return null; }
}
""");
@@ -595,24 +597,24 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
""");
myFixture.configureByText("Test.java", """
package org.test;
public class Test {
public static void main(T t){
t.test<caret>
}
}
}
""");
myFixture.complete(CompletionType.BASIC, 2);
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public class Test {
public static void main(T t){
T.test(t);
}
}
}
""");
""");
}
@NeedsIndex.Full
@@ -628,23 +630,51 @@ public class QualifierCompletionTest extends NormalCompletionTestCase {
""");
myFixture.configureByText("Test.java", """
package org.test;
public class Test {
public static String main(T t){
return t.test<caret>
}
}
}
""");
myFixture.complete(CompletionType.SMART, 2);
myFixture.type('\n');
myFixture.checkResult("""
package org.test;
public class Test {
public static String main(T t){
return T.test(t);
}
}
}
""");
""");
}
@NeedsIndex.Full
public void testStaticWithImplicitImports() {
((AdvancedSettingsImpl)AdvancedSettings.getInstance()).setSetting("java.completion.qualifier.as.argument", true,
getTestRootDisposable());
IdeaTestUtil.withLevel(getModule(),
JavaFeature.IMPLICIT_IMPORT_IN_IMPLICIT_CLASSES.getMinimumLevel(), () -> {
myFixture.addClass("""
package java.io;
public final class IO {
public static void println(Object obj) {}
}
""");
myFixture.configureByText("Test.java", """
public static void main(String[] args) {
"TEST".printl<caret>
}
""");
myFixture.complete(CompletionType.BASIC, 2);
myFixture.type('\n');
myFixture.checkResult("""
public static void main(String[] args) {
println("TEST");
}
""");
});
}
}