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

rename isFunctionType -> isFunctionOrExtensionFunctionType

Browse Source 
added isFunctionType, isExtensionFunctionType
This commit is contained in:
Svetlana Isakova
2012-12-27 18:24:11 +04:00
parent 21f6d1630d
commit a6bfa1ff6c
9 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class JetPluginUtil {
public static boolean checkTypeIsStandard(JetType type, Project project) {
if (KotlinBuiltIns.getInstance().isAny(type) || KotlinBuiltIns.getInstance().isNothingOrNullableNothing(type) || KotlinBuiltIns.getInstance().isUnit(type) ||
KotlinBuiltIns.getInstance().isTupleType(type) || KotlinBuiltIns.getInstance().isFunctionType(type)) {
KotlinBuiltIns.getInstance().isTupleType(type) || KotlinBuiltIns.getInstance().isFunctionOrExtensionFunctionType(type)) {
return true;
}
idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java
+2 -1
View File
@@ -129,7 +129,8 @@ public final class DescriptorLookupConverter {
}
if (functionDescriptor.getValueParameters().size() == 1
&& KotlinBuiltIns.getInstance().isFunctionType(functionDescriptor.getValueParameters().get(0).getType())) {
&& KotlinBuiltIns.getInstance().isFunctionOrExtensionFunctionType(
functionDescriptor.getValueParameters().get(0).getType())) {
return PARAMS_BRACES_FUNCTION_HANDLER;
}