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

Refactoring. Remove isSafeCall from ResolvedCall.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-03-31 15:32:14 +03:00
parent bf08341ee4
commit 516d4df834
8 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.resolve.calls.callUtil.getCall
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.callUtil.isSafeCall
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall
import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
@@ -262,7 +263,7 @@ class KotlinPsiUnifier(
!checkSpecialOperations() -> UNMATCHED
!matchDescriptors(rc1.candidateDescriptor, rc2.candidateDescriptor) -> UNMATCHED
!checkReceivers() -> UNMATCHED
rc1.isSafeCall != rc2.isSafeCall -> UNMATCHED
rc1.call.isSafeCall() != rc2.call.isSafeCall() -> UNMATCHED
else -> {
val s = checkTypeArguments()
if (s != MATCHED) s else checkArguments()