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

SSR: don't statically import qualifier of method reference (IDEA-190519)

Browse Source
This commit is contained in:
Bas Leijdekkers
2018-04-21 13:15:21 +02:00
parent 3f63111f56
commit ea8b53d3dc
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java
+1 -1
View File
@@ -575,7 +575,7 @@ public class JavaReplaceHandler extends StructuralReplaceHandler {
if (offset + reference.getTextLength() < finalStartOffset) {
return;
}
if (reference.getTypeParameters().length != 0) {
if (reference.getTypeParameters().length != 0 || reference instanceof PsiMethodReferenceExpression) {
return;
}
final PsiElement target = reference.resolve();
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java
+19 -2
View File
@@ -1671,7 +1671,8 @@ public class StructuralReplaceTest extends StructuralReplaceTestCase {
"}";
final String what4 = "System.out.println(1);";
final String by4 = "System.out.println(2);";
final String expected5 = "import java.util.Collections;import static java.lang.System.out;\n" +
final String expected5 = "import java.util.Collections;" +
"import static java.lang.System.out;\n" +
"public class X {\n" +
" void some() {\n" +
" out.println(2);\n" +
@@ -1703,7 +1704,7 @@ public class StructuralReplaceTest extends StructuralReplaceTestCase {
" InnerAnnotation[] value();\n" +
"}";
configureFromFileText("ReplacementTest.java", in5);
this.options.getMatchOptions().setScope(new LocalSearchScope(getFile()));
options.getMatchOptions().setScope(new LocalSearchScope(getFile()));
final String what5 = "@'_a:[regex( InnerAnnotation )](classes = { String.class })";
final String by5 = "@$a$(classes = { Integer.class })\n" +
@@ -1736,6 +1737,22 @@ public class StructuralReplaceTest extends StructuralReplaceTestCase {
" InnerAnnotation[] value();\n" +
"}",
Replacer.testReplace(null, what5, by5, options, getProject(), true));
final String in6 = "class X {{" +
" Predicate<String> p = Integer::valueOf;" +
"}}" +
"interface Predicate<T> {" +
" boolean test(T t);" +
"}";
final String what6 = "Integer::valueOf";
final String by6 = "Boolean::valueOf";
assertEquals("class X {{" +
" Predicate<String> p = Boolean::valueOf;" +
"}}" +
"interface Predicate<T> {" +
" boolean test(T t);" +
"}",
Replacer.testReplace(in6, what6, by6, options, getProject(), true));
} finally {
options.setToUseStaticImport(save);
}