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

Use render with short types names in completion lookup elements

Browse Source
This commit is contained in:
Nikolay Krasko
2014-04-16 15:57:46 +04:00
parent f6276cc10b
commit 962044f887
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java
+10 -9
View File
@@ -64,39 +64,38 @@ public final class DescriptorLookupConverter {
String presentableText = descriptor.getName().asString(); String presentableText = descriptor.getName().asString();
String typeText = ""; String typeText = "";
String tailText = ""; String tailText = "";
boolean tailTextGrayed = true;
if (descriptor instanceof FunctionDescriptor) { if (descriptor instanceof FunctionDescriptor) {
FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor; FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor;
JetType returnType = functionDescriptor.getReturnType(); JetType returnType = functionDescriptor.getReturnType();
typeText = DescriptorRenderer.TEXT.renderType(returnType); typeText = returnType != null ? DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(returnType) : "";
presentableText += DescriptorRenderer.TEXT.renderFunctionParameters(functionDescriptor); presentableText += DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderFunctionParameters(functionDescriptor);
boolean extensionFunction = functionDescriptor.getReceiverParameter() != null; boolean extensionFunction = functionDescriptor.getReceiverParameter() != null;
DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
if (containingDeclaration != null && extensionFunction) { if (containingDeclaration != null && extensionFunction) {
tailText += " for " + DescriptorRenderer.TEXT.renderType(functionDescriptor.getReceiverParameter().getType()); tailText += " for " + DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(functionDescriptor.getReceiverParameter().getType());
tailText += " in " + DescriptorUtils.getFqName(containingDeclaration); tailText += " in " + DescriptorUtils.getFqName(containingDeclaration);
} }
} }
else if (descriptor instanceof VariableDescriptor) { else if (descriptor instanceof VariableDescriptor) {
JetType outType = ((VariableDescriptor) descriptor).getType(); JetType outType = ((VariableDescriptor) descriptor).getType();
typeText = DescriptorRenderer.TEXT.renderType(outType); typeText = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(outType);
} }
else if (descriptor instanceof ClassDescriptor) { else if (descriptor instanceof ClassDescriptor) {
DeclarationDescriptor declaredIn = descriptor.getContainingDeclaration(); DeclarationDescriptor declaredIn = descriptor.getContainingDeclaration();
assert declaredIn != null; assert declaredIn != null;
tailText = " (" + DescriptorUtils.getFqName(declaredIn) + ")"; tailText = " (" + DescriptorUtils.getFqName(declaredIn) + ")";
tailTextGrayed = true;
} }
else { else {
typeText = DescriptorRenderer.TEXT.render(descriptor); typeText = DescriptorRenderer.SHORT_NAMES_IN_TYPES.render(descriptor);
} }
element = element.withInsertHandler(getInsertHandler(descriptor)); element = element.withInsertHandler(getInsertHandler(descriptor));
element = element.withTailText(tailText, tailTextGrayed).withTypeText(typeText).withPresentableText(presentableText); element = element.withTailText(tailText, true).withTypeText(typeText).withPresentableText(presentableText);
element = element.withIcon(JetDescriptorIconProvider.getIcon(descriptor, Iconable.ICON_FLAG_VISIBILITY)); element = element.withIcon(JetDescriptorIconProvider.getIcon(descriptor, Iconable.ICON_FLAG_VISIBILITY));
element = element.withStrikeoutness(KotlinBuiltIns.getInstance().isDeprecated(descriptor)); element = element.withStrikeoutness(KotlinBuiltIns.getInstance().isDeprecated(descriptor));
return element; return element;
} }
@@ -138,7 +137,9 @@ public final class DescriptorLookupConverter {
if (containingClass != null && !JavaResolverPsiUtils.isCompiledKotlinClassOrPackageClass(containingClass)) { if (containingClass != null && !JavaResolverPsiUtils.isCompiledKotlinClassOrPackageClass(containingClass)) {
if (declaration instanceof PsiMethod) { if (declaration instanceof PsiMethod) {
InsertHandler<LookupElement> handler = getInsertHandler(descriptor); InsertHandler<LookupElement> handler = getInsertHandler(descriptor);
assert handler != null: "Special kotlin handler is expected for function: " + declaration.getText() + " and descriptor" + DescriptorRenderer.TEXT.render(descriptor); assert handler != null:
"Special kotlin handler is expected for function: " + declaration.getText() +
" and descriptor: " + DescriptorRenderer.TEXT.render(descriptor);
return new JavaMethodCallElementWithCustomHandler(declaration).setInsertHandler(handler); return new JavaMethodCallElementWithCustomHandler(declaration).setInsertHandler(handler);
} }
idea/testData/completion/basic/common/FunctionCompletionFormatting.kt
+1 -1
View File
@@ -4,4 +4,4 @@ fun some() {
tes<caret> tes<caret>
} }
// EXIST: { lookupString:"test", itemText:"test(a: kotlin.Int)" } // EXIST: { lookupString:"test", itemText:"test(a: Int)" }
idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt
+1 -1
View File
@@ -8,5 +8,5 @@ fun firstFun() {
} }
// INVOCATION_COUNT: 1 // INVOCATION_COUNT: 1
// EXIST: { lookupString:"toLinkedList", itemText:"toLinkedList()", tailText:" for kotlin.Iterable<T> in kotlin" } // EXIST: { lookupString:"toLinkedList", itemText:"toLinkedList()", tailText:" for Iterable<T> in kotlin" }
// NUMBER: 1 // NUMBER: 1
idea/testData/completion/smart/ClassObjectMembers.kt
+2 -2
View File
@@ -14,8 +14,8 @@ fun foo(){
val k : K = <caret> val k : K = <caret>
} }
// EXIST: { lookupString:"K.foo", itemText:"K.foo", tailText:" (sample)", typeText:"sample.K" } // EXIST: { lookupString:"K.foo", itemText:"K.foo", tailText:" (sample)", typeText:"K" }
// EXIST: { lookupString:"K.bar", itemText:"K.bar()", tailText:" (sample)", typeText:"sample.K" } // EXIST: { lookupString:"K.bar", itemText:"K.bar()", tailText:" (sample)", typeText:"K" }
// ABSENT: K.x // ABSENT: K.x
// ABSENT: K.kk // ABSENT: K.kk
// ABSENT: K.privateVal // ABSENT: K.privateVal
idea/testData/completion/smart/ClassObjectMembersForNullable.kt
+3 -3
View File
@@ -13,7 +13,7 @@ fun foo(){
val k : K? = <caret> val k : K? = <caret>
} }
// EXIST: { lookupString:"K.foo", itemText:"K.foo", tailText:" (sample)", typeText:"sample.K" } // EXIST: { lookupString:"K.foo", itemText:"K.foo", tailText:" (sample)", typeText:"K" }
// EXIST: { lookupString:"K.bar", itemText:"K.bar()", tailText:" (sample)", typeText:"sample.K" } // EXIST: { lookupString:"K.bar", itemText:"K.bar()", tailText:" (sample)", typeText:"K" }
// ABSENT: K.x // ABSENT: K.x
// EXIST: { lookupString:"K.kk", itemText:"K.kk", tailText:" (sample)", typeText:"sample.K?" } // EXIST: { lookupString:"K.kk", itemText:"K.kk", tailText:" (sample)", typeText:"K?" }