descriptor name cannot be empty string

* add assertion
* fix tests
* #KT-1748 Fixed
This commit is contained in:
Stepan Koltsov
2012-04-09 22:31:40 +04:00
parent 5ec31b8cdc
commit abfd03cae3
10 changed files with 69 additions and 43 deletions
@@ -263,6 +263,14 @@ public class JetTypeMapper {
return getFQName(descriptor.getContainingDeclaration());
}
if (descriptor.getContainingDeclaration() instanceof ModuleDescriptor) {
return "";
}
if (descriptor instanceof ModuleDescriptor) {
throw new IllegalStateException("missed something");
}
DeclarationDescriptor container = descriptor.getContainingDeclaration();
String name = descriptor.getName();
if(JetPsiUtil.NO_NAME_PROVIDED.equals(name)) {
@@ -271,12 +279,6 @@ public class JetTypeMapper {
if(name.contains("/"))
return name;
if (container != null) {
if (container.getContainingDeclaration() instanceof ModuleDescriptor) {
return name;
}
if (container instanceof ModuleDescriptor) {
throw new IllegalStateException("missed something");
}
String baseName = getFQName(container);
if (!baseName.isEmpty()) {
return baseName + (container instanceof NamespaceDescriptor ? "/" : "$") + name;