Merge ~vpa1977/ubuntu/+source/intellij-community-idea:java21_ftbfs_patch into ubuntu/+source/intellij-community-idea:ubuntu/devel

[Vladimir Petko]

This MR is a prerequisite for fixing kotlin ftbfs

Changes:
 - cherry-pick upstream patch to resolve protobuf types not found errors in kotlin compiler (it was throwing nullpointer when generating stubs for enumerations in protobuf)
 - require asm 9.6 so that Java 21 can be parsed

PPA: ppa:vpa1977/gettext [1]

Testing:
 - piuparts test (Install/Purge) [2]
 - rebuild kotlin with default Java 21 and updated intellij [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://bugs.launchpad.net/ubuntu/+source/kotlin/+bug/2051757/comments/1
[3] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15766367/+listing-archive-extra

[Dan Bungert (dbungert)]

Already merged

diff --git a/debian/changelog b/debian/changelog
index 8211e40..d624327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+intellij-community-idea (183.5153.4-4ubuntu1) noble; urgency=medium
+
+  * Resolve Java 21 kotlin ftbfs, see launchpad bug 2051757:
+    - d/p/java21-stub-decompiler-fails-on-enums.patch: cherry-pick
+      upstream patch to resolve kotlin ftbfs (See 1057513).
+    - d/control: require updated libasm-java to support Java 21.
+
+ -- Vladimir Petko <[e-mail]>  Wed, 24 Jan 2024 11:33:44 +1300
+
 intellij-community-idea (183.5153.4-4) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index f2c03d4..b0c8dfe 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: intellij-community-idea
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Saif Abdul Cassim <[e-mail]>
 Build-Depends:
  ant,
@@ -9,6 +10,7 @@ Build-Depends:
  default-jdk,
  dh-exec,
  gradle-debian-helper,
+ libasm-java (>= 9.6~),
  libautomaton-java,
  libbatik-java,
  libcommons-codec-java,
diff --git a/debian/patches/java21-stub-decompiler-fails-on-enums.patch b/debian/patches/java21-stub-decompiler-fails-on-enums.patch
new file mode 100644
index 0000000..6dc88f6
--- /dev/null
+++ b/debian/patches/java21-stub-decompiler-fails-on-enums.patch
@@ -0,0 +1,31 @@
+Description: [java] IDEA-323038 Stub decompiler fails on enums in Java 21-ea builds
+ Java 21 compiler adds the method parameter section to mandated methods like valueOf
+ in enums (see JDK-8292275). The new thing is that mandated method parameter may have
+ no name. It's unexpected for stub decompiler, which fails with NullPointerException.
+Author: Tagir Valeev <[e-mail]>
+Origin: upstream, https://github.com/JetBrains/intellij-community/commit/459851b9caea42ab6e99494409470a9060321686
+Bug: https://youtrack.jetbrains.com/issue/IDEA-323038
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057513
+Forwarded: not-needed
+Applied-Upstream: 459851b9caea42ab6e99494409470a9060321686
+Last-Update: 2024-01-24
+--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
++++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
+@@ -649,7 +649,7 @@
+     @Override
+     public void visitParameter(String name, int access) {
+       int paramIndex = myParamNameIndex++ - myParamIgnoreCount;
+-      if (!isSet(access, Opcodes.ACC_SYNTHETIC) && paramIndex >= 0 && paramIndex < myParamCount) {
++      if (name != null && !isSet(access, Opcodes.ACC_SYNTHETIC) && paramIndex >= 0 && paramIndex < myParamCount) {
+         setParameterName(name, paramIndex);
+       }
+     }
+@@ -666,7 +666,7 @@
+       }
+     }
+ 
+-    private void setParameterName(String name, int paramIndex) {
++    private void setParameterName(@NotNull String name, int paramIndex) {
+       if (ClsParsingUtil.isJavaIdentifier(name, LanguageLevel.HIGHEST)) {
+         myParamStubs[paramIndex].setName(name);
+       }
diff --git a/debian/patches/series b/debian/patches/series
index 34d32be..5c1b3ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ asm-compatibility.patch
 gradle-build-scripts.patch
 java17-compatibility.patch
 java21-compatibility.patch
+java21-stub-decompiler-fails-on-enums.patch