From c961de7289a9e5b49ddeef85a185bc110f82ad76 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Tue, 24 Sep 2019 21:03:35 +0200 Subject: [PATCH] Fix kotlinRefactoringUtil.kt.193 compilation --- .../kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 index d7662ac0029..5573a7b799c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 @@ -994,7 +994,7 @@ fun DialogWrapper.showWithTransaction() { TransactionGuard.submitTransaction(disposable, Runnable { show() }) } -fun PsiMethod.checkDeclarationConflict(name: String, conflicts: MultiMap, callables: List) { +fun PsiMethod.checkDeclarationConflict(name: String, conflicts: MultiMap, callables: Collection) { containingClass ?.findMethodsByName(name, true) // as is necessary here: see KT-10386