Merge pull request #6253 from dbalek/dbalek/jsva-cc-21

Code completion modified to support JDK 21 features.

java/java.completion/src/org/netbeans/modules/java/completion/BaseTask.java

@@ -340,10 +340,32 @@ private Env getEnvImpl(CompilationController controller, TreePath orig, TreePath
                         }
                         if (lastCase != null) {
                             stmts = lastCase.getStatements();
+                            if (stmts == null || stmts.isEmpty()) {
+                                Tree body = lastCase.getBody();
+                                if (body != null) {
+                                    last = body;
+                                } else {
+                                    Tree guard = lastCase.getGuard();
+                                    if (guard != null) {
+                                        last = guard;
+                                    }
+                                }
+                            }
                         }
                         break;
                     case CASE:
                         stmts = ((CaseTree) path.getLeaf()).getStatements();
+                        if (stmts == null || stmts.isEmpty()) {
+                            Tree body = ((CaseTree) path.getLeaf()).getBody();
+                            if (body != null) {
+                                last = body;
+                            } else {
+                                Tree guard = ((CaseTree) path.getLeaf()).getGuard();
+                                if (guard != null) {
+                                    last = guard;
+                                }
+                            }
+                        }
                         break;
                     case CONDITIONAL_AND: case CONDITIONAL_OR:
                         BinaryTree bt = (BinaryTree) last;
@@ -482,10 +504,32 @@ public Tree.Kind getKind() {
                         }
                         if (lastCase != null) {
                             stmts = lastCase.getStatements();
+                            if (stmts == null || stmts.isEmpty()) {
+                                Tree caseBody = lastCase.getBody();
+                                if (caseBody != null) {
+                                    last = caseBody;
+                                } else {
+                                    Tree guard = lastCase.getGuard();
+                                    if (guard != null) {
+                                        last = guard;
+                                    }
+                                }
+                            }
                         }
                         break;
                     case CASE:
                         stmts = ((CaseTree) path.getLeaf()).getStatements();
+                        if (stmts == null || stmts.isEmpty()) {
+                            Tree caseBody = ((CaseTree) path.getLeaf()).getBody();
+                            if (caseBody != null) {
+                                last = caseBody;
+                            } else {
+                                Tree guard = ((CaseTree) path.getLeaf()).getGuard();
+                                if (guard != null) {
+                                    last = guard;
+                                }
+                            }
+                        }
                         break;
                 }
                 if (stmts != null) {

java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/14/AutoCompletion_CaseLabels_PatternMatchingSwitch_3.pass → java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/AutoCompletion_CaseBody_PatternMatchingSwitch.pass

@@ -1,3 +1,46 @@
+Integer j
+Object obj
+Number v
+protected native Object clone()
+public boolean equals(Object arg0)
+protected void finalize()
+public final native Class<?> getClass()
+public native int hashCode()
+public final native void notify()
+public final native void notifyAll()
+public void op(Object obj)
+public String toString()
+public final void wait()
+public final native void wait(long arg0)
+public final void wait(long arg0, int arg1)
+assert
+boolean
+byte
+char
+class
+do
+double
+final
+float
+for
+if
+int
+long
+new
+record
+return
+short
+strictfp
+super
+switch
+synchronized
+this
+throw
+try
+var
+void
+while
+yield
 AbstractMethodError
 Appendable
 ArithmeticException
@@ -19,6 +62,7 @@ ClassNotFoundException
 ClassValue
 CloneNotSupportedException
 Cloneable
+Color
 Comparable
 Compiler
 Deprecated
@@ -66,11 +110,11 @@ Object
 OutOfMemoryError
 Override
 Package
+Point
 Process
 ProcessBuilder
 ProcessHandle
 Readable
-Record
 ReflectiveOperationException
 Runnable
 Runtime

java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/AutoCompletion_CaseLabels_PatternMatchingSwitch_1.pass

@@ -1,4 +1,3 @@
-default
 null
 AbstractMethodError
 Appendable
@@ -21,6 +20,7 @@ ClassNotFoundException
 ClassValue
 CloneNotSupportedException
 Cloneable
+Color
 Comparable
 Compiler
 Deprecated
@@ -64,6 +64,7 @@ Object
 OutOfMemoryError
 Override
 Package
+Point
 Process
 ProcessBuilder
 Readable

java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/AutoCompletion_CaseRecordPattern_1.pass

@@ -0,0 +1 @@
+Point(Number x, Number y)

java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/AutoCompletion_CaseRecordPattern_2.pass

@@ -0,0 +1,13 @@
+var
+Byte
+Double
+Float
+Integer
+Long
+Number
+Short
+com
+java
+javax
+org
+sun

java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/AutoCompletion_CaseRecordPattern_3.pass

@@ -0,0 +1,2 @@
+n
+number

java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/AutoCompletion_CaseRecordPattern_4.pass

@@ -0,0 +1,15 @@
+public byte byteValue()
+public abstract double doubleValue()
+public boolean equals(Object arg0)
+public abstract float floatValue()
+public final native Class<?> getClass()
+public native int hashCode()
+public abstract int intValue()
+public abstract long longValue()
+public final native void notify()
+public final native void notifyAll()
+public short shortValue()
+public String toString()
+public final void wait()
+public final native void wait(long arg0)
+public final void wait(long arg0, int arg1)