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

LambdaRefactoringUtil#convertToLambda: check context when deciding whether to add qualifier

Browse Source
This commit is contained in:
Tagir Valeev
2017-01-24 13:54:02 +07:00
parent 00d112dc00
commit ed51fbe99b
4 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
java/java-impl/src/com/intellij/refactoring/util/LambdaRefactoringUtil.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -197,12 +197,7 @@ public class LambdaRefactoringUtil {
buf.append(referenceElement.getReferenceName()).append(".");
}
}
else if (qualifier != null &&
!(qualifier instanceof PsiReferenceExpression && ((PsiReferenceExpression)qualifier).resolve() instanceof PsiClass &&
((PsiReferenceExpression)qualifier).getQualifier() == null && PsiTreeUtil.isAncestor(containingClass, referenceExpression, false) ||
qualifier instanceof PsiThisExpression && ((PsiThisExpression)qualifier).getQualifier() == null)) {
else if (qualifier != null && !isQualifierUnnecessary(qualifier, containingClass)) {
buf.append(qualifier.getText()).append(".");
}
}
@@ -263,6 +258,22 @@ public class LambdaRefactoringUtil {
return buf.toString();
}
private static boolean isQualifierUnnecessary(PsiElement qualifier, PsiClass containingClass) {
if (qualifier instanceof PsiReferenceExpression) {
PsiReferenceExpression reference = (PsiReferenceExpression)qualifier;
if (reference.resolve() instanceof PsiClass &&
reference.getQualifier() == null &&
(PsiTreeUtil.isAncestor(containingClass, qualifier, false) ||
PsiTreeUtil.isContextAncestor(containingClass, qualifier, false))) {
return true;
}
}
if (qualifier instanceof PsiThisExpression && ((PsiThisExpression)qualifier).getQualifier() == null) {
return true;
}
return false;
}
private static boolean isInferredSameTypeAfterConversion(PsiLambdaExpression lambdaExpression,
PsiMethodReferenceExpression methodReferenceExpression,
PsiType functionalInterfaceType) {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterGenerateMr.java
View File

@@ -14,7 +14,7 @@ public class Main {
long limit = 33;
OUTER:
while (true) {
Integer x = Main.getInt();
Integer x = getInt();
for (int i = 0; i < x; i++) {
if (limit-- == 0) break OUTER;
stat.accept(i);

22
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterUnnecessaryQualifier.java Normal file
View File

@@ -0,0 +1,22 @@
// "Replace Stream API chain with loop" "true"
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class Test {
static String doProcess(String s) {
return s;
}
public static void main(String[] args) {
List<String> list = new ArrayList<>();
for (String s : Arrays.asList("a", "b", "c")) {
String doProcess = doProcess(s);
list.add(doProcess);
}
System.out.println(list);
}
}

16
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/beforeUnnecessaryQualifier.java Normal file
View File

@@ -0,0 +1,16 @@
// "Replace Stream API chain with loop" "true"
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class Test {
static String doProcess(String s) {
return s;
}
public static void main(String[] args) {
List<String> list = Stream.of("a", "b", "c").map(Test::doProcess).col<caret>lect(Collectors.toList());
System.out.println(list);
}
}