Skip to content

Enable explicit types for infix rules #1954

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.

Sign up for GitHub

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

Merged
spoenemann merged 4 commits into from
Jul 9, 2025
Merged

Enable explicit types for infix rules #1954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62bf84a
Enable explicit types for infix rules
spoenemann Jun 13, 2025
4df18f7
Generate type metadata for union types
spoenemann Jun 13, 2025
c35c4be
Fix test (again)
spoenemann Jul 2, 2025
4176a18
Merge type metadata generator branches
spoenemann Jul 9, 2025
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
18 changes: 18 additions & 0 deletions examples/arithmetics/src/language-server/generated/ast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,12 @@ export type ArithmeticsAstType = {

export class ArithmeticsAstReflection extends langium.AbstractAstReflection {
override readonly types = {
AbstractDefinition: {
name: AbstractDefinition.$type,
properties: {
},
superTypes: []
},
BinaryExpression: {
name: BinaryExpression.$type,
properties: {
Expand Down Expand Up @@ -243,6 +249,12 @@ export class ArithmeticsAstReflection extends langium.AbstractAstReflection {
},
superTypes: [Statement.$type]
},
Expression: {
name: Expression.$type,
properties: {
},
superTypes: []
},
FunctionCall: {
name: FunctionCall.$type,
properties: {
Expand Down Expand Up @@ -279,6 +291,12 @@ export class ArithmeticsAstReflection extends langium.AbstractAstReflection {
},
superTypes: [Expression.$type]
},
Statement: {
name: Statement.$type,
properties: {
},
superTypes: []
}
} as const satisfies langium.AstMetaData
}

Expand Down
12 changes: 12 additions & 0 deletions examples/domainmodel/src/language-server/generated/ast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ export type DomainModelAstType = {

export class DomainModelAstReflection extends langium.AbstractAstReflection {
override readonly types = {
AbstractElement: {
name: AbstractElement.$type,
properties: {
},
superTypes: []
},
DataType: {
name: DataType.$type,
properties: {
Expand Down Expand Up @@ -216,6 +222,12 @@ export class DomainModelAstReflection extends langium.AbstractAstReflection {
},
superTypes: [AbstractElement.$type]
},
Type: {
name: Type.$type,
properties: {
},
superTypes: [AbstractElement.$type]
}
} as const satisfies langium.AstMetaData
}

Expand Down
5 changes: 3 additions & 2 deletions packages/langium-cli/src/generator/ast-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ function generateAstReflection(config: LangiumConfig, astTypes: AstTypes): Gener
override readonly types = {
${joinToNode(typeNames, typeName => {
const interfaceType = astTypes.interfaces.find(t => t.name === typeName);
if (interfaceType) {
const props = interfaceType.superProperties;
const unionType = astTypes.unions.find(t => t.name === typeName);
if (interfaceType || unionType) {
const props = interfaceType?.superProperties ?? [];
const superTypes = typeHierarchy.superTypes.get(typeName) || [];
return expandToNode`
${typeName}: {
Expand Down
Loading