From 653009124b1cb9dbfa7dae0e5b17e7fb43768a54 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Tue, 6 Oct 2015 15:03:33 +0200 Subject: [PATCH] [xtext generator] changed hardcoded validator name to grammar dependent one in QuickfixProvider stub template, according to review suggestion Signed-off-by: Christian Schneider --- .../generator/ui/quickfix/QuickfixProviderFragment2.xtend | 8 ++++++-- .../xtext/generator/validation/ValidatorFragment2.xtend | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend index 715336d15..e017f0a04 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend @@ -16,6 +16,7 @@ import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming import org.eclipse.xtext.xtext.generator.model.FileAccessFactory import org.eclipse.xtext.xtext.generator.model.GuiceModuleAccess import org.eclipse.xtext.xtext.generator.model.TypeReference +import org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2 import static extension org.eclipse.xtext.xtext.generator.util.GrammarUtil2.* @@ -31,6 +32,9 @@ class QuickfixProviderFragment2 extends AbstractGeneratorFragment2 { @Inject extension CodeConfig + + @Inject + extension ValidatorFragment2 @Inject FileAccessFactory fileAccessFactory @@ -102,7 +106,7 @@ class QuickfixProviderFragment2 extends AbstractGeneratorFragment2 { */ class «grammar.quickfixProviderClass.simpleName» extends «grammar.quickfixProviderSuperClass» { - // @Fix(MyDslValidator.INVALID_NAME) + // @Fix(«grammar.validatorClass».INVALID_NAME) // def capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) { // acceptor.accept(issue, 'Capitalize name', 'Capitalize the name.', 'upcase.png') [ // context | @@ -124,7 +128,7 @@ class QuickfixProviderFragment2 extends AbstractGeneratorFragment2 { */ public class «grammar.quickfixProviderClass.simpleName» extends «grammar.quickfixProviderSuperClass» { - // @Fix(MyJavaValidator.INVALID_NAME) + // @Fix(«grammar.validatorClass».INVALID_NAME) // public void capitalizeName(final Issue issue, IssueResolutionAcceptor acceptor) { // acceptor.accept(issue, "Capitalize name", "Capitalize the name.", "upcase.png", new IModification() { // public void apply(IModificationContext context) throws BadLocationException { diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorFragment2.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorFragment2.xtend index 85374e870..e39608c6c 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorFragment2.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorFragment2.xtend @@ -52,7 +52,11 @@ class ValidatorFragment2 extends AbstractGeneratorFragment2 { composedChecks += composedCheckValidator } - protected def TypeReference getValidatorClass(Grammar grammar) { + /** + * @return a {@link TypeReference} wrapping the desired validator class' simple name and package name + */ + public def TypeReference getValidatorClass(Grammar grammar) { + // is public for being callable by QuickFixProviderFragement2 new TypeReference(grammar.runtimeBasePackage + '.validation.' + getSimpleName(grammar) + 'Validator') }