align with aspect branch

build.gradle.kts

src/main/grammar/Grammar.bnf

src/main/grammar/Grammar.flex

...a/org/jastadd/tooling/RelAstGrammarCodeStyleSettings.java

src/main/java/org/jastadd/tooling/grammar/Grammar.java

...in/java/org/jastadd/tooling/grammar/GrammarAnnotator.java

src/main/java/org/jastadd/tooling/grammar/GrammarBlock.java

...stadd/tooling/grammar/GrammarChooseByNameContributor.java

...org/jastadd/tooling/grammar/GrammarCodeStyleSettings.java

...add/tooling/grammar/GrammarCodeStyleSettingsProvider.java

...org/jastadd/tooling/grammar/GrammarColorSettingsPage.java

...in/java/org/jastadd/tooling/grammar/GrammarCommenter.java

...jastadd/tooling/grammar/GrammarCompletionContributor.java

...ain/java/org/jastadd/tooling/grammar/GrammarFileType.java

...org/jastadd/tooling/grammar/GrammarFindUsageProvider.java

...astadd/tooling/grammar/GrammarFormattingModelBuilder.java

...ava/org/jastadd/tooling/grammar/GrammarJavaAnnotator.java

...ing/grammar/GrammarLanguageCodeStyleSettingsProvider.java

...rg/jastadd/tooling/grammar/GrammarLineMarkerProvider.java

...dd/tooling/grammar/GrammarRefactoringSupportProvider.java