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

[java-highlighting] MergeDuplicateAttributesFix: fixes after review (IJ-CR-14625)

Browse Source 
GitOrigin-RevId: bd319c34fbd435e043c26d0b7bbc0b3236ff1fc6
This commit is contained in:
Andrey.Cherkasov
2021-10-14 06:06:57 +03:00
committed by intellij-monorepo-bot
parent 5965671704
commit ed78fbd21b
19 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeDuplicateAttributesFix.java
View File

@@ -5,16 +5,16 @@ import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.Strings;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.siyeh.ig.psiutils.CommentTracker;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
import java.util.StringJoiner;
import java.util.ArrayList;
import java.util.List;
public class MergeDuplicateAttributesFix extends LocalQuickFixAndIntentionActionOnPsiElement {
public MergeDuplicateAttributesFix(PsiElement element) {
@@ -27,42 +27,46 @@ public class MergeDuplicateAttributesFix extends LocalQuickFixAndIntentionAction
@Nullable Editor editor,
@NotNull PsiElement startElement,
@NotNull PsiElement endElement) {
final PsiNameValuePair pair = (PsiNameValuePair)startElement;
final PsiAnnotationParameterList parameterList = (PsiAnnotationParameterList)pair.getParent();
final PsiNameValuePair[] attributes = parameterList.getAttributes();
final StringJoiner joiner = new StringJoiner(", ");
final String name = pair.getName();
final boolean[] isFirstValue = {true};
StreamEx.of(attributes).filterBy(PsiNameValuePair::getName, name).map(attribute -> attribute.getValue()).filter(Objects::nonNull)
.forEach(value -> {
CommentTracker ct = new CommentTracker();
if (value instanceof PsiArrayInitializerMemberValue) {
if (((PsiArrayInitializerMemberValue)value).getInitializers().length == 0 && !isFirstValue[0]) {
new CommentTracker().deleteAndRestoreComments(value.getParent());
return;
}
else {
final PsiElement lBrace = value.getFirstChild();
final PsiElement lastChild = value.getLastChild();
PsiElement maybeTrailingComma = PsiTreeUtil.skipWhitespacesAndCommentsBackward(lastChild);
if (PsiUtil.isJavaToken(maybeTrailingComma, JavaTokenType.COMMA)) {
maybeTrailingComma = maybeTrailingComma.getPrevSibling();
}
if (maybeTrailingComma == null) return;
joiner.add(ct.rangeText(lBrace.getNextSibling(), maybeTrailingComma));
}
PsiNameValuePair pair = (PsiNameValuePair)startElement;
PsiAnnotationParameterList parameterList = (PsiAnnotationParameterList)pair.getParent();
PsiNameValuePair[] attributes = parameterList.getAttributes();
List<String> strings = new ArrayList<>();
String name = pair.getName();
if (name == null) return;
for (PsiNameValuePair attribute : attributes) {
String attributeName = attribute.getName();
if (!name.equals(attributeName) && (attributeName != null || !PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME.equals(name))) continue;
PsiAnnotationMemberValue value = attribute.getValue();
if (value == null) continue;
CommentTracker ct = new CommentTracker();
if (value instanceof PsiArrayInitializerMemberValue) {
if (((PsiArrayInitializerMemberValue)value).getInitializers().length != 0) {
PsiElement lBrace = value.getFirstChild();
PsiElement rBrace = value.getLastChild();
PsiElement maybeTrailingComma = PsiTreeUtil.skipWhitespacesAndCommentsBackward(rBrace);
// if there is a trailing comma in the array initializer, this allows you to copy comments between the last initializer and
// the trailing comma to the merged value
PsiElement to = (PsiUtil.isJavaToken(maybeTrailingComma, JavaTokenType.COMMA) ? maybeTrailingComma : rBrace).getPrevSibling();
strings.add(ct.rangeText(lBrace.getNextSibling(), to));
}
else {
joiner.add(value.getText());
}
if (!isFirstValue[0]) {
ct.deleteAndRestoreComments(value.getParent());
}
isFirstValue[0] = false;
});
final PsiAnnotation dummyAnnotation = JavaPsiFacade.getElementFactory(project).createAnnotationFromText("@A({" + joiner + "})", null);
final PsiAnnotationMemberValue mergedValue = dummyAnnotation.getParameterList().getAttributes()[0].getValue();
final PsiAnnotation annotation = (PsiAnnotation)parameterList.getParent();
}
else {
strings.add(value.getText());
}
if (strings.size() != 1) {
// the check above allows you to get from
// @SuppressWarnings(value = "foo", value = "bar")
// to
// @SuppressWarnings(value = {"foo", "bar"}),
// but not to
// @SuppressWarnings({"foo", "bar"})
ct.deleteAndRestoreComments(value.getParent());
}
}
PsiAnnotation dummyAnnotation =
JavaPsiFacade.getElementFactory(project).createAnnotationFromText("@A({" + Strings.join(strings, ", ") + "})", null);
PsiAnnotationMemberValue mergedValue = dummyAnnotation.getParameterList().getAttributes()[0].getValue();
PsiAnnotation annotation = (PsiAnnotation)parameterList.getParent();
annotation.setDeclaredAttributeValue(pair.getName(), mergedValue);
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/afterArrays.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value= {"a", "b", "c"})
@SuppressWarnings(value = {"a", "b", "c"})
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/afterComments.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(/*1*/value/*2*/=/*3*/{"a", "b", /*12*/"c"/*13*/, /*14*/"d"/*15*/}/*4*/ /*5*//*6*//*7*//*8*/ /*9*//*10*//*11*//*16*//*17*/)
@SuppressWarnings(/*1*/value/*2*/ = /*3*/{"a", "b", /*12*/"c"/*13*/,/*14*/"d"/*15*/, /*18*/"e"/*19*/}/*4*//*5*//*6*//*7*//*8*//*9*//*10*//*11*//*16*//*17*/)
class Main { }

3
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/afterEmptyArrays.java Normal file
View File

@@ -0,0 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value = {"a", "b"})
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/afterMixed1.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value= {"a", "b", "c"})
@SuppressWarnings(value = {"a", "b", "c"})
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/afterMixed2.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value= {"a", "b", "c"})
@SuppressWarnings(value = {"a", "b", "c"})
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/afterNotArrays.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value= {"a", "b", "c"})
@SuppressWarnings(value = {"a", "b", "c"})
class Main { }

3
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/afterShorthandForm1.java Normal file
View File

@@ -0,0 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings({"a", "b", "c"})
class Main { }

3
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/afterShorthandForm2.java Normal file
View File

@@ -0,0 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value = {"a", "b", "c"})
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/afterTrailingComma.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value= {"a", "b", "c"})
@SuppressWarnings(value = {"a", "b", "c"})
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/beforeArrays.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value={"a"}, value={"b"}<caret>, value={"c"})
@SuppressWarnings(value = {"a"}, value = {"b"}<caret>, value = {"c"})
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/beforeComments.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(/*1*/value/*2*/=/*3*/"a"/*4*/, /*5*/value/*6*/=/*7*/"b"/*8*/, /*9*/value/*10*/=/*11*/{/*12*/"c"/*13*/, /*14*/"d"/*15*/, /*16*/<caret>}/*17*/)
@SuppressWarnings(/*1*/value/*2*/ = /*3*/"a"/*4*/,/*5*/value/*6*/ = /*7*/"b"/*8*/,/*9*/value/*10*/ = /*11*/{/*12*/"c"/*13*/,/*14*/"d"/*15*/, /*16*/<caret>}/*17*/, value = {/*18*/"e"/*19*/})
class Main { }

3
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/beforeEmptyArrays.java Normal file
View File

@@ -0,0 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value = {}, value = "a"<caret>, value = {"b"}, value = {})
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/beforeMixed1.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value={"a"}, value="b"<caret>, value={"c"})
@SuppressWarnings(value = {"a"}, value = "b"<caret>, value = {"c"})
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/beforeMixed2.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value="a", value={"b"}<caret>, value="c")
@SuppressWarnings(value = "a", value = {"b"}<caret>, value = "c")
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/beforeNotArrays.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value="a", value="b"<caret>, value="c")
@SuppressWarnings(value = "a", value = "b"<caret>, value = "c")
class Main { }

3
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/beforeShorthandForm1.java Normal file
View File

@@ -0,0 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings("a", value = "b", value = "c"<caret>)
class Main { }

3
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/beforeShorthandForm2.java Normal file
View File

@@ -0,0 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value = "a", "b", value = "c"<caret>)
class Main { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeDuplicates/beforeTrailingComma.java
View File

@@ -1,3 +1,3 @@
// "Merge duplicate attributes" "true"
@SuppressWarnings(value={"a",}, value={"b", }<caret>, value={"c", })
@SuppressWarnings(value = {"a",}, value = {"b", }<caret>, value = {"c", })
class Main { }