From 307bd2b313ccd7621fca1741a64eba28d859875e Mon Sep 17 00:00:00 2001 From: Jan Koehnlein Date: Mon, 2 Oct 2017 15:18:48 +0200 Subject: [PATCH] [generator] allow inner classes to be bound by fragments --- .../org/eclipse/xtext/xtext/generator/model/TypeReference.xtend | 2 +- .../org/eclipse/xtext/xtext/generator/model/TypeReference.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend index c895c8363..42ccbcad6 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend @@ -75,7 +75,7 @@ class TypeReference { if (className === null) throw new IllegalArgumentException('Invalid class name: ' + className) this.packageName = packageName - this.simpleNames = className.split('\\.') + this.simpleNames = className.split('(\\.|\\$)') this.typeArguments = arguments ?: Collections.emptyList } diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/TypeReference.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/TypeReference.java index be543410b..ced2ffdb1 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/TypeReference.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/TypeReference.java @@ -110,7 +110,7 @@ public class TypeReference { throw new IllegalArgumentException(("Invalid class name: " + className)); } this.packageName = packageName; - this.simpleNames = ((List)Conversions.doWrapArray(className.split("\\."))); + this.simpleNames = ((List)Conversions.doWrapArray(className.split("(\\.|\\$)"))); List _elvis = null; if (arguments != null) { _elvis = arguments;