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

Rendering fixed across the idea module

Browse Source
This commit is contained in:
Andrey Breslav
2014-10-13 14:56:34 +04:00
parent 9fb09e62af
commit e76df4db11
19 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java
+2 -2
View File
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -131,7 +131,7 @@ public class MoveDeclarationsOutHelper {
typeString = typeRef.getText(); typeString = typeRef.getText();
} }
else if (!propertyType.isError()) { else if (!propertyType.isError()) {
typeString = DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(propertyType); typeString = IdeDescriptorRenderers.SOURCE_CODE.renderType(propertyType);
} }
return JetPsiFactory(property).createProperty(property.getName(), typeString, property.isVar(), initializer); return JetPsiFactory(property).createProperty(property.getName(), typeString, property.isVar(), initializer);
idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt
+1 -1
View File
@@ -74,7 +74,7 @@ fun insertLambdaTemplate(context: InsertionContext, placeholderRange: TextRange,
fun buildLambdaPresentation(lambdaType: JetType): String { fun buildLambdaPresentation(lambdaType: JetType): String {
val parameterTypes = functionParameterTypes(lambdaType) val parameterTypes = functionParameterTypes(lambdaType)
val parametersPresentation = parameterTypes.map { DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(it) }.makeString(", ") val parametersPresentation = parameterTypes.map { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) }.makeString(", ")
fun wrap(s: String) = if (parameterTypes.size != 1) "($s)" else s fun wrap(s: String) = if (parameterTypes.size != 1) "($s)" else s
return "{ ${wrap(parametersPresentation)} -> ... }" return "{ ${wrap(parametersPresentation)} -> ... }"
} }
idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt
+2 -2
View File
@@ -21,10 +21,10 @@ import org.jetbrains.jet.lang.psi.JetCallExpression
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache
import org.jetbrains.jet.lang.psi.JetPsiFactory import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.types.ErrorUtils import org.jetbrains.jet.lang.types.ErrorUtils
import org.jetbrains.jet.renderer.DescriptorRenderer
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.jet.lang.psi.JetTypeArgumentList import org.jetbrains.jet.lang.psi.JetTypeArgumentList
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
public class InsertExplicitTypeArguments : JetSelfTargetingIntention<JetCallExpression>( public class InsertExplicitTypeArguments : JetSelfTargetingIntention<JetCallExpression>(
"insert.explicit.type.arguments", javaClass()) { "insert.explicit.type.arguments", javaClass()) {
@@ -71,7 +71,7 @@ public class InsertExplicitTypeArguments : JetSelfTargetingIntention<JetCallExpr
val psiFactory = JetPsiFactory(element) val psiFactory = JetPsiFactory(element)
val typeArgs = types.map { val typeArgs = types.map {
assert(args[it] != null, "there is a null in the type arguments to transform") assert(args[it] != null, "there is a null in the type arguments to transform")
DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(args[it]!!) IdeDescriptorRenderers.SOURCE_CODE.renderType(args[it]!!)
}.joinToString(", ", "<", ">") }.joinToString(", ", "<", ">")
return psiFactory.createTypeArguments(typeArgs) return psiFactory.createTypeArguments(typeArgs)
idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
+2 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRenderer;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
@@ -73,7 +74,7 @@ public class DeclarationUtils {
JetType inferredType = getPropertyTypeIfNeeded(property); JetType inferredType = getPropertyTypeIfNeeded(property);
String typeStr = inferredType != null String typeStr = inferredType != null
? DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(inferredType) ? IdeDescriptorRenderers.SOURCE_CODE.renderType(inferredType)
: JetPsiUtil.getNullableText(property.getTypeReference()); : JetPsiUtil.getNullableText(property.getTypeReference());
//noinspection ConstantConditions //noinspection ConstantConditions
idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java
+2
View File
@@ -44,6 +44,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.plugin.JetIcons;
import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension; import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension;
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.renderer.DescriptorRendererBuilder; import org.jetbrains.jet.renderer.DescriptorRendererBuilder;
@@ -53,6 +54,7 @@ import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_SIGN
public class KotlinSignatureAnnotationIntention extends BaseIntentionAction implements Iconable { public class KotlinSignatureAnnotationIntention extends BaseIntentionAction implements Iconable {
private static final DescriptorRenderer RENDERER = new DescriptorRendererBuilder() private static final DescriptorRenderer RENDERER = new DescriptorRendererBuilder()
.setTypeNormalizer(IdeDescriptorRenderers.APPROXIMATE_FLEXIBLE_TYPES)
.setShortNames(true) .setShortNames(true)
.setModifiers() .setModifiers()
.setWithDefinedIn(false).build(); .setWithDefinedIn(false).build();
idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
+3 -3
View File
@@ -36,12 +36,12 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator;
import org.jetbrains.jet.plugin.refactoring.JetNameValidator; import org.jetbrains.jet.plugin.refactoring.JetNameValidator;
import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator;
import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureConfiguration; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureConfiguration;
import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureData; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureData;
import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@@ -129,7 +129,7 @@ public class AddFunctionParametersFix extends ChangeFunctionSignatureFix {
JetType parameterType = parameters.get(i).getType(); JetType parameterType = parameters.get(i).getType();
if (argumentType != null && !JetTypeChecker.DEFAULT.isSubtypeOf(argumentType, parameterType)) if (argumentType != null && !JetTypeChecker.DEFAULT.isSubtypeOf(argumentType, parameterType))
changeSignatureData.getParameters().get(i).setTypeText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(argumentType)); changeSignatureData.getParameters().get(i).setTypeText(IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(argumentType));
} }
else { else {
JetParameterInfo parameterInfo = getNewParameterInfo(bindingContext, argument, validator); JetParameterInfo parameterInfo = getNewParameterInfo(bindingContext, argument, validator);
idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java
+2 -2
View File
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
@@ -43,7 +43,7 @@ public class CastExpressionFix extends JetIntentionAction<JetExpression> {
public CastExpressionFix(@NotNull JetExpression element, @NotNull JetType type) { public CastExpressionFix(@NotNull JetExpression element, @NotNull JetType type) {
super(element); super(element);
this.type = type; this.type = type;
renderedType = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(type); renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type);
} }
@NotNull @NotNull
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
@@ -44,7 +44,7 @@ public class ChangeAccessorTypeFix extends JetIntentionAction<JetPropertyAccesso
if (property == null) return false; if (property == null) return false;
JetType type = QuickFixUtil.getDeclarationReturnType(property); JetType type = QuickFixUtil.getDeclarationReturnType(property);
if (super.isAvailable(project, editor, file) && type != null && !type.isError()) { if (super.isAvailable(project, editor, file) && type != null && !type.isError()) {
renderedType = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(type); renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type);
return true; return true;
} }
return false; return false;
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java
+2 -2
View File
@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@@ -52,7 +52,7 @@ public class ChangeFunctionLiteralReturnTypeFix extends JetIntentionAction<JetFu
public ChangeFunctionLiteralReturnTypeFix(@NotNull JetFunctionLiteralExpression functionLiteralExpression, @NotNull JetType type) { public ChangeFunctionLiteralReturnTypeFix(@NotNull JetFunctionLiteralExpression functionLiteralExpression, @NotNull JetType type) {
super(functionLiteralExpression); super(functionLiteralExpression);
renderedType = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(type); renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type);
functionLiteralReturnTypeRef = functionLiteralExpression.getFunctionLiteral().getTypeReference(); functionLiteralReturnTypeRef = functionLiteralExpression.getFunctionLiteral().getTypeReference();
BindingContext context = ResolvePackage.getBindingContext(functionLiteralExpression.getContainingJetFile()); BindingContext context = ResolvePackage.getBindingContext(functionLiteralExpression.getContainingJetFile());
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
+2 -2
View File
@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@@ -58,7 +58,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction<JetFunction>
public ChangeFunctionReturnTypeFix(@NotNull JetFunction element, @NotNull JetType type) { public ChangeFunctionReturnTypeFix(@NotNull JetFunction element, @NotNull JetType type) {
super(element); super(element);
this.type = type; this.type = type;
renderedType = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(type); renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type);
if (element instanceof JetFunctionLiteral) { if (element instanceof JetFunctionLiteral) {
JetFunctionLiteralExpression functionLiteralExpression = PsiTreeUtil.getParentOfType(element, JetFunctionLiteralExpression.class); JetFunctionLiteralExpression functionLiteralExpression = PsiTreeUtil.getParentOfType(element, JetFunctionLiteralExpression.class);
assert functionLiteralExpression != null : "FunctionLiteral outside any FunctionLiteralExpression"; assert functionLiteralExpression != null : "FunctionLiteral outside any FunctionLiteralExpression";
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java
+1
View File
@@ -62,6 +62,7 @@ import java.util.*;
*/ */
public class ChangeMemberFunctionSignatureFix extends JetHintAction<JetNamedFunction> { public class ChangeMemberFunctionSignatureFix extends JetHintAction<JetNamedFunction> {
private static final DescriptorRenderer SIGNATURE_RENDERER = new DescriptorRendererBuilder() private static final DescriptorRenderer SIGNATURE_RENDERER = new DescriptorRendererBuilder()
.setTypeNormalizer(IdeDescriptorRenderers.APPROXIMATE_FLEXIBLE_TYPES)
.setWithDefinedIn(false) .setWithDefinedIn(false)
.setModifiers() .setModifiers()
.setShortNames(true) .setShortNames(true)
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java
+6 -3
View File
@@ -22,11 +22,14 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException; import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetNamedDeclaration;
import org.jetbrains.jet.lang.psi.JetParameter;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
@@ -37,7 +40,7 @@ public class ChangeParameterTypeFix extends JetIntentionAction<JetParameter> {
public ChangeParameterTypeFix(@NotNull JetParameter element, @NotNull JetType type) { public ChangeParameterTypeFix(@NotNull JetParameter element, @NotNull JetType type) {
super(element); super(element);
renderedType = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(type); renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type);
JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetNamedDeclaration.class); JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetNamedDeclaration.class);
isPrimaryConstructorParameter = declaration instanceof JetClass; isPrimaryConstructorParameter = declaration instanceof JetClass;
FqName declarationFQName = declaration == null ? null : declaration.getFqName(); FqName declarationFQName = declaration == null ? null : declaration.getFqName();
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java
+2 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.psi.JetParameter;
import org.jetbrains.jet.lang.psi.JetTypeReference; import org.jetbrains.jet.lang.psi.JetTypeReference;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRenderer;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
@@ -39,7 +40,7 @@ public class ChangeTypeFix extends JetIntentionAction<JetTypeReference> {
public ChangeTypeFix(@NotNull JetTypeReference element, JetType type) { public ChangeTypeFix(@NotNull JetTypeReference element, JetType type) {
super(element); super(element);
renderedType = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(type); renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type);
} }
@NotNull @NotNull
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
+2 -1
View File
@@ -39,6 +39,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.LinkedList; import java.util.LinkedList;
@@ -54,7 +55,7 @@ public class ChangeVariableTypeFix extends JetIntentionAction<JetVariableDeclara
public ChangeVariableTypeFix(@NotNull JetVariableDeclaration element, @NotNull JetType type) { public ChangeVariableTypeFix(@NotNull JetVariableDeclaration element, @NotNull JetType type) {
super(element); super(element);
renderedType = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(type); renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type);
this.type = type; this.type = type;
} }
idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java
+2 -1
View File
@@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil; import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.ArrayList; import java.util.ArrayList;
@@ -206,6 +207,6 @@ public final class JetChangeSignatureData implements JetMethodDescriptor {
@Nullable @Nullable
public String getReturnTypeText() { public String getReturnTypeText() {
JetType returnType = baseDescriptor.getReturnType(); JetType returnType = baseDescriptor.getReturnType();
return returnType != null ? DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(returnType) : null; return returnType != null ? IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(returnType) : null;
} }
} }
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt
+3 -7
View File
@@ -36,12 +36,9 @@ import java.util.Collections
import org.jetbrains.jet.lang.psi.psiUtil.isFunctionLiteralOutsideParentheses import org.jetbrains.jet.lang.psi.psiUtil.isFunctionLiteralOutsideParentheses
import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.jet.lang.psi.JetFunctionLiteralArgument import org.jetbrains.jet.lang.psi.JetFunctionLiteralArgument
import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.plugin.util.psiModificationUtil.moveInsideParenthesesAndReplaceWith import org.jetbrains.jet.plugin.util.psiModificationUtil.moveInsideParenthesesAndReplaceWith
import org.jetbrains.jet.lang.psi.psiUtil.prependElement
import org.jetbrains.jet.lang.psi.psiUtil.appendElement import org.jetbrains.jet.lang.psi.psiUtil.appendElement
import org.jetbrains.jet.lang.psi.psiUtil.replaced import org.jetbrains.jet.lang.psi.psiUtil.replaced
import org.jetbrains.jet.plugin.intentions.declarations.DeclarationUtils
import org.jetbrains.jet.lang.psi.JetBlockExpression import org.jetbrains.jet.lang.psi.JetBlockExpression
import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ParameterUpdate import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ParameterUpdate
import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Jump import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Jump
@@ -54,19 +51,18 @@ import org.jetbrains.jet.plugin.refactoring.isMultiLine
import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValueBoxer.AsTuple import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValueBoxer.AsTuple
import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier
import org.jetbrains.jet.plugin.util.psi.patternMatching.UnifierParameter import org.jetbrains.jet.plugin.util.psi.patternMatching.UnifierParameter
import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange
import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult
import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Match import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Match
import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.Status
import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.WeaklyMatched import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.WeaklyMatched
import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.StronglyMatched import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.StronglyMatched
import org.jetbrains.jet.lang.psi.JetDeclarationWithBody
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
fun ExtractableCodeDescriptor.getDeclarationText( fun ExtractableCodeDescriptor.getDeclarationText(
options: ExtractionGeneratorOptions = ExtractionGeneratorOptions.DEFAULT, options: ExtractionGeneratorOptions = ExtractionGeneratorOptions.DEFAULT,
withBody: Boolean = true, withBody: Boolean = true,
descriptorRenderer: DescriptorRenderer = DescriptorRenderer.FQ_NAMES_IN_TYPES descriptorRenderer: DescriptorRenderer = IdeDescriptorRenderers.SOURCE_CODE
): String { ): String {
if (!canGenerateProperty() && options.extractAsProperty) { if (!canGenerateProperty() && options.extractAsProperty) {
throw IllegalArgumentException("Can't generate property: ${extractionData.getCodeFragmentText()}") throw IllegalArgumentException("Can't generate property: ${extractionData.getCodeFragmentText()}")
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinParameterTablePanel.java
+3 -3
View File
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.refactoring.JetNameSuggester; import org.jetbrains.jet.plugin.refactoring.JetNameSuggester;
import org.jetbrains.jet.plugin.refactoring.extractFunction.Parameter; import org.jetbrains.jet.plugin.refactoring.extractFunction.Parameter;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import javax.swing.*; import javax.swing.*;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
@@ -148,7 +148,7 @@ public class KotlinParameterTablePanel extends JPanel {
public Component getTableCellRendererComponent( public Component getTableCellRendererComponent(
@NotNull JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column @NotNull JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column
) { ) {
myLabel.setText(String.valueOf(value)); myLabel.setText(IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType((JetType) value));
myLabel.setBackground(isSelected ? table.getSelectionBackground() : table.getBackground()); myLabel.setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());
myLabel.setForeground(isSelected ? table.getSelectionForeground() : table.getForeground()); myLabel.setForeground(isSelected ? table.getSelectionForeground() : table.getForeground());
if (isSelected) { if (isSelected) {
@@ -181,7 +181,7 @@ public class KotlinParameterTablePanel extends JPanel {
myEditorComponent.setToString(new Function<Object, String>() { myEditorComponent.setToString(new Function<Object, String>() {
@Override @Override
public String fun(Object o) { public String fun(Object o) {
return DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType((JetType) o); return IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType((JetType) o);
} }
}); });
idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java
+1 -1
View File
@@ -241,7 +241,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
return StringUtil.join(fun.getValueParameters(), new Function<ValueParameterDescriptor, String>() { return StringUtil.join(fun.getValueParameters(), new Function<ValueParameterDescriptor, String>() {
@Override @Override
public String fun(ValueParameterDescriptor descriptor) { public String fun(ValueParameterDescriptor descriptor) {
return descriptor.getName() + ": " + DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(descriptor.getType()); return descriptor.getName() + ": " + IdeDescriptorRenderers.SOURCE_CODE.renderType(descriptor.getType());
} }
}, ", "); }, ", ");
} }
idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
+2 -1
View File
@@ -57,6 +57,7 @@ import org.jetbrains.jet.plugin.refactoring.JetNameValidatorImpl;
import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle;
import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
import org.jetbrains.jet.plugin.refactoring.introduce.KotlinIntroduceHandlerBase; import org.jetbrains.jet.plugin.refactoring.introduce.KotlinIntroduceHandlerBase;
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange; import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange;
import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier; import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier;
import org.jetbrains.jet.plugin.util.psi.patternMatching.PatternMatchingPackage; import org.jetbrains.jet.plugin.util.psi.patternMatching.PatternMatchingPackage;
@@ -255,7 +256,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
public void run() { public void run() {
String variableText = "val " + suggestedNames[0]; String variableText = "val " + suggestedNames[0];
if (noTypeInference) { if (noTypeInference) {
variableText += ": " + DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(expressionType); variableText += ": " + IdeDescriptorRenderers.SOURCE_CODE.renderType(expressionType);
} }
variableText += " = "; variableText += " = ";
if (expression instanceof JetParenthesizedExpression) { if (expression instanceof JetParenthesizedExpression) {