Fix Enum with Special Names

francistogram · francistogram · commit 5a13d8bedbf9 · 2024-05-18T08:32:34.000-05:00
diff --git a/packages/language/src/generated/ast.ts b/packages/language/src/generated/ast.ts
@@ -366,7 +366,7 @@ export interface EnumField extends AstNode {
     readonly $type: 'EnumField';
     attributes: Array<DataModelFieldAttribute>
     comments: Array<string>
-    name: RegularID
+    name: RegularIDWithTypeNames
 }
 
 export const EnumField = 'EnumField';
diff --git a/packages/language/src/generated/grammar.ts b/packages/language/src/generated/grammar.ts
@@ -2357,7 +2357,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@46"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
diff --git a/packages/language/src/zmodel.langium b/packages/language/src/zmodel.langium
@@ -209,7 +209,7 @@ Enum:
 
 EnumField:
     (comments+=TRIPLE_SLASH_COMMENT)*
-    name=RegularID (attributes+=DataModelFieldAttribute)*;
+    name=RegularIDWithTypeNames (attributes+=DataModelFieldAttribute)*;
 
 // function
 FunctionDecl:

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ export interface EnumField extends AstNode {`
`366`	`366`	`readonly $type: 'EnumField';`
`367`	`367`	`attributes: Array<DataModelFieldAttribute>`
`368`	`368`	`comments: Array<string>`
`369`		`- name: RegularID`
	`369`	`+ name: RegularIDWithTypeNames`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`export const EnumField = 'EnumField';`
Original file line number	Diff line number	Diff line change
`@@ -2357,7 +2357,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel`
`2357`	`2357`	`"terminal": {`
`2358`	`2358`	`"$type": "RuleCall",`
`2359`	`2359`	`"rule": {`
`2360`		`- "$ref": "#/rules@46"`
	`2360`	`+ "$ref": "#/rules@47"`
`2361`	`2361`	`},`
`2362`	`2362`	`"arguments": []`
`2363`	`2363`	`}`