Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHP 8.2 Support: Fetch properties of enums in const expressions #4966

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion php/php.editor/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
3,712 changes: 1,955 additions & 1,757 deletions php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6,510 changes: 3,255 additions & 3,255 deletions php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable1.java

Large diffs are not rendered by default.

Loading