Merge pull request #4966 from junichi11/php82-fetch-properties-of-enu…

…ms-in-const-expressions PHP 8.2 Support: Fetch properties of enums in const expressions
apache · Nov 15, 2022 · 3be3304 · 3be3304
2 parents 2208100 + c58bff6
commit 3be3304
Show file tree

Hide file tree

Showing 60 changed files with 59,111 additions and 53,462 deletions.
diff --git a/php/php.editor/nbproject/project.properties b/php/php.editor/nbproject/project.properties
@@ -20,7 +20,7 @@ build.compiler=extJavac
 nbjavac.ignore.missing.enclosing=**/CUP$ASTPHP5Parser$actions.class
 javac.compilerargs=-J-Xmx512m
 nbm.needs.restart=true
-spec.version.base=2.21.0
+spec.version.base=2.22.0
 release.external/predefined_vars-1.0.zip=docs/predefined_vars.zip
 sigtest.gen.fail.on.error=false
 

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java b/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
@@ -1492,8 +1492,15 @@ public boolean isAccepted(PhpElement element) {
                         for (InterfaceElement backedEnum : enums) {
                             accessibleTypeMembers.addAll(request.index.getAccessibleTypeMembers(backedEnum, backedEnum));
                         }
+                        if (!staticContext && "name".startsWith(request.prefix)) { // NOI18N
+                            // All Cases have a read-only property, name
+                            // see: https://www.php.net/manual/en/language.enumerations.basics.php
+                            // e.g. E::Case->name;
+                            completionResult.add(PHPCompletionItem.AdditionalFieldItem.getItem("name", Type.STRING, enumElement.getFullyQualifiedName().toString(), request)); // NOI18N
+                        }
                         if (!staticContext
-                                && !backingTypeName.isEmpty()) {
+                                && !backingTypeName.isEmpty()
+                                && "value".startsWith(request.prefix)) { // NOI18N
                             completionResult.add(PHPCompletionItem.AdditionalFieldItem.getItem("value", backingTypeName, enumElement.getFullyQualifiedName().toString(), request)); // NOI18N
                         }
                     }

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/ClassDeclarationInfo.java b/php/php.editor/src/org/netbeans/modules/php/editor/model/nodes/ClassDeclarationInfo.java
@@ -107,7 +107,11 @@ public PhpModifiers getAccessModifiers() {
                 case READONLY:
                     phpModifiers.add(PhpModifiers.READONLY);
                     break;
+                case NONE:
+                    // no-op
+                    break;
                 default:
+                    assert false : "Handle " + modifier + " modifier"; // NOI18N
                     break;
             }
         }

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java
@@ -19,7 +19,7 @@
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.11a beta 20060608
-// Wed Nov 02 15:33:27 JST 2022
+// Sun Nov 13 22:45:03 JST 2022
 //----------------------------------------------------
 
 package org.netbeans.modules.php.editor.parser;

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable1.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable1.java