intersection types in cast: provide "delete repeated interface" fix

2026-09-27 10:03:11 +07:00 · 2015-04-20 10:19:24 +02:00
parent f5cec5e24a
commit f0fae34076
9 changed files with 168 additions and 2 deletions
@@ -55,7 +55,6 @@ import com.intellij.psi.util.*;
 import com.intellij.refactoring.util.RefactoringChangeUtil;
 import com.intellij.util.*;
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.containers.hash.*;
 import com.intellij.util.containers.hash.HashSet;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.xml.util.XmlStringUtil;
@@ -331,9 +330,11 @@ public class HighlightUtil extends HighlightUtilBase {
                .descriptionAndTooltip("Unexpected type: class is expected").create();
            }
            if (!erasures.add(TypeConversionUtil.erasure(conjType))) {
-              return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
+              final HighlightInfo highlightInfo = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
                .range(conjunct)
                .descriptionAndTooltip("Repeated interface").create();
+              QuickFixAction.registerQuickFixAction(highlightInfo, new DeleteRepeatedInterfaceFix(conjunct, conjList), null);
+              return highlightInfo;
            }
          }

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2000-2015 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.codeInsight.daemon.impl.quickfix;
+
+import com.intellij.codeInsight.FileModificationService;
+import com.intellij.codeInsight.intention.IntentionAction;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.Function;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class DeleteRepeatedInterfaceFix implements IntentionAction {
+  private final PsiTypeElement myConjunct;
+  private final List<PsiTypeElement> myConjList;
+
+  public DeleteRepeatedInterfaceFix(PsiTypeElement conjunct, List<PsiTypeElement> conjList) {
+    myConjunct = conjunct;
+    myConjList = conjList;
+  }
+
+  @NotNull
+  @Override
+  public String getText() {
+    return "Delete repeated '" + myConjunct.getText() + "'";
+  }
+
+  @NotNull
+  @Override
+  public String getFamilyName() {
+    return "Delete repeated interface";
+  }
+
+  @Override
+  public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
+    for (PsiTypeElement element : myConjList) {
+      if (!element.isValid()) return false;
+    }
+    return true;
+  }
+
+  @Override
+  public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+    if (!FileModificationService.getInstance().prepareFileForWrite(file)) return;
+    final PsiTypeCastExpression castExpression = PsiTreeUtil.getParentOfType(myConjunct, PsiTypeCastExpression.class);
+    if (castExpression != null) {
+      final PsiTypeElement castType = castExpression.getCastType();
+      if (castType != null) {
+        final PsiType type = castType.getType();
+        if (type instanceof PsiIntersectionType) {
+          final String typeText = StringUtil.join(ContainerUtil.filter(myConjList, new Condition<PsiTypeElement>() {
+            @Override
+            public boolean value(PsiTypeElement element) {
+              return element != myConjunct;
+            }
+          }), new Function<PsiTypeElement, String>() {
+            @Override
+            public String fun(PsiTypeElement element) {
+              return element.getText();
+            }
+          }, " & ");
+          final PsiTypeCastExpression newCastExpr =
+            (PsiTypeCastExpression)JavaPsiFacade.getElementFactory(project).createExpressionFromText("(" + typeText + ")a", castType);
+          CodeStyleManager.getInstance(project).reformat(castType.replace(newCastExpr.getCastType()));
+        }
+      }
+    }
+  }
+
+  @Override
+  public boolean startInWriteAction() {
+    return true;
+  }
+}
@@ -0,0 +1,7 @@
+// "Delete repeated 'I'" "true"
+interface I {}
+class Test {
+  {
+    Object o = (I & Runnable) null;
+  }
+}
@@ -0,0 +1,7 @@
+// "Delete repeated 'I'" "true"
+interface I {}
+class Test {
+  {
+    Object o = (I & Runnable) null;
+  }
+}
@@ -0,0 +1,7 @@
+// "Delete repeated 'I'" "true"
+interface I {}
+class Test {
+  {
+    Object o = (I) null;
+  }
+}
@@ -0,0 +1,7 @@
+// "Delete repeated 'I'" "true"
+interface I {}
+class Test {
+  {
+    Object o = (I & Runnable & <caret>I) null;
+  }
+}
@@ -0,0 +1,7 @@
+// "Delete repeated 'I'" "true"
+interface I {}
+class Test {
+  {
+    Object o = (I & <caret>I & Runnable) null;
+  }
+}
@@ -0,0 +1,7 @@
+// "Delete repeated 'I'" "true"
+interface I {}
+class Test {
+  {
+    Object o = (I & <caret>I) null;
+  }
+}
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2015 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.codeInsight.daemon.quickFix;
+
+public class DeleteRepeatedInterfaceTest extends LightQuickFixParameterizedTestCase {
+  public void test() throws Exception {
+    doAllTests();
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/codeInsight/daemonCodeAnalyzer/quickFix/deleteRepeatedInterface";
+  }
+}
+