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

[480445] Added TypeReference#guessTypeRef

Browse source 
Improved backwards compatibility.
This commit is contained in:
Sebastian Zarnekow 2015-10-22 19:02:54 +02:00
parent 25c3978d98
commit 4a2a2525e0
2 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/TypeReference.xtend
View file

@ -27,6 +27,14 @@ class TypeReference {
new TypeReference(name, arguments)
}
/**
* @deprecated this method is available for backwards compatibility reasons
*/
@Deprecated
static def TypeReference guessTypeRef(String name, TypeReference... arguments) {
new TypeReference(name, arguments, false)
}
static def TypeReference typeRef(Class<?> clazz, TypeReference... arguments) {
new TypeReference(clazz, arguments)
}
@ -49,7 +57,11 @@ class TypeReference {
}
new(String qualifiedName, List<TypeReference> arguments) {
this(getPackageName(qualifiedName), getClassName(qualifiedName), arguments)
this(qualifiedName, arguments, true)
}
private new(String qualifiedName, List<TypeReference> arguments, boolean strict) {
this(getPackageName(qualifiedName, strict), getClassName(qualifiedName, strict), arguments)
}
new(String packageName, String className) {
@ -95,18 +107,30 @@ class TypeReference {
this(getQualifiedName(epackage, resourceSet))
}
private static def getPackageName(String qualifiedName) {
private static def getPackageName(String qualifiedName, boolean strict) {
val segments = Splitter.on('.').split(qualifiedName).toList
if (segments.size == 1)
return ""
val packageSegments = segments.subList(0, segments.length -1)
if (!packageSegments.filter[Character.isUpperCase(charAt(0))].isEmpty)
throw new IllegalArgumentException("Cannot determine the package name of '" + qualifiedName + "'. Please use the TypeReference(packageName, className) constructor")
return packageSegments.join(".")
if (strict) {
val packageSegments = segments.subList(0, segments.length -1)
if (!packageSegments.filter[Character.isUpperCase(charAt(0))].isEmpty)
throw new IllegalArgumentException("Cannot determine the package name of '" + qualifiedName + "'. Please use the TypeReference(packageName, className) constructor")
return packageSegments.join(".")
} else {
var packageSegments = segments.subList(0, segments.length -1)
while(!packageSegments.isEmpty) {
if (Character.isUpperCase(packageSegments.last.charAt(0))) {
packageSegments = packageSegments.subList(0, packageSegments.length -1)
} else {
return packageSegments.join(".")
}
}
return ""
}
}
private static def getClassName(String qualifiedName) {
val packageName = qualifiedName.packageName
private static def getClassName(String qualifiedName, boolean strict) {
val packageName = qualifiedName.getPackageName(strict)
if (packageName.isEmpty)
qualifiedName
else

13
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/TypeReferenceTest.xtend
View file

@ -62,6 +62,19 @@ class TypeReferenceTest {
assertEquals(#["Map", "entry"], ref.simpleNames)
}
@Test
def void testGuessTypeRef() {
val ref = TypeReference.guessTypeRef("java.util.Map.Entry")
assertEquals("java.util", ref.packageName)
assertEquals("Entry", ref.simpleName)
assertEquals(#["Map", "Entry"], ref.simpleNames)
}
@Test(expected=IllegalArgumentException)
def void testIllegalTypeRef() {
TypeReference.typeRef("java.util.Map.Entry")
}
@Test
def void testJavaPath() {
val ref = "org.example.MyType".typeRef