sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[xtext generator] changed hardcoded validator name to grammar dependent one in QuickfixProvider stub template, according to review suggestion

Browse source 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
This commit is contained in:
Christian Schneider 2015-10-06 15:03:33 +02:00
parent d9342e1c5e
commit 653009124b
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend
View file

@ -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 {

6
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/validation/ValidatorFragment2.xtend
View file

@ -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')
}