update bnf and codegen

FacilityApi · Dec 31, 2024 · a9fa4e3 · a9fa4e3
1 parent 39623bc
commit a9fa4e3
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 446 deletions.
diff --git a/src/main/gen/io/github/facilityapi/intellij/parser/FsdParser.java b/src/main/gen/io/github/facilityapi/intellij/parser/FsdParser.java
diff --git a/src/main/gen/io/github/facilityapi/intellij/parser/FsdParserUtil.java b/src/main/gen/io/github/facilityapi/intellij/parser/FsdParserUtil.java
@@ -0,0 +1,6 @@
+package io.github.facilityapi.intellij.parser;
+
+import com.intellij.lang.parser.GeneratedParserUtilBase;
+
+public class FsdParserUtil extends GeneratedParserUtilBase {
+}
diff --git a/src/main/gen/io/github/facilityapi/intellij/psi/FsdServiceSpec.java b/src/main/gen/io/github/facilityapi/intellij/psi/FsdServiceSpec.java
diff --git a/src/main/gen/io/github/facilityapi/intellij/psi/FsdTypes.java b/src/main/gen/io/github/facilityapi/intellij/psi/FsdTypes.java
diff --git a/src/main/gen/io/github/facilityapi/intellij/psi/FsdVisitor.java b/src/main/gen/io/github/facilityapi/intellij/psi/FsdVisitor.java
diff --git a/src/main/gen/io/github/facilityapi/intellij/psi/impl/FsdServiceItemsImpl.java b/src/main/gen/io/github/facilityapi/intellij/psi/impl/FsdServiceItemsImpl.java
diff --git a/src/main/gen/io/github/facilityapi/intellij/psi/impl/FsdServiceSpecImpl.java b/src/main/gen/io/github/facilityapi/intellij/psi/impl/FsdServiceSpecImpl.java
diff --git a/src/main/kotlin/io/github/facilityapi/intellij/fsd.bnf b/src/main/kotlin/io/github/facilityapi/intellij/fsd.bnf
@@ -1,5 +1,6 @@
 {
   parserClass="io.github.facilityapi.intellij.parser.FsdParser"
+  parserUtilClass="io.github.facilityapi.intellij.parser.FsdParserUtil"
 
   psiClassPrefix="Fsd"
   psiImplClassSuffix="Impl"
@@ -42,8 +43,7 @@
 
 definition ::= (attribute_list* service_spec) markdown_remarks*
 
-service_spec ::= (service identifier service_items[';']) { pin=1 }
-service_items ::= ('{' decorated_service_item* '}') | decorated_service_item
+service_spec ::= (service identifier ';' decorated_service_item*) | (service identifier '{' decorated_service_item* '}') { pin=1 }
 decorated_service_item ::= attribute_list* service_item
 private service_item ::=  (extern_decl | enum_spec | data_spec | method_spec | error_set_spec) { recoverWhile=service_item_recover }
 private service_item_recover ::= !('[' | '}' | extern | enum | data | errors | method)