MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 15:25:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

ensure assert inserted in correct place (IDEA-123296)

Browse Source
This commit is contained in:
Anna Kozlova
2014-04-02 20:54:10 +02:00
parent 02fc8fea51
commit edf024ca23
5 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
-95
View File
@@ -1,95 +0,0 @@
/*
* Copyright 2000-2009 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInspection;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
/**
* @author ven
*/
public class AddAssertStatementFix implements LocalQuickFix {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.AddAssertStatementFix");
private final SmartPsiElementPointer<PsiExpression> myExpressionToAssert;
private final String myText;
public AddAssertStatementFix(@NotNull PsiExpression expressionToAssert) {
myExpressionToAssert = SmartPointerManager.getInstance(expressionToAssert.getProject()).createSmartPsiElementPointer(expressionToAssert);
LOG.assertTrue(PsiType.BOOLEAN.equals(expressionToAssert.getType()));
myText = expressionToAssert.getText();
}
@Override
@NotNull
public String getName() {
return InspectionsBundle.message("inspection.assert.quickfix", myText);
}
@Override
public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
PsiExpression expressionToAssert = myExpressionToAssert.getElement();
if (expressionToAssert == null) return;
if (!FileModificationService.getInstance().preparePsiElementForWrite(descriptor.getPsiElement())) return;
PsiElement element = descriptor.getPsiElement();
PsiElement anchorElement = PsiTreeUtil.getParentOfType(element, PsiStatement.class);
LOG.assertTrue(anchorElement != null);
final PsiElement tempParent = anchorElement.getParent();
if (tempParent instanceof PsiForStatement && !PsiTreeUtil.isAncestor(((PsiForStatement)tempParent).getBody(), anchorElement, false)) {
anchorElement = tempParent;
}
PsiElement prev = PsiTreeUtil.skipSiblingsBackward(anchorElement, PsiWhiteSpace.class);
if (prev instanceof PsiComment && JavaSuppressionUtil.getSuppressedInspectionIdsIn(prev) != null) {
anchorElement = prev;
}
try {
final PsiElementFactory factory = JavaPsiFacade.getInstance(element.getProject()).getElementFactory();
@NonNls String text = "assert c;";
PsiAssertStatement assertStatement = (PsiAssertStatement)factory.createStatementFromText(text, null);
final PsiExpression assertCondition = assertStatement.getAssertCondition();
assert assertCondition != null;
assertCondition.replace(expressionToAssert);
final PsiElement parent = anchorElement.getParent();
if (parent instanceof PsiCodeBlock) {
parent.addBefore(assertStatement, anchorElement);
}
else {
PsiBlockStatement blockStatement = (PsiBlockStatement)factory.createStatementFromText("{}", null);
final PsiCodeBlock block = blockStatement.getCodeBlock();
block.add(assertStatement);
block.add(anchorElement);
anchorElement.replace(blockStatement);
}
}
catch (IncorrectOperationException e) {
LOG.error(e);
}
}
@Override
@NotNull
public String getFamilyName() {
return InspectionsBundle.message("inspection.quickfix.assert.family");
}
}
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
+5 -1
View File
@@ -215,7 +215,7 @@ public class DataFlowInspectionBase extends BaseJavaBatchLocalInspectionTool {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
final PsiBinaryExpression binary = (PsiBinaryExpression)elementFactory.createExpressionFromText("a != null", null);
binary.getLOperand().replace(qualifier);
fixes.add(new AddAssertStatementFix(binary));
ContainerUtil.addIfNotNull(fixes, createAssertFix(binary));
}
addSurroundWithIfFix(qualifier, fixes, onTheFly);
@@ -231,6 +231,10 @@ public class DataFlowInspectionBase extends BaseJavaBatchLocalInspectionTool {
}
}
protected LocalQuickFix createAssertFix(PsiBinaryExpression binary) {
return null;
}
protected void addSurroundWithIfFix(PsiExpression qualifier, List<LocalQuickFix> fixes, boolean onTheFly) {
}