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

More renames of TypeRef to TypeReference

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-07 12:54:05 +04:00
parent 31ebee81f0
commit 852fc8bc5d
41 changed files with 70 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class JetIconProvider extends IconProvider {
}
if (psiElement instanceof JetNamedFunction) {
if (((JetFunction) psiElement).getReceiverTypeRef() != null) {
if (((JetFunction) psiElement).getReceiverTypeReference() != null) {
return JetIcons.EXTENSION_FUNCTION;
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+1 -1
View File
@@ -78,7 +78,7 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntentio
when (expression) {
is JetIsExpression -> {
psiFactory.createExpression(
"${expression.getLeftHandSide().getText() ?: ""} ${invertedOperation.getValue()} ${expression.getTypeRef()?.getText() ?: ""}"
"${expression.getLeftHandSide().getText() ?: ""} ${invertedOperation.getValue()} ${expression.getTypeReference()?.getText() ?: ""}"
)
}
is JetBinaryExpression -> psiFactory.createBinaryExpression(
idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
+3 -3
View File
@@ -43,10 +43,10 @@ public class MemberMatching {
@Nullable
private static JetTypeReference getReceiverType(@NotNull JetNamedDeclaration propertyOrFunction) {
if (propertyOrFunction instanceof JetNamedFunction) {
return ((JetNamedFunction) propertyOrFunction).getReceiverTypeRef();
return ((JetNamedFunction) propertyOrFunction).getReceiverTypeReference();
}
if (propertyOrFunction instanceof JetProperty) {
return ((JetProperty) propertyOrFunction).getReceiverTypeRef();
return ((JetProperty) propertyOrFunction).getReceiverTypeReference();
}
throw new IllegalArgumentException("Neither function nor declaration: " + propertyOrFunction.getClass().getName());
}
@@ -83,7 +83,7 @@ public class MemberMatching {
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
int parameterCount = type.getParameters().size();
if (type.getReceiverTypeRef() == null) {
if (type.getReceiverTypeReference() == null) {
return builtIns.getFunction(parameterCount).getName().asString();
}
else {