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

java redundant cast: property test

Browse Source 
GitOrigin-RevId: 6a02848ab0839c4a2cb3a7b0ccc8d153ef60e7d3
This commit is contained in:
Anna Kozlova
2020-05-11 08:33:17 +00:00
committed by intellij-monorepo-bot
parent e218e80eeb
commit dbde077457
2 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class AddTypeCastFix extends LocalQuickFixAndIntentionActionOnPsiElement
addTypeCast(project, (PsiExpression)startElement, myType);
}
private static void addTypeCast(Project project, PsiExpression originalExpression, PsiType type) {
public static void addTypeCast(Project project, PsiExpression originalExpression, PsiType type) {
PsiExpression typeCast = createCastExpression(originalExpression, project, type);
originalExpression.replace(typeCast);
}
java/java-tests/testSrc/com/intellij/java/propertyBased/JavaCodeInsightSanityTest.java
+49 -1
View File
@@ -2,14 +2,19 @@
package com.intellij.java.propertyBased;
import com.intellij.application.options.CodeStyle;
import com.intellij.codeInsight.daemon.impl.quickfix.AddTypeCastFix;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl;
import com.intellij.openapi.util.RecursionManager;
import com.intellij.psi.PsiFile;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
import com.intellij.psi.impl.source.PsiEnumConstantImpl;
import com.intellij.psi.util.PsiTypesUtil;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.SkipSlowTestLocally;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
@@ -19,6 +24,7 @@ import org.jetbrains.jetCheck.Generator;
import org.jetbrains.jetCheck.PropertyChecker;
import java.io.File;
import java.util.List;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -88,6 +94,20 @@ public class JavaCodeInsightSanityTest extends LightJavaCodeInsightFixtureTestCa
return rootSettings.getCommonSettings(JavaLanguage.INSTANCE).getRootSettings().getCustomSettings(JavaCodeStyleSettings.class);
}
public void testRemoveRedundantCast() {
enableInspections();
Function<PsiFile, Generator<? extends MadTestingAction>> fileActions =
file -> Generator.sampledFrom(new InvokeIntentionAtElement(file, new JavaIntentionPolicy() {
@Override
protected boolean shouldSkipIntention(@NotNull String actionText) {
return !actionText.equals(JavaAnalysisBundle.message("inspection.redundant.cast.remove.quickfix"));
}
}, PsiTypeCastExpression.class, Function.identity()),
new InsertTypeCastCommand(file));
PropertyChecker
.checkScenarios(actionsOnJavaFiles(fileActions));
}
public void testParenthesesDontChangeIntention() {
enableInspections();
Function<PsiFile, Generator<? extends MadTestingAction>> fileActions =
@@ -123,4 +143,32 @@ public class JavaCodeInsightSanityTest extends LightJavaCodeInsightFixtureTestCa
)
));
}
private static class InsertTypeCastCommand extends ActionOnFile {
private InsertTypeCastCommand(PsiFile file) {
super(file);
}
@Override
public void performCommand(@NotNull Environment env) {
PsiDocumentManager.getInstance(getProject()).commitDocument(getDocument());
int randomOffset = generatePsiOffset(env, null);
PsiElement leaf = getFile().findElementAt(randomOffset);
if (leaf != null) {
List<PsiElement> elementsToWrap = new JavaParenthesesPolicy().getElementsToWrap(leaf);
if (elementsToWrap.isEmpty()) return;
PsiElement expr = env.generateValue(Generator.sampledFrom(elementsToWrap).noShrink(), null);
if (!(expr instanceof PsiExpression)) return;
PsiType type = ((PsiExpression)expr).getType();
if (type == null || !PsiTypesUtil.isDenotableType(type, expr)) return; //accept cast in expression statement
env.logMessage("Inserting cast '" +
StringUtil.escapeStringCharacters("(" + type.getCanonicalText() + ")") +
"' at " +
MadTestingUtil.getPositionDescription(expr.getTextOffset(), getDocument()));
WriteCommandAction.runWriteCommandAction(getProject(), () -> AddTypeCastFix.addTypeCast(getProject(), (PsiExpression)expr, type));
}
}
}
}