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

IPP: NPE fix (EA-98815)

Browse Source
This commit is contained in:
Bas Leijdekkers
2017-05-17 16:58:38 +02:00
parent 0c4bb15a60
commit 65af085484
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithBooleanExpressionIntention.java
+6 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 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.
@@ -22,6 +22,7 @@ import com.siyeh.ig.psiutils.ParenthesesUtils;
import com.siyeh.ipp.base.Intention;
import com.siyeh.ipp.base.PsiElementPredicate;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static com.intellij.psi.CommonClassNames.JAVA_LANG_BOOLEAN;
import static com.siyeh.ig.psiutils.ParenthesesUtils.AND_PRECEDENCE;
@@ -57,7 +58,10 @@ public class ReplaceConditionalWithBooleanExpressionIntention extends Intention
PsiReplacementUtil.replaceExpression((PsiExpression)element, replacementText);
}
private static String getText(PsiExpression expression) {
private static String getText(@Nullable PsiExpression expression) {
if (expression == null) {
return "";
}
if (ParenthesesUtils.getPrecedence(expression) > AND_PRECEDENCE) {
return '(' + expression.getText() + ')';
}
plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/conditional/ReplaceConditionalWithBooleanExpressionIntentionTest.java
+14 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 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.
@@ -36,4 +36,17 @@ public class ReplaceConditionalWithBooleanExpressionIntentionTest extends IPPTes
" }" +
"}");
}
public void testIncomplete() {
doTest("class X {" +
" boolean test(boolean a, boolean b, boolean c) {" +
" return a /*_Replace '?:' with boolean expression*/? b ? c;" +
" }" +
"}",
"class X {" +
" boolean test(boolean a, boolean b, boolean c) {" +
" return a && (b ? c) || !a &&;" +
" }" +
"}");
}
}