Smart completion: no fq-names in types

This commit is contained in:
Valentin Kipyatkov
2014-04-18 22:46:38 +04:00
parent 4968377969
commit 28e0f3013b
9 changed files with 12 additions and 12 deletions
@@ -104,7 +104,7 @@ class StaticMembers(val bindingContext: BindingContext, val resolveSession: Reso
}
if (presentation.getTypeText().isNullOrEmpty()) {
presentation.setTypeText(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(classDescriptor.getDefaultType()))
presentation.setTypeText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(classDescriptor.getDefaultType()))
}
}
@@ -33,7 +33,7 @@ class ThisItems(val bindingContext: BindingContext) {
//val expressionText = if (i == 0) "this" else "this@" + (thisQualifierName(receiver, bindingContext) ?: continue)
val qualifier = if (i == 0) null else thisQualifierName(receiver) ?: continue
val expressionText = if (qualifier == null) "this" else "this@" + qualifier
val lookupElement = LookupElementBuilder.create(expressionText).withTypeText(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(thisType))
val lookupElement = LookupElementBuilder.create(expressionText).withTypeText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(thisType))
collection.add(addTailToLookupElement(lookupElement, matchedExpectedInfos))
}
}
@@ -42,7 +42,7 @@ class TypeInstantiationItems(val bindingContext: BindingContext, val resolveSess
var lookupString = lookupElement.getLookupString()
val typeArgs = jetType.getArguments()
var itemText = lookupString + DescriptorRenderer.FQNAMES_IN_TYPES.renderTypeArguments(typeArgs)
var itemText = lookupString + DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderTypeArguments(typeArgs)
val insertHandler: InsertHandler<LookupElement>
val typeText = DescriptorUtils.getFqName(classifier).toString() + DescriptorRenderer.SOURCE_CODE.renderTypeArguments(typeArgs)