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

IDEA-167189 Incorrect inspection for Ratpack's Promise.next()

Browse Source
This commit is contained in:
alexey.afanasiev
2017-01-31 15:43:08 +03:00
parent 9bdc2704b5
commit bdc52bba4d
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/changeToOperator/transformations/AsBooleanTransformation.java
+4 -1
View File
@@ -63,7 +63,10 @@ class AsBooleanTransformation extends Transformation {
@Override
public boolean couldApplyInternal(@NotNull GrMethodCall methodCall, @NotNull Options options) {
return getBase(methodCall) != null && methodCall.getExpressionArguments().length == 0 && getPrefix(methodCall, options) != null;
return getBase(methodCall) != null
&& methodCall.getExpressionArguments().length == 0
&& getPrefix(methodCall, options) != null
&& methodCall.getClosureArguments().length == 0;
}
@Override
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/changeToOperator/transformations/BinaryTransformation.java
+3 -2
View File
@@ -42,7 +42,8 @@ abstract class BinaryTransformation extends Transformation {
@Override
public boolean couldApplyInternal(@NotNull GrMethodCall methodCall, @NotNull Options options) {
GrExpression[] arguments = methodCall.getExpressionArguments();
return getBase(methodCall) != null && arguments.length == 1;
return getBase(methodCall) != null
&& methodCall.getExpressionArguments().length == 1
&& methodCall.getClosureArguments().length == 0;
}
}
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/changeToOperator/transformations/PutAtTransformation.java
+3 -2
View File
@@ -39,8 +39,9 @@ class PutAtTransformation extends Transformation {
@Override
public boolean couldApplyInternal(@NotNull GrMethodCall methodCall, @NotNull Options options) {
GrExpression[] arguments = methodCall.getExpressionArguments();
return getBase(methodCall) != null && arguments.length == 2;
return getBase(methodCall) != null
&& methodCall.getExpressionArguments().length == 2
&& methodCall.getClosureArguments().length == 0;
}
@Override
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/changeToOperator/transformations/UnaryTransformation.java
+3 -1
View File
@@ -40,7 +40,9 @@ public class UnaryTransformation extends Transformation {
@Override
public boolean couldApplyInternal(@NotNull GrMethodCall methodCall, @NotNull Options options) {
return getBase(methodCall)!= null && methodCall.getExpressionArguments().length == 0;
return getBase(methodCall)!= null
&& methodCall.getExpressionArguments().length == 0
&& methodCall.getClosureArguments().length == 0;
}
@Override
plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrChangeToOperatorTest.groovy
+3
View File
@@ -156,6 +156,8 @@ class Operators {
doTest "a.rightShift(b, 1)"
doTest "a.rightShiftUnsigned(b, 1)"
doTest "a.asType(b, 1)"
doTest "a.n<caret>ext {return 1}"
doTest "a.pl<caret>us(1) {return 1}"
}
void testComplexBinaryExpression() {
@@ -250,6 +252,7 @@ class Operators {
doTest "a.getAt(a, b)"
doTest "a.putAt(b)"
doTest "a.putAt(b, b, b)"
doTest "a.put<caret>At(b,b) {b}"
}
void testWithoutAdditionalParenthesesOption() {