fix missing optional check on anonymousTypeFields (issue #1181)

HaxeFoundation · Aug 8, 2024 · 01f1cc7 · 01f1cc7
1 parent 872e051
commit 01f1cc7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/com/intellij/plugins/haxe/lang/parser/haxe.bnf b/src/main/java/com/intellij/plugins/haxe/lang/parser/haxe.bnf
@@ -413,7 +413,7 @@ private enumConstructorParameters ::= parenthesizedParameterList
 
 fieldDeclaration ::= fieldModifier* mutabilityModifier componentName propertyDeclaration? typeTag? varInit? <<semicolonUnlessPrecededByStatement>>
 {pin=3 mixin="com.intellij.plugins.haxe.lang.psi.impl.HaxePsiFieldImpl" implements="com.intellij.plugins.haxe.lang.psi.HaxePsiField"}
-optionalFieldDeclaration ::= fieldModifier* mutabilityModifier '?' componentName propertyDeclaration? typeTag? varInit? <<semicolonUnlessPrecededByStatement>>
+optionalFieldDeclaration ::= fieldModifier* mutabilityModifier optionalMark componentName propertyDeclaration? typeTag? varInit? <<semicolonUnlessPrecededByStatement>>
 {pin=3 implements=fieldDeclaration mixin="com.intellij.plugins.haxe.lang.psi.impl.HaxePsiFieldImpl" implements="com.intellij.plugins.haxe.lang.psi.HaxePsiField"}
 //NOTE: static local variable is a haxe 4.3+ feature
 localVarDeclarationList ::='static'? mutabilityModifier localVarDeclaration (',' localVarDeclaration)* <<semicolonUnlessPrecededByStatement>>{pin=3}
@@ -969,7 +969,7 @@ typeExtendsList ::= '>' type (',' '>' type)* {pin=1}
 
 anonymousTypeFieldList ::= anonymousTypeField (',' anonymousTypeField)* ','? {recoverWhile="object_literal_part_recover" pin=1}
 private sep ::= ',' | ';'
-anonymousTypeField ::= "?"? componentName typeTag
+anonymousTypeField ::= optionalMark? componentName typeTag
 {pin=3 mixin="com.intellij.plugins.haxe.lang.psi.impl.HaxePsiFieldImpl" implements="com.intellij.plugins.haxe.lang.psi.HaxePsiField"}
 
 // Do NOT genericize objectLiteral by making objectLiteralElementList optional.  Doing so

diff --git a/src/main/java/com/intellij/plugins/haxe/model/HaxeFieldModel.java b/src/main/java/com/intellij/plugins/haxe/model/HaxeFieldModel.java
@@ -214,6 +214,9 @@ public HaxeExpression getInitializerExpression() {
 
   public boolean isOptional() {
     if(getBasePsi() instanceof HaxeOptionalFieldDeclaration) return true;
+    if(getBasePsi() instanceof HaxeAnonymousTypeField anonymous) {
+      if (anonymous.getOptionalMark() != null)return true;
+    }
     return hasOptionalMeta();
   }
 }