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

Refactoring: rename TEXT to FQNAMES_IN_TYPES

Browse Source
This commit is contained in:
Nikolay Krasko
2014-04-16 16:29:29 +04:00
parent 962044f887
commit 068c9636fc
39 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class JetFunctionPsiElementCellRenderer extends DefaultPsiElementCellRend
SimpleFunctionDescriptor fd =
bindingContext.get(BindingContext.FUNCTION, function);
assert fd != null;
return DescriptorRenderer.TEXT.render(fd);
return DescriptorRenderer.FQNAMES_IN_TYPES.render(fd);
}
return super.getElementText(element);
}
idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
+1 -1
View File
@@ -240,7 +240,7 @@ public object ShortenReferences {
}
}
private fun DeclarationDescriptor.asString() = DescriptorRenderer.TEXT.render(this)
private fun DeclarationDescriptor.asString() = DescriptorRenderer.FQNAMES_IN_TYPES.render(this)
//TODO: do we need this "IfNeeded" check?
private fun addImportIfNeeded(descriptor: DeclarationDescriptor, file: JetFile) {
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java
+1 -1
View File
@@ -131,7 +131,7 @@ public class MoveDeclarationsOutHelper {
typeString = typeRef.getText();
}
else if (!propertyType.isError()) {
typeString = DescriptorRenderer.TEXT.renderType(propertyType);
typeString = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(propertyType);
}
return JetPsiFactory.createProperty(property.getProject(), property.getName(), typeString, property.isVar(), initializer);
idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java
+1 -1
View File
@@ -139,7 +139,7 @@ public final class DescriptorLookupConverter {
InsertHandler<LookupElement> handler = getInsertHandler(descriptor);
assert handler != null:
"Special kotlin handler is expected for function: " + declaration.getText() +
" and descriptor: " + DescriptorRenderer.TEXT.render(descriptor);
" and descriptor: " + DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor);
return new JavaMethodCallElementWithCustomHandler(declaration).setInsertHandler(handler);
}
idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
+1 -1
View File
@@ -104,7 +104,7 @@ class StaticMembers(val bindingContext: BindingContext, val resolveSession: Reso
}
if (presentation.getTypeText().isNullOrEmpty()) {
presentation.setTypeText(DescriptorRenderer.TEXT.renderType(classDescriptor.getDefaultType()))
presentation.setTypeText(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(classDescriptor.getDefaultType()))
}
}
idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt
+1 -1
View File
@@ -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.TEXT.renderType(thisType))
val lookupElement = LookupElementBuilder.create(expressionText).withTypeText(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(thisType))
collection.add(addTailToLookupElement(lookupElement, matchedExpectedInfos))
}
}
idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
+1 -1
View File
@@ -42,7 +42,7 @@ class TypeInstantiationItems(val bindingContext: BindingContext, val resolveSess
var lookupString = lookupElement.getLookupString()
val typeArgs = jetType.getArguments()
var itemText = lookupString + DescriptorRenderer.TEXT.renderTypeArguments(typeArgs)
var itemText = lookupString + DescriptorRenderer.FQNAMES_IN_TYPES.renderTypeArguments(typeArgs)
val insertHandler: InsertHandler<LookupElement>
val typeText = DescriptorUtils.getFqName(classifier).toString() + DescriptorRenderer.SOURCE_CODE.renderTypeArguments(typeArgs)
idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider {
if (functionDescriptor != null) {
JetType type = functionDescriptor.getReturnType();
if (type != null) {
String returnTypeText = DescriptorRenderer.TEXT.renderType(type);
String returnTypeText = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type);
if (returnTypeText.equals(functionName)) {
Collection<JetClassOrObject> classOrObjects =
JetClassShortNameIndex.getInstance().get(functionName, project, GlobalSearchScope.allScope(project));
idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java
+2 -2
View File
@@ -262,8 +262,8 @@ public class DeprecatedAnnotationVisitor extends AfterAnalysisHighlightingVisito
return "val " + descriptor.getName();
}
else if (descriptor instanceof FunctionDescriptor) {
return "fun " + descriptor.getName() + DescriptorRenderer.TEXT.renderFunctionParameters((FunctionDescriptor) descriptor);
return "fun " + descriptor.getName() + DescriptorRenderer.FQNAMES_IN_TYPES.renderFunctionParameters((FunctionDescriptor) descriptor);
}
return DescriptorRenderer.TEXT.render(descriptor);
return DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor);
}
}
idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+1 -1
View File
@@ -316,7 +316,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
else {
JBPopup popup = NavigationUtil.getPsiElementPopup(PsiUtilCore.toPsiElementArray(list),
new JetFunctionPsiElementCellRenderer(bindingContext),
DescriptorRenderer.TEXT.render(descriptor));
DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor));
if (event != null) {
popup.show(new RelativePoint(event));
}
idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
+1 -1
View File
@@ -68,7 +68,7 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
public void visitExpression(@NotNull JetExpression expression) {
JetType autoCast = bindingContext.get(AUTOCAST, expression);
if (autoCast != null) {
holder.createInfoAnnotation(expression, "Automatically cast to " + DescriptorRenderer.TEXT.renderType(autoCast)).setTextAttributes(
holder.createInfoAnnotation(expression, "Automatically cast to " + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(autoCast)).setTextAttributes(
JetHighlightingColors.AUTO_CASTED_VALUE);
}
super.visitExpression(expression);
idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt
+1 -1
View File
@@ -51,7 +51,7 @@ public class InsertExplicitTypeArguments : JetSelfTargetingIntention<JetCallExpr
val typeArgs = types.map {
assert(args[it] != null, "there is a null in the type arguments to transform")
val typeToCompute = DescriptorRenderer.TEXT.renderType(args[it]!!);
val typeToCompute = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(args[it]!!);
val computedTypeRef = JetPsiFactory.createType(element.getProject(), typeToCompute)
ShortenReferences.process(computedTypeRef)
computedTypeRef.getText()
idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+1 -4
View File
@@ -25,13 +25,11 @@ import com.intellij.codeInsight.template.TemplateEditingAdapter;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
@@ -50,7 +48,6 @@ import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -238,7 +235,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
@Override
protected String getResult(JetType element) {
return DescriptorRenderer.TEXT.renderType(element);
return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(element);
}
};
idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
+1 -1
View File
@@ -115,7 +115,7 @@ public class DeclarationUtils {
JetType inferredType = getPropertyTypeIfNeeded(property);
String typeStr = inferredType != null
? DescriptorRenderer.TEXT.renderType(inferredType)
? DescriptorRenderer.FQNAMES_IN_TYPES.renderType(inferredType)
: JetPsiUtil.getNullableText(property.getTypeRef());
//noinspection ConstantConditions
idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
+4 -4
View File
@@ -149,7 +149,7 @@ public class MemberMatching {
return true;
}
if (declarationReceiver != null && descriptorReceiver != null) {
return declarationReceiver.getText().equals(DescriptorRenderer.TEXT.renderType(descriptorReceiver.getType()));
return declarationReceiver.getText().equals(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(descriptorReceiver.getType()));
}
return false;
}
@@ -178,7 +178,7 @@ public class MemberMatching {
JetType typeToRender = varargInDeclaration ? descriptorParameter.getVarargElementType() : descriptorParameter.getType();
assert typeToRender != null;
String descriptorParameterText = DescriptorRenderer.TEXT.renderType(typeToRender);
String descriptorParameterText = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(typeToRender);
if (!declarationTypeText.equals(descriptorParameterText)) {
return false;
}
@@ -227,12 +227,12 @@ public class MemberMatching {
descriptor.getUpperBounds(), new Function<JetType, String>() {
@Override
public String fun(JetType type) {
return DescriptorRenderer.TEXT.renderType(type);
return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type);
}
}));
Set<String> decompiledUpperBounds = decompiledParameterToBounds.get(descriptor.getName()).isEmpty()
? Sets.newHashSet(DescriptorRenderer.TEXT.renderType(KotlinBuiltIns.getInstance().getDefaultBound()))
? Sets.newHashSet(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(KotlinBuiltIns.getInstance().getDefaultBound()))
: Sets.newHashSet(decompiledParameterToBounds.get(descriptor.getName()));
if (!descriptorUpperBounds.equals(decompiledUpperBounds)) {
return false;
idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
+2 -2
View File
@@ -62,10 +62,10 @@ public class MapPlatformClassToKotlinFix extends JetIntentionAction<JetReference
@NotNull
@Override
public String getText() {
String platformClassQualifiedName = DescriptorRenderer.TEXT.renderType(platformClass.getDefaultType());
String platformClassQualifiedName = DescriptorRenderer.FQNAMES_IN_TYPES.renderType(platformClass.getDefaultType());
return possibleClasses.size() == 1
? JetBundle.message("map.platform.class.to.kotlin", platformClassQualifiedName,
DescriptorRenderer.TEXT.renderType(possibleClasses.iterator().next().getDefaultType()))
DescriptorRenderer.FQNAMES_IN_TYPES.renderType(possibleClasses.iterator().next().getDefaultType()))
: JetBundle.message("map.platform.class.to.kotlin.multiple", platformClassQualifiedName);
}
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt
+1 -1
View File
@@ -107,7 +107,7 @@ class ExtractionData(
fun getBrokenReferencesInfo(body: JetBlockExpression): List<ResolvedReferenceInfo> {
fun compareDescriptors(d1: DeclarationDescriptor?, d2: DeclarationDescriptor?): Boolean {
return d1 == d2 || (d1 != null && d2 != null && DescriptorRenderer.TEXT.render(d1) == DescriptorRenderer.TEXT.render(d2))
return d1 == d2 || (d1 != null && d2 != null && DescriptorRenderer.FQNAMES_IN_TYPES.render(d1) == DescriptorRenderer.FQNAMES_IN_TYPES.render(d2))
}
val startOffset = body.getStatements().first!!.getTextRange()!!.getStartOffset()
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
+1 -1
View File
@@ -463,7 +463,7 @@ fun ExtractionDescriptor.validate(): ExtractionDescriptorWithConflicts {
fun ExtractionDescriptor.getFunctionText(
withBody: Boolean = true,
descriptorRenderer: DescriptorRenderer = DescriptorRenderer.TEXT
descriptorRenderer: DescriptorRenderer = DescriptorRenderer.FQNAMES_IN_TYPES
): String {
return FunctionBuilder().let { builder ->
builder.modifier(visibility)
idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java
+2 -2
View File
@@ -236,7 +236,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
return StringUtil.join(fun.getValueParameters(), new Function<ValueParameterDescriptor, String>() {
@Override
public String fun(ValueParameterDescriptor descriptor) {
return descriptor.getName() + ": " + DescriptorRenderer.TEXT.renderType(descriptor.getType());
return descriptor.getName() + ": " + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(descriptor.getType());
}
}, ", ");
}
@@ -357,7 +357,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
return StringUtil.join(typeArguments, new Function<JetType, String>() {
@Override
public String fun(JetType type) {
return DescriptorRenderer.TEXT.renderType(type);
return DescriptorRenderer.FQNAMES_IN_TYPES.renderType(type);
}
}, ", ");
}
idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
+1 -1
View File
@@ -249,7 +249,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
public void run() {
String variableText = "val " + suggestedNames[0];
if (noTypeInference) {
variableText += ": " + DescriptorRenderer.TEXT.renderType(expressionType);
variableText += ": " + DescriptorRenderer.FQNAMES_IN_TYPES.renderType(expressionType);
}
variableText += " = ";
if (expression instanceof JetParenthesizedExpression) {
idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
+2 -2
View File
@@ -187,7 +187,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
JetScope memberScope = getMemberScope(containingDeclaration);
if (memberScope == null) return null;
String renderedOriginal = DescriptorRenderer.TEXT.render(originalDescriptor);
String renderedOriginal = DescriptorRenderer.FQNAMES_IN_TYPES.render(originalDescriptor);
Collection<? extends DeclarationDescriptor> descriptors;
if (originalDescriptor instanceof ConstructorDescriptor && containingDeclaration instanceof ClassDescriptor) {
descriptors = ((ClassDescriptor) containingDeclaration).getConstructors();
@@ -196,7 +196,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
descriptors = memberScope.getAllDescriptors();
}
for (DeclarationDescriptor member : descriptors) {
if (renderedOriginal.equals(DescriptorRenderer.TEXT.render(member))) {
if (renderedOriginal.equals(DescriptorRenderer.FQNAMES_IN_TYPES.render(member))) {
return member;
}
}
idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java
+5 -5
View File
@@ -191,7 +191,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor;
ReceiverParameterDescriptor receiver = functionDescriptor.getReceiverParameter();
if (receiver != null) {
textBuilder.append(DescriptorRenderer.TEXT.renderType(receiver.getType())).append(".");
textBuilder.append(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(receiver.getType())).append(".");
}
textBuilder.append(functionDescriptor.getName());
@@ -202,7 +202,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
@Override
public String fun(ValueParameterDescriptor valueParameterDescriptor) {
return valueParameterDescriptor.getName() + ":" +
DescriptorRenderer.TEXT.renderType(valueParameterDescriptor.getType());
DescriptorRenderer.FQNAMES_IN_TYPES.renderType(valueParameterDescriptor.getType());
}
},
",");
@@ -211,13 +211,13 @@ public class JetStructureViewElement implements StructureViewTreeElement {
JetType returnType = functionDescriptor.getReturnType();
assert returnType != null;
textBuilder.append(":").append(DescriptorRenderer.TEXT.renderType(returnType));
textBuilder.append(":").append(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(returnType));
}
else if (descriptor instanceof VariableDescriptor) {
JetType outType = ((VariableDescriptor) descriptor).getType();
textBuilder = new StringBuilder(descriptor.getName().asString());
textBuilder.append(":").append(DescriptorRenderer.TEXT.renderType(outType));
textBuilder.append(":").append(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(outType));
}
else if (descriptor instanceof ClassDescriptor) {
textBuilder = new StringBuilder(descriptor.getName().asString());
@@ -227,7 +227,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
.append(")");
}
else {
return DescriptorRenderer.TEXT.render(descriptor);
return DescriptorRenderer.FQNAMES_IN_TYPES.render(descriptor);
}
return textBuilder.toString();