From 7abc29cff604b7ffbe3773f9261a8b4faf4bee9b Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 8 Oct 2015 12:52:00 +0200
Subject: [PATCH] fix 'where' clause in IDEA plugin code

---
 .../jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
index 3f48380a840..017415aa1f6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
@@ -457,11 +457,11 @@ private fun copyModifierListItems(from: PsiModifierList, to: PsiModifierList, wi
     }
 }
 
-private fun copyTypeParameters<T: PsiTypeParameterListOwner>(
+private fun copyTypeParameters<T>(
         from: T,
         to: T,
         inserter: (T, PsiTypeParameterList) -> Unit
-) where T : PsiNameIdentifierOwner {
+) where T : PsiTypeParameterListOwner, T : PsiNameIdentifierOwner {
     val factory = PsiElementFactory.SERVICE.getInstance((from : PsiElement).getProject())
     val templateTypeParams = from.getTypeParameterList()?.getTypeParameters() ?: PsiTypeParameter.EMPTY_ARRAY
     if (templateTypeParams.isNotEmpty()) {