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

Rename: this object, receiver argument -> dispatch receiver, extension receiver

Browse Source
This commit is contained in:
Svetlana Isakova
2014-09-29 21:09:07 +04:00
parent 1d2d2f4845
commit 20f3403c80
185 changed files with 681 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit
if (DescriptorUtils.isTopLevelDeclaration(fun)) {
JetPsiChecker.highlightName(holder, callee, JetHighlightingColors.PACKAGE_FUNCTION_CALL);
}
if (fun.getReceiverParameter() != null) {
if (fun.getExtensionReceiverParameter() != null) {
JetPsiChecker.highlightName(holder, callee, JetHighlightingColors.EXTENSION_FUNCTION_CALL);
}
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java
+1 -1
View File
@@ -87,7 +87,7 @@ class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
holder, elementToHighlight,
isStatic ? JetHighlightingColors.PACKAGE_PROPERTY : JetHighlightingColors.INSTANCE_PROPERTY
);
if (descriptor.getReceiverParameter() != null) {
if (descriptor.getExtensionReceiverParameter() != null) {
JetPsiChecker.highlightName(holder, elementToHighlight, JetHighlightingColors.EXTENSION_PROPERTY);
}
if (withBackingField) {
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt
+1 -1
View File
@@ -76,7 +76,7 @@ fun <D : CallableDescriptor> renderResolvedCall(resolvedCall: ResolvedCall<D>):
}
val resultingDescriptor = resolvedCall.getResultingDescriptor()
val receiverParameter = resultingDescriptor.getReceiverParameter()
val receiverParameter = resultingDescriptor.getExtensionReceiverParameter()
if (receiverParameter != null) {
append(htmlRenderer.renderType(receiverParameter.getType())).append(".")
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
+1 -1
View File
@@ -144,7 +144,7 @@ public class MemberMatching {
/* DECLARATION AND DESCRIPTOR STRICT MATCHING */
static boolean receiversMatch(@NotNull JetNamedDeclaration declaration, @NotNull CallableDescriptor descriptor) {
JetTypeReference declarationReceiver = getReceiverType(declaration);
ReceiverParameterDescriptor descriptorReceiver = descriptor.getReceiverParameter();
ReceiverParameterDescriptor descriptorReceiver = descriptor.getExtensionReceiverParameter();
if (declarationReceiver == null && descriptorReceiver == null) {
return true;
}