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

[java] IDEA-379571 Revert: Improve PsiPackageStatement.getAnnotationList() so it never returns null value

Browse Source 
1) git reverts: Improve PsiPackageStatement.getAnnotationList() so it never returns null value
2) Solves merge conflicts in:
 - community/java/java-impl/src/com/intellij/lang/OuterModelsModificationTracker.java
 - community/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveAnnotationToPackageInfoFileFix.java
3) bumps STUB_VERSION in
 - ClassFileStubBuilder.java
 - JavaFileElementType.java

Merge-request: IJ-MR-177519
Merged-by: Marcin Mikosik <marcin.mikosik@jetbrains.com>

GitOrigin-RevId: 14ced51685daf90d3b2a8224bf35c8478ed2909f
This commit is contained in:
Marcin Mikosik
2025-10-06 09:43:02 +00:00
committed by intellij-monorepo-bot
parent 91ca142605
commit 55ace90cfb
67 changed files with 63 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/AnnotationChecker.java
+2 -1
View File
@@ -73,7 +73,8 @@ final class AnnotationChecker {
}
void checkPackageAnnotationContainingFile(@NotNull PsiPackageStatement statement) {
if (statement.getAnnotationList().getAnnotations().length > 0 && !PsiPackage.PACKAGE_INFO_FILE.equals(myVisitor.file().getName())) {
PsiModifierList annotationList = statement.getAnnotationList();
if (annotationList != null && !PsiPackage.PACKAGE_INFO_FILE.equals(myVisitor.file().getName())) {
myVisitor.report(JavaErrorKinds.ANNOTATION_NOT_ALLOWED_ON_PACKAGE.create(statement));
}
}
java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/errors/JavaErrorKinds.java
+1 -1
View File
@@ -104,7 +104,7 @@ public final class JavaErrorKinds {
public static final Simple<PsiAnnotation> ANNOTATION_NOT_ALLOWED_IN_PERMIT_LIST = error("annotation.not.allowed.in.permit.list");
public static final Simple<PsiPackageStatement> ANNOTATION_NOT_ALLOWED_ON_PACKAGE =
error(PsiPackageStatement.class, "annotation.not.allowed.on.package")
.withAnchor(PsiPackageStatement::getAnnotationList);
.withAnchor(statement -> requireNonNull(statement.getAnnotationList()));
public static final Simple<PsiReferenceList> ANNOTATION_MEMBER_THROWS_NOT_ALLOWED =
error(PsiReferenceList.class, "annotation.member.may.not.have.throws.list").withAnchor(list -> requireNonNull(list.getFirstChild()));
public static final Simple<PsiParameterList> ANNOTATION_MEMBER_MAY_NOT_HAVE_PARAMETERS =