From 76c5f1f5247ecc5cb39a868c1005a89b30752905 Mon Sep 17 00:00:00 2001 From: Jan Koehnlein Date: Tue, 2 Aug 2016 10:08:30 +0200 Subject: [PATCH] [generator] Provider bindings cannot be overridden #63 --- .../xtext/xtext/generator/XtextGeneratorTemplates.xtend | 2 +- .../xtext/xtext/generator/XtextGeneratorTemplates.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend index 6daaf1ced..d9774ec97 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend @@ -155,7 +155,7 @@ class XtextGeneratorTemplates { «ELSEIF value.statements.isEmpty» // contributed by «contributedBy» «IF key.singleton»@«SingletonBinding»«IF key.eagerSingleton»(eager=true)«ENDIF»«ENDIF» - public «IF value.expression==null»Class>«ELSE»«Provider»<«key.type»>«ENDIF» «bindMethodName»() { + public «IF value.expression==null»Class>«ELSE»«Provider»«ENDIF» «bindMethodName»() { return «IF value.expression!=null»«value.expression»«ELSE»«value.type».class«ENDIF»; } «ELSE» diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.java index 84a22b18f..7f4279eac 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.java @@ -490,14 +490,14 @@ public class XtextGeneratorTemplates { if (_equals) { _builder.append("Class>"); } else { _builder.append(Provider.class, ""); - _builder.append("<"); + _builder.append("