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

IDEA-140331 Improve intention action for 'Method invocation may produce NPE'

Browse Source
This commit is contained in:
peter
2015-05-18 14:35:01 +02:00
parent d6d5f50345
commit 069adff3dd
4 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java
View File

@@ -27,6 +27,7 @@ import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ipp.trivialif.MergeIfAndIntention;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -57,7 +58,7 @@ public class SurroundWithIfFix implements LocalQuickFix {
PsiFile file = element.getContainingFile();
PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project);
Document document = documentManager.getDocument(file);
if (!FileModificationService.getInstance().prepareFileForWrite(file)) return;
if (document == null || !FileModificationService.getInstance().prepareFileForWrite(file)) return;
PsiElement[] elements = {anchorStatement};
PsiElement prev = PsiTreeUtil.skipSiblingsBackward(anchorStatement, PsiWhiteSpace.class);
if (prev instanceof PsiComment && JavaSuppressionUtil.getSuppressedInspectionIdsIn(prev) != null) {
@@ -71,6 +72,11 @@ public class SurroundWithIfFix implements LocalQuickFix {
document.replaceString(textRange.getStartOffset(), textRange.getEndOffset(),newText);
editor.getCaretModel().moveToOffset(textRange.getEndOffset() + newText.length());
PsiDocumentManager.getInstance(project).commitAllDocuments();
new MergeIfAndIntention().invoke(project, editor, file);
editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
}
catch (IncorrectOperationException e) {

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithIf/afterIfCondition.java Normal file
View File

@@ -0,0 +1,11 @@
// "Surround with 'if (i != null)'" "true"
import org.jetbrains.annotations.Nullable;
class A {
void foo(@Nullable String i) {
if (i != null && i.length() > 0) {
if (i != "a") {
}
}
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithIf/beforeIfCondition.java Normal file
View File

@@ -0,0 +1,11 @@
// "Surround with 'if (i != null)'" "true"
import org.jetbrains.annotations.Nullable;
class A {
void foo(@Nullable String i) {
if (i.le<caret>ngth() > 0) {
if (i != "a") {
}
}
}
}

2
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTestSuite.java
View File

@@ -20,6 +20,7 @@ import com.intellij.codeInsight.completion.SmartTypeCompletionDfaTest;
import com.intellij.codeInsight.daemon.quickFix.AddAssertStatementFixTest;
import com.intellij.codeInsight.daemon.quickFix.ReplaceFromOfNullableFixTest;
import com.intellij.codeInsight.daemon.quickFix.ReplaceWithOfNullableFixTest;
import com.intellij.codeInsight.daemon.quickFix.SurroundWithIfFixTest;
import com.intellij.slicer.SliceBackwardTest;
import com.intellij.slicer.SliceTreeTest;
import junit.framework.Test;
@@ -49,6 +50,7 @@ public class DataFlowInspectionTestSuite {
suite.addTestSuite(NullableStuffInspection14Test.class);
suite.addTestSuite(AddAssertStatementFixTest.class);
suite.addTestSuite(SurroundWithIfFixTest.class);
suite.addTestSuite(ReplaceWithOfNullableFixTest.class);
suite.addTestSuite(ReplaceFromOfNullableFixTest.class);
return suite;