Skip to content
Snippets Groups Projects

Feature/autoformat

Merged Johannes Mey requested to merge feature/autoformat into develop
10 files
+ 106
20
Compare changes
  • Side-by-side
  • Inline
Files
10
@@ -19,7 +19,7 @@ GrammarFile ::= comment* ((type_decl | relation) comment*)*
comment ::= (WHITESPACE | MULTILINECOMMENT | DOCCOMMENT | SINGLELINECOMMENT)
type_decl ::= ABSTRACT? declared_name (COL type_reference)? (ASSIGN (component | nta_component)*)? SCOL
type_decl ::= ABSTRACT? type_name (COL type_reference)? (ASSIGN (component | nta_component)*)? SCOL
{
extends="org.jastadd.tooling.grammar.psi.impl.GrammarTypeDeclImplExtension"
implements="org.jastadd.tooling.grammar.psi.GrammarNamedElement"
@@ -27,7 +27,7 @@ type_decl ::= ABSTRACT? declared_name (COL type_reference)? (ASSIGN (component |
nta_component ::= SLASH component SLASH
component ::= (declared_name COL type_reference STAR?) | (type_reference STAR?) | (LBRACKET declared_name COL type_reference RBRACKET) | (LBRACKET type_reference RBRACKET) | (LT declared_name (COL (java_type_use))? GT)
component ::= (component_name COL type_reference STAR?) | (type_reference STAR?) | (LBRACKET component_name COL type_reference RBRACKET) | (LBRACKET type_reference RBRACKET) | (LT component_name (COL (java_type_use))? GT)
java_type_use ::= parameterized_java_type_use | simple_java_type_use
@@ -39,14 +39,22 @@ relation ::= REL ((unnamed_role LEFT navigable_role) | (navigable_role RIGHT un
unnamed_role ::= type_reference | navigable_role
navigable_role ::= type_reference DOT declared_name (STAR | QUESTION_MARK)?
navigable_role ::= type_reference DOT component_name (STAR | QUESTION_MARK)?
// for auto-completion, it is helpful if we can distinguish the different IDs
declared_name ::= ID
type_name ::= ID
type_reference ::= ID
{
extends="org.jastadd.tooling.grammar.psi.impl.GrammarTypeReferenceImplExtension"
implements="org.jastadd.tooling.grammar.psi.GrammarNamedElement"
}
component_name ::= ID
{
extends="org.jastadd.tooling.grammar.psi.impl.GrammarComponentNameImplExtension"
implements="org.jastadd.tooling.grammar.psi.GrammarNamedElement"
}
java_name ::= ID
Loading