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

inline into method reference: keep with multiple return statements

Browse Source
This commit is contained in:
Anna Kozlova
2017-11-09 11:16:40 +01:00
parent 9d49a5ef51
commit 886eae4f67
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java
View File

@@ -311,7 +311,7 @@ public class InlineUtil {
public static TailCallType getTailCallType(@NotNull final PsiReference psiReference) {
PsiElement element = psiReference.getElement();
if (element instanceof PsiMethodReferenceExpression) return TailCallType.None;
if (element instanceof PsiMethodReferenceExpression) return TailCallType.Return;
PsiExpression methodCall = PsiTreeUtil.getParentOfType(element, PsiMethodCallExpression.class);
if (methodCall == null) return TailCallType.None;
PsiElement callParent = methodCall.getParent();

1
java/java-tests/testData/refactoring/inlineMethod/InlineIntoMethodRef.java
View File

@@ -6,6 +6,7 @@ class Test {
}
private String get() {
if (true) return null;
return null;
}
}

6
java/java-tests/testData/refactoring/inlineMethod/InlineIntoMethodRef.java.after
View File

@@ -2,10 +2,14 @@ import java.util.function.Supplier;
class Test {
{
Supplier<String> sup = () -> null;
Supplier<String> sup = () -> {
if (true) return null;
return null;
};
}
private String get() {
if (true) return null;
return null;
}
}