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

IJ-CR-124074 [java-completion] IDEA-342465 support correctness for completion

Browse Source 
- DeleteDefaultFix to PsiUpdateModCommandAction
- delete measureTime for JavaCorrectnessChecker

GitOrigin-RevId: 3ba81bc4b5971257988efe37d85ac586396908cf
This commit is contained in:
Mikhail Pyltsin
2024-01-29 17:40:47 +01:00
committed by intellij-monorepo-bot
parent d456da9c5c
commit df015bbcf7
3 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java
View File

@@ -557,12 +557,6 @@ public abstract class QuickFixFactory {
public abstract @NotNull IntentionAction createDeleteSwitchLabelFix(@NotNull PsiCaseLabelElement labelElement);
/**
* @return The IntentionAction that performs the deletion of the default element.
* Returns null if the fix cannot be created
* (for example, if the file is not physical, it can happen when highlighting is run on the copy of the file).
*/
@Nullable
public abstract IntentionAction createDeleteDefaultFix(@NotNull PsiFile file, @NotNull PsiElement defaultElement);
public abstract @NotNull IntentionAction createAddAnnotationTargetFix(@NotNull PsiAnnotation annotation, PsiAnnotation.TargetType target);

8
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
View File

@@ -1119,12 +1119,8 @@ public final class QuickFixFactoryImpl extends QuickFixFactory {
}
@Override
public @Nullable IntentionAction createDeleteDefaultFix(@NotNull PsiFile file, @NotNull PsiElement defaultElement) {
if(!file.isPhysical()) return null;
ProblemDescriptor descriptor =
new ProblemDescriptorBase(defaultElement, defaultElement, "", null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false, null,
false, false);
return QuickFixWrapper.wrap(descriptor, new UnnecessaryDefaultInspection.DeleteDefaultFix());
public IntentionAction createDeleteDefaultFix(@NotNull PsiFile file, @NotNull PsiElement defaultElement) {
return new UnnecessaryDefaultInspection.DeleteDefaultFix().asIntention();
}

22
java/java-impl/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java
View File

@@ -20,11 +20,11 @@ import com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingMode
import com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingModel.PatternsInSwitchBlockHighlightingModel.CompletenessResult;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.modcommand.PsiUpdateModCommandQuickFix;
import com.intellij.codeInspection.dataFlow.fix.DeleteSwitchLabelFix;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.modcommand.ActionContext;
import com.intellij.modcommand.ModPsiUpdater;
import com.intellij.openapi.project.Project;
import com.intellij.modcommand.PsiUpdateModCommandAction;
import com.intellij.psi.*;
import com.intellij.psi.controlFlow.*;
import com.intellij.psi.util.PsiTreeUtil;
@@ -64,13 +64,16 @@ public final class UnnecessaryDefaultInspection extends BaseInspection {
checkbox("onlyReportSwitchExpressions", InspectionGadgetsBundle.message("unnecessary.default.expressions.option")));
}
@Nullable
@Override
protected LocalQuickFix buildFix(Object... infos) {
return new DeleteDefaultFix();
return LocalQuickFix.from(new DeleteDefaultFix());
}
public static class DeleteDefaultFix extends PsiUpdateModCommandQuickFix {
public static class DeleteDefaultFix extends PsiUpdateModCommandAction<PsiElement> {
public DeleteDefaultFix() {
super(PsiElement.class);
}
@Nls(capitalization = Nls.Capitalization.Sentence)
@NotNull
@Override
@@ -79,13 +82,13 @@ public final class UnnecessaryDefaultInspection extends BaseInspection {
}
@Override
protected void applyFix(@NotNull Project project, @NotNull PsiElement startElement, @NotNull ModPsiUpdater updater) {
final PsiElement element = startElement.getParent();
protected void invoke(@NotNull ActionContext context, @NotNull PsiElement element, @NotNull ModPsiUpdater updater) {
if(element instanceof PsiKeyword) element = element.getParent();
if (element instanceof PsiSwitchLabelStatementBase label) {
DeleteSwitchLabelFix.deleteLabel(label);
}
else if (element instanceof PsiDefaultCaseLabelElement defaultElement) {
DeleteSwitchLabelFix.deleteLabelElement(project, defaultElement);
DeleteSwitchLabelFix.deleteLabelElement(context.project(), defaultElement);
}
}
}
@@ -143,7 +146,8 @@ public final class UnnecessaryDefaultInspection extends BaseInspection {
}
while (nextStatement != null) {
if (statementSwitch && !ControlFlowUtils.statementMayCompleteNormally(nextStatement)) {
final PsiMethod method = PsiTreeUtil.getParentOfType(switchBlock, PsiMethod.class, true, PsiClass.class, PsiLambdaExpression.class);
final PsiMethod method =
PsiTreeUtil.getParentOfType(switchBlock, PsiMethod.class, true, PsiClass.class, PsiLambdaExpression.class);
if (method != null && !PsiTypes.voidType().equals(method.getReturnType()) &&
!ControlFlowUtils.statementContainsNakedBreak(nextStatement)) {
final PsiCodeBlock body = method.getBody();