File: java21-compatibility.patch

package info (click to toggle)
intellij-community-idea 183.5153.4-6
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 178,408 kB
  • sloc: java: 2,023,773; xml: 78,706; ansic: 2,742; cpp: 1,688; javascript: 1,657; objc: 1,316; sh: 724; perl: 221; ruby: 102; python: 87; makefile: 7
file content (46 lines) | stat: -rw-r--r-- 1,958 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
Description: fully quialify org.jetbrains.concurrency.Promise.State
 Java 19 introduced java.util.concurrent.Future.State enum,
 see https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/util/concurrent/Future.State.html
 causing the following error:
/<<PKGBUILDDIR>>/platform/core-api/src/org/jetbrains/concurrency/InternalPromiseUtil.java:148: error: reference to State is ambiguous
    public final State getState() {
                 ^
  both enum org.jetbrains.concurrency.Promise.State in Promise and enum java.util.concurrent.Future.State in Future match
Author: Vladimir Petko <vladimir.petko@canonical.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057506
Forwarded: not-needed
Last-Update: 2024-01-15
--- a/platform/core-api/src/org/jetbrains/concurrency/InternalPromiseUtil.java
+++ b/platform/core-api/src/org/jetbrains/concurrency/InternalPromiseUtil.java
@@ -81,8 +81,8 @@
     }

     @NotNull
-    public Promise.State getState() {
-      return error == null ? Promise.State.SUCCEEDED : Promise.State.REJECTED;
+    public org.jetbrains.concurrency.Promise.State getState() {
+      return error == null ? org.jetbrains.concurrency.Promise.State.SUCCEEDED : org.jetbrains.concurrency.Promise.State.REJECTED;
     }

     public boolean isCancelled() {
@@ -145,9 +145,9 @@

     @NotNull
     @Override
-    public final State getState() {
+    public final org.jetbrains.concurrency.Promise.State getState() {
       PromiseValue<T> value = getValue();
-      return value == null ? State.PENDING : value.getState();
+      return value == null ? org.jetbrains.concurrency.Promise.State.PENDING : value.getState();
     }

     @Override
@@ -173,7 +173,7 @@

     @Override
     public final boolean cancel(boolean mayInterruptIfRunning) {
-      if (getState() == State.PENDING) {
+      if (getState() == org.jetbrains.concurrency.Promise.State.PENDING) {
         cancel();
         return true;
       }