summaryrefslogtreecommitdiffstats
authorSebastian Zarnekow2011-02-15 07:53:18 (EST)
committer Holger Schill2011-02-15 09:33:35 (EST)
commit69452b707999d35d04d656d085b216a7312d3df7 (patch) (side-by-side diff)
treef4aeaf6999f322d67f4ba2952cabb416bdcff15e
parent39a7e8e2e2134ce720eb5668cf6c77f8485170af (diff)
downloadorg.eclipse.xtend-69452b707999d35d04d656d085b216a7312d3df7.zip
org.eclipse.xtend-69452b707999d35d04d656d085b216a7312d3df7.tar.gz
org.eclipse.xtend-69452b707999d35d04d656d085b216a7312d3df7.tar.bz2
[xtend2] Do not try to infer JVM elements for incomplete Xtend2 elements (class or member without a name)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/JvmModelInferrer.java3
-rw-r--r--plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/Xtend2LazyLinker.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/JvmModelInferrer.java b/plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/JvmModelInferrer.java
index 14aab18..3db0c76 100644
--- a/plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/JvmModelInferrer.java
+++ b/plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/JvmModelInferrer.java
@@ -87,7 +87,8 @@ public class JvmModelInferrer {
for (JvmTypeParameter typeParameter : source.getTypeParameters())
target.getTypeParameters().add(cloneWithProxies(typeParameter));
for (XtendMember member : source.getMembers())
- target.getMembers().add(transform(member));
+ if (member.getName() != null)
+ target.getMembers().add(transform(member));
appendSyntheticDispatchMethods(source, target);
computeInferredReturnTypes(target);
return target;
diff --git a/plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/Xtend2LazyLinker.java b/plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/Xtend2LazyLinker.java
index a1776f4..9e13fc8 100644
--- a/plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/Xtend2LazyLinker.java
+++ b/plugins/org.eclipse.xtext.xtend2/src/org/eclipse/xtext/xtend2/linking/Xtend2LazyLinker.java
@@ -48,7 +48,7 @@ public class Xtend2LazyLinker extends LazyLinker {
protected void afterModelLinked(EObject model, IDiagnosticConsumer diagnosticsConsumer) {
super.afterModelLinked(model, diagnosticsConsumer);
XtendClass xtendClass = getXtendClass(model);
- if (xtendClass != null) {
+ if (xtendClass != null && xtendClass.getName() != null) {
jvmModelInferrer.inferJvmGenericType(xtendClass);
}
}