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. Code Formatting] Fix tests in JavaFormatterAroundBlankLines after new behaviour

Browse Source 
IDEA-110857

GitOrigin-RevId: 61e86ace3749d42347ace6738c6b9f2a1a341148
This commit is contained in:
Georgii Ustinov
2024-07-11 12:29:38 +00:00
committed by intellij-monorepo-bot
parent 072396cc0a
commit 029e881a2f
8 changed files with 104 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/formatter/java/JavaFormatterAnnotationUtil.kt
+19 -3
View File
@@ -2,11 +2,11 @@
package com.intellij.psi.formatter.java
import com.intellij.lang.ASTNode
import com.intellij.lang.tree.util.children
import com.intellij.openapi.roots.LanguageLevelProjectExtension
import com.intellij.openapi.util.text.StringUtil
import com.intellij.pom.java.LanguageLevel
import com.intellij.psi.*
import com.intellij.psi.formatter.FormatterUtil
import com.intellij.psi.impl.source.tree.JavaElementType
import com.intellij.psi.util.CachedValueProvider
import com.intellij.psi.util.CachedValuesManager
@@ -59,8 +59,8 @@ internal object JavaFormatterAnnotationUtil {
val modifierList = node.firstChildNode ?: return false
if (modifierList.elementType != JavaElementType.MODIFIER_LIST) return false
val annotations = modifierList.children().takeWhile { it.elementType == JavaElementType.ANNOTATION }
return annotations.any { !isTypeAnnotation(it) }
val annotationList = getAllAnnotationsOnPrefix(modifierList)
return annotationList.any { !isTypeAnnotation(it) }
}
/**
@@ -71,6 +71,22 @@ internal object JavaFormatterAnnotationUtil {
return isFieldWithAnnotations(field.node)
}
/**
* Retrieves all annotation nodes within the given modifier list prefix, e.g. before all keywords.
*
* @param modifierList the ASTNode representing the modifier list.
* @return a list of ASTNode objects representing the annotations found in the modifier list.
*/
private fun getAllAnnotationsOnPrefix(modifierList: ASTNode): List<ASTNode> {
val result = mutableListOf<ASTNode>()
var currentNode = modifierList.firstChildNode
while (currentNode?.elementType == JavaElementType.ANNOTATION) {
result.add(currentNode)
currentNode = FormatterUtil.getNextNonWhitespaceSibling(currentNode)
}
return result
}
private fun getImportedTypeAnnotations(file: PsiJavaFile): Set<String> = CachedValuesManager.getCachedValue(file) {
val importList = file.importList
?: return@getCachedValue CachedValueProvider.Result(emptySet(), PsiModificationTracker.MODIFICATION_COUNT)
java/java-tests/testData/psi/formatter/blankLinesAroundField/differentAnnotationLocation.java
-15
View File
@@ -1,15 +0,0 @@
package org.example;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class ClassWithAnnotations {
public final boolean simpleField1 = true;
private @Nullable
final Integer annotatedField1 = 10;
public Boolean simpleField2 = false;
public @NotNull Integer annotatedField2 = 1;
private Boolean simpleField3 = false;
@NotNull
private Integer getAnnotatedField3 = 2;
}
java/java-tests/testData/psi/formatter/blankLinesAroundField/differentAnnotationLocation_after.java
-21
View File
@@ -1,21 +0,0 @@
package org.example;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class ClassWithAnnotations {
public final boolean simpleField1 = true;
private @Nullable
final Integer annotatedField1 = 10;
public Boolean simpleField2 = false;
public @NotNull Integer annotatedField2 = 1;
private Boolean simpleField3 = false;
@NotNull
private Integer getAnnotatedField3 = 2;
}
java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement.java
+8 -3
View File
@@ -4,8 +4,13 @@ import org.jetbrains.annotations.NotNull;
public class ClassWithAnnotations {
private static final Boolean SIMPLE_FIELD = false;
@NotNull public static final Boolean ANOTHER_ANNOTATED_FIELD = false;
@NotNull public static final Boolean ANNOTATED_FIELD = false;
private @NotNull Boolean annotatedField = false;
@FieldAnnotation public static final Boolean ANOTHER_ANNOTATED_FIELD = false;
@FieldAnnotation public static final Boolean ANNOTATED_FIELD = false;
@FieldAnnotation private @NotNull Boolean annotatedField = false;
private @NotNull Boolean secondAnnotatedField = false;
@NotNull Boolean nonPrivateAnnotatedField = false;
@NotNull @FieldAnnotation Boolean secondNonPrivateAnnotatedField = false;
public Boolean simpleField = false;
}
interface @interface FieldAnnotation {}
java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement_after.java
+17 -2
View File
@@ -6,15 +6,30 @@ public class ClassWithAnnotations {
private static final Boolean SIMPLE_FIELD = false;
@NotNull
@FieldAnnotation
public static final Boolean ANOTHER_ANNOTATED_FIELD = false;
@NotNull
@FieldAnnotation
public static final Boolean ANNOTATED_FIELD = false;
@FieldAnnotation
private @NotNull Boolean annotatedField = false;
private @NotNull Boolean secondAnnotatedField = false;
@NotNull Boolean nonPrivateAnnotatedField = false;
@NotNull
@FieldAnnotation
Boolean secondNonPrivateAnnotatedField = false;
public Boolean simpleField = false;
}
interface
@interface FieldAnnotation {
}
java/java-tests/testData/psi/formatter/blankLinesAroundField/typeAnnotation.java
+20
View File
@@ -0,0 +1,20 @@
package org.example;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class ClassWithAnnotations {
public final boolean simpleField1 = true;
private @Nullable final Integer typeAnnotatedField1 = 10;
public Boolean simpleField2 = false;
public @NotNull Integer typeAnnotatedField2 = 1;
@NotNull Boolean typeAnnotatedField3 = true;
private Boolean simpleField3 = false;
@NotNull private Integer typeAnnotatedField4 = 2;
@FieldAnnotation private Boolean annotatedField4 = 4;
@FieldAnnotation @NotNull private Boolean annotatedField5 = 4;
@NotNull @FieldAnnotation private Boolean annotatedField6 = 4;
@FieldAnnotation private @NotNull Boolean annotatedField7 = 4;
}
@interface FieldAnnotation {}
java/java-tests/testData/psi/formatter/blankLinesAroundField/typeAnnotation_after.java
+39
View File
@@ -0,0 +1,39 @@
package org.example;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class ClassWithAnnotations {
public final boolean simpleField1 = true;
private @Nullable
final Integer typeAnnotatedField1 = 10;
public Boolean simpleField2 = false;
public @NotNull Integer typeAnnotatedField2 = 1;
@NotNull Boolean typeAnnotatedField3 = true;
private Boolean simpleField3 = false;
@NotNull
private Integer typeAnnotatedField4 = 2;
@FieldAnnotation
private Boolean annotatedField4 = 4;
@FieldAnnotation
@NotNull
private Boolean annotatedField5 = 4;
@NotNull
@FieldAnnotation
private Boolean annotatedField6 = 4;
@FieldAnnotation
private @NotNull Boolean annotatedField7 = 4;
}
@interface FieldAnnotation {
}
java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterBlankLinesAroundFieldTest.kt
+1 -1
View File
@@ -18,7 +18,7 @@ class JavaFormatterBlankLinesAroundFieldTest : JavaFormatterTestCase() {
fun testMultipleAnnotatedFields() = doTest()
fun testDifferentAnnotationLocation() = doTest()
fun testTypeAnnotation() = doTest()
fun testMixed() = doTest()