MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-import] IDEA-366927 and IDEA-366926 improve auto-import

Browse Source 
- improve tests

GitOrigin-RevId: 0689eff2477a06d699c112e5c7744b1debd07886
This commit is contained in:
Mikhail Pyltsin
2025-02-06 14:35:04 +00:00
committed by intellij-monorepo-bot
parent b8172233b8
commit a883cc2140
7 changed files with 92 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/completion/autoStaticImport/SimpleMethodStaticAutoImport.java
+1 -1
View File
@@ -3,6 +3,6 @@ import java.util.List;
class Foo {
void test(List<String> baz) {
s<caret>
so<caret>
}
}
java/java-tests/testData/codeInsight/completion/autoStaticImport/SimpleMethodStaticAutoImportNotFound.java
+1 -1
View File
@@ -3,6 +3,6 @@ import java.util.List;
class Foo {
void test(List<String> baz) {
s<caret>
so<caret>
}
}
java/java-tests/testData/codeInsight/completion/autoStaticImport/SimpleMethodStaticAutoImportOnDemand.java
+1 -1
View File
@@ -3,6 +3,6 @@ import java.util.List;
class Foo {
void test(List<String> baz) {
s<caret>
so<caret>
}
}
java/java-tests/testData/codeInsight/completion/autoStaticImport/WithMemberConflicts.java
+1 -1
View File
@@ -6,6 +6,6 @@ class Foo {
}
void m() {
<caret>
requireN<caret>
}
}
java/java-tests/testData/codeInsight/completion/autoStaticImport/WithPackageConflicts.java
+1 -1
View File
@@ -1,5 +1,5 @@
class Foo {
void m() {
<caret>
requireN<caret>
}
}
java/java-tests/testData/codeInsight/completion/autoStaticImport/WithPackageConflictsWithOnDemand.java
+1 -1
View File
@@ -1,5 +1,5 @@
class Foo {
void m() {
<caret>
requireN<caret>
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/AutoStaticImportCompletionTest.java
+86 -75
View File
@@ -45,28 +45,30 @@ public class AutoStaticImportCompletionTest extends NormalCompletionTestCase {
public void testSimpleStaticAutoImport() {
addStaticAutoImport("java.util.Arrays");
configure();
type("r");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
}
checkResult();
}
public void testSimpleMethodStaticAutoImport() {
addStaticAutoImport("java.util.Arrays.sort");
configure();
type("o");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
}
checkResult();
}
@@ -79,14 +81,15 @@ public class AutoStaticImportCompletionTest extends NormalCompletionTestCase {
onDemand.addEntry(entry);
try {
configure();
type("o");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
}
checkResult();
}
finally {
@@ -97,13 +100,14 @@ public class AutoStaticImportCompletionTest extends NormalCompletionTestCase {
public void testSimpleMethodStaticAutoImportNotFound() {
addStaticAutoImport("java.util.Arrays.binarySearch");
configure();
type("o");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNull(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNull(element);
}
}
public void testSimpleStaticAutoImportWithEnabledOnDemand() {
@@ -115,14 +119,15 @@ public class AutoStaticImportCompletionTest extends NormalCompletionTestCase {
onDemand.addEntry(entry);
try {
configure();
type("r");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
}
checkResult();
}
finally {
@@ -142,40 +147,43 @@ public class AutoStaticImportCompletionTest extends NormalCompletionTestCase {
}
""");
configure();
type("r");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
}
checkResult();
}
public void testSimpleStaticAutoImportWithAlreadyImported() {
addStaticAutoImport("java.util.Arrays");
configure();
type("r");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNotNull(element);
selectItem(element);
}
checkResult();
}
public void testNoAutoImport() {
configure();
type("r");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNull(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("sort") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Arrays"));
assertNull(element);
}
}
@NeedsIndex.Full
@@ -226,14 +234,15 @@ public class AutoStaticImportCompletionTest extends NormalCompletionTestCase {
public final class Dummy {}
""");
configure();
type("requireN");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("requireNonNull") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Objects"));
assertNotNull(element);
selectItem(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("requireNonNull") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Objects"));
assertNotNull(element);
selectItem(element);
}
checkResult();
}
@@ -251,14 +260,15 @@ public class AutoStaticImportCompletionTest extends NormalCompletionTestCase {
public final class Dummy {}
""");
configure();
type("requireN");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("requireNonNull") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Objects"));
assertNotNull(element);
selectItem(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("requireNonNull") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("java.util.Objects"));
assertNotNull(element);
selectItem(element);
}
checkResult();
}
finally {
@@ -276,14 +286,15 @@ public class AutoStaticImportCompletionTest extends NormalCompletionTestCase {
}
""");
configure();
type("requireN");
LookupElement[] elements = myFixture.getLookupElements();
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("requireNonNull") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("a.Objects"));
assertNotNull(element);
selectItem(element);
if (elements != null) {
LookupElement element = ContainerUtil.find(elements, e ->
e.getLookupString().equals("requireNonNull") &&
e.getPsiElement() instanceof PsiMethod method &&
method.getContainingClass().getQualifiedName().equals("a.Objects"));
assertNotNull(element);
selectItem(element);
}
checkResult();
}