MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java. Code Formatting] Perform a manual lookup of the annotation in the import list in JavaFormatterUtil#isTypeAnnotation

Browse Source 
IDEA-353192

GitOrigin-RevId: fa51cf055f554369102a71e9518aee0f5c520406
This commit is contained in:
Georgii Ustinov
2024-06-04 07:35:01 +03:00
committed by intellij-monorepo-bot
parent 36df18e29b
commit 6517ffb793
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/java-impl/src/com/intellij/psi/formatter/java/JavaFormatterUtil.java
View File

@@ -464,12 +464,21 @@ public final class JavaFormatterUtil {
String referenceNameText = referenceName.getText();
return ContainerUtil.or(KNOWN_TYPE_ANNOTATIONS, fqn -> {
if (!fqn.endsWith(referenceNameText)) return false;
String packageName = StringUtil.getPackageName(fqn);
return importList.findOnDemandImportStatement(packageName) != null || importList.findSingleClassImportStatement(fqn) != null;
return isAnnotationInImportList(fqn, importList);
});
}
}
private static boolean isAnnotationInImportList(String annotationFqn, PsiImportList importList) {
String packageName = StringUtil.getPackageName(annotationFqn);
return ContainerUtil.or(importList.getImportStatements(), statement -> {
PsiJavaCodeReferenceElement referenceElement = statement.getImportReference();
if (referenceElement == null) return false;
String referenceElementText = referenceElement.getText();
return referenceElementText.equals(annotationFqn) || statement.isOnDemand() && referenceElementText.startsWith(packageName);
});
}
private static void putPreferredWrapInParentBlock(@NotNull AbstractJavaBlock block, @NotNull Wrap preferredWrap) {
AbstractJavaBlock parentBlock = block.getParentBlock();
if (parentBlock != null) {