mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-08-26 15:27:45 +07:00
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