azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Smart completion: minor code editing

Browse Source
This commit is contained in:
Valentin Kipyatkov
2013-12-16 21:10:29 +04:00
parent f22ba73a92
commit 5e20f509b7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt
+12 -6
View File
@@ -80,7 +80,7 @@ fun buildSmartCompletionData(expression: JetSimpleNameExpression, resolveSession
return returnType.toList()
}
else if (descriptor is ClassDescriptor && descriptor.getKind() == ClassKind.ENUM_ENTRY) {
return descriptor.getDefaultType().toList()
return listOf(descriptor.getDefaultType())
}
else {
return listOf()
@@ -251,10 +251,11 @@ private fun staticMembers(context: JetExpression, expectedType: JetType, resolve
val descriptors = ArrayList<DeclarationDescriptor>()
val isSuitableCallable: (DeclarationDescriptor) -> Boolean = { it is CallableDescriptor && it.getReturnType()?.let { JetTypeChecker.INSTANCE.isSubtypeOf(it, expectedType) } ?: false }
val isSuitableCallable: (DeclarationDescriptor) -> Boolean = {
it is CallableDescriptor && it.getReturnType()?.let { JetTypeChecker.INSTANCE.isSubtypeOf(it, expectedType) } ?: false
}
if (classDescriptor is JavaClassDescriptor) {
//TODO: shouldn't we have special util to obtain this pseudo package?
val container = classDescriptor.getContainingDeclaration() //TODO: nested classes!
if (container is NamespaceDescriptor) {
val pseudoPackage: NamespaceDescriptor? = container.getMemberScope().getNamespace(classDescriptor.getName())
@@ -271,7 +272,7 @@ private fun staticMembers(context: JetExpression, expectedType: JetType, resolve
if (classDescriptor.getKind() == ClassKind.ENUM_CLASS) {
classDescriptor.getDefaultType().getMemberScope().getAllDescriptors()
.filterTo(descriptors) { it is ClassDescriptor && it.getKind() == ClassKind.ENUM_ENTRY && JetTypeChecker.INSTANCE.isSubtypeOf(it.getDefaultType(), expectedType) }
.filterTo(descriptors) { it is ClassDescriptor && it.getKind() == ClassKind.ENUM_ENTRY }
}
return descriptors
@@ -284,7 +285,10 @@ private fun staticMembers(context: JetExpression, expectedType: JetType, resolve
.withIcon(presentation.getIcon())
.withStrikeoutness(presentation.isStrikeout())
.withTailText(" (" + DescriptorUtils.getFQName(classDescriptor.getContainingDeclaration()) + ")")
.withTypeText(if (presentation.getTypeText() != "") presentation.getTypeText() else DescriptorRenderer.TEXT.renderType(classDescriptor.getDefaultType()))
.withTypeText(if (!presentation.getTypeText().isNullOrEmpty())
presentation.getTypeText()
else
DescriptorRenderer.TEXT.renderType(classDescriptor.getDefaultType()))
if (it is FunctionDescriptor) {
builder = builder.withPresentableText(builder.getLookupString() + "()")
val caretPosition = if (it.getValueParameters().empty) CaretPosition.AFTER_BRACKETS else CaretPosition.IN_BRACKETS
@@ -300,4 +304,6 @@ private fun <T> MutableCollection<T>.addAll(iterator: Iterator<T>) {
for (item in iterator) {
add(item)
}
}
}
private fun String?.isNullOrEmpty() = this == null || this.isEmpty()