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

preserve comments when transform expr lambda to code block (IDEA-179643)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-11-21 16:51:10 +01:00
parent 443fa52729
commit 8a020a1d46
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+3 -6
View File
@@ -889,16 +889,13 @@ public class RefactoringUtil {
final PsiElement invalidBody = lambdaExpression.getBody();
if (invalidBody == null) return declaration;
final PsiLambdaExpression expressionFromText = (PsiLambdaExpression)elementFactory
.createExpressionFromText(lambdaExpression.getParameterList().getText() + " -> {}", lambdaExpression.getParent());
String lambdaParamListWithArrowAndComments = lambdaExpression.getText()
.substring(0, (declaration.isPhysical() ? declaration : invalidBody).getStartOffsetInParent());
final PsiLambdaExpression expressionFromText = (PsiLambdaExpression)elementFactory.createExpressionFromText(lambdaParamListWithArrowAndComments + "{}", lambdaExpression.getParent());
PsiCodeBlock newBody = (PsiCodeBlock)expressionFromText.getBody();
LOG.assertTrue(newBody != null);
newBody.add(declaration);
lambdaExpression =
(PsiLambdaExpression)lambdaExpression.replace(elementFactory.createExpressionFromText(
lambdaExpression.getParameterList().getText() + " -> " + invalidBody.getText(), lambdaExpression));
final PsiElement lambdaExpressionBody = lambdaExpression.getBody();
LOG.assertTrue(lambdaExpressionBody != null);
final PsiStatement lastBodyStatement;
java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyMultipleOccurrences.after.java
+2 -1
View File
@@ -8,7 +8,8 @@ class X {
public void foo(Class<?> cls)
{
Stream.of(cls.getMethods())
.filter(method -> {
.filter(method ->//my comment to keep
{
Class<?> c = method.getReturnType();
return Collection.class.isAssignableFrom(c) || Map.class.isAssignableFrom(c);
})
java/java-tests/testData/refactoring/introduceVariable/PutInLambdaBodyMultipleOccurrences.java
+1 -1
View File
@@ -8,7 +8,7 @@ class X {
public void foo(Class<?> cls)
{
Stream.of(cls.getMethods())
.filter(method ->
.filter(method ->//my comment to keep
Collection.class.isAssignableFrom(<selection>method.getReturnType()</selection>) || Map.class.isAssignableFrom(method.getReturnType()))
.collect(Collectors.<Method>toList());
}