Removed renderTypeWithShortNames from API of DescriptorRenderer.

This commit is contained in:
Evgeny Gerashchenko
2012-12-11 22:22:16 +04:00
parent cd2e619364
commit f6e9b0e234
6 changed files with 30 additions and 32 deletions
@@ -141,8 +141,8 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
addReceiverParameter(descriptor, bodyBuilder);
bodyBuilder.append(descriptor.getName()).append(" : ").append(DescriptorRendererImpl.COMPACT_WITH_MODIFIERS.renderTypeWithShortNames(
descriptor.getType()));
bodyBuilder.append(descriptor.getName()).append(" : ").append(
DescriptorRendererImpl.SHORT_NAMES_IN_TYPES.renderType(descriptor.getType()));
String initializer = defaultInitializer(descriptor.getType(), KotlinBuiltIns.getInstance());
if (initializer != null) {
bodyBuilder.append(" = ").append(initializer);
@@ -53,17 +53,12 @@ import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUt
* @since 16 Aug 2012
*/
public class AddKotlinSignatureAnnotation extends BaseIntentionAction implements Iconable {
private static final DescriptorRendererImpl RENDERER = new DescriptorRendererImpl() {
private static final DescriptorRendererImpl RENDERER = new DescriptorRendererImpl(true) {
@Override
protected boolean shouldRenderDefinedIn() {
return false;
}
@Override
public String renderType(JetType type) {
return renderTypeWithShortNames(type);
}
@Override
protected boolean shouldRenderModifiers() {
return false;
@@ -151,7 +151,7 @@ public class JetFunctionParameterInfoHandler implements
builder.append("vararg ");
}
builder.append(descriptor.getName()).append(": ").
append(DescriptorRendererImpl.TEXT.renderTypeWithShortNames(getActualParameterType(descriptor)));
append(DescriptorRendererImpl.SHORT_NAMES_IN_TYPES.renderType(getActualParameterType(descriptor)));
if (descriptor.hasDefaultValue()) {
PsiElement element = BindingContextUtils.descriptorToDeclaration(bindingContext, descriptor);
String defaultExpression = "?";