From 68776be186a054db5ec7b3e633179fa17a145362 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 14 Apr 2016 19:33:20 +0300 Subject: [PATCH] Find Usages: Drop obsolete assertion #KT-11895 Fixed --- ChangeLog.md | 1 + .../idea/findUsages/handlers/KotlinFindUsagesHandler.kt | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index a90c50175ac..394b80c40d8 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -178,6 +178,7 @@ Issues fixed: - [KT-11719](https://youtrack.jetbrains.com/issue/KT-11719) Fixed renaming of Kotlin parameters references in XML files - Fix several issues leading to exceptions: [KT-11579](https://youtrack.jetbrains.com/issue/KT-11579), [KT-11580](https://youtrack.jetbrains.com/issue/KT-11580), [KT-11777](https://youtrack.jetbrains.com/issue/KT-11777), [KT-11868](https://youtrack.jetbrains.com/issue/KT-11868) - Fixed NoSuchFieldException in Kotlin module settings on IDEA Ultimate +- [KT-11895](https://youtrack.jetbrains.com/issue/KT-11895) Fixed exception on highlighting of injected references #### Debugger diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt index 4c160c5de9e..93536e786da 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.findUsages.handlers import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.find.findUsages.FindUsagesOptions +import com.intellij.lang.injection.InjectedLanguageManager import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference @@ -80,9 +81,6 @@ abstract class KotlinFindUsagesHandler(psiElement: T, override fun process(info: UsageInfo): Boolean { val reference = info.reference if (reference != null) { - if (scopeContainingFile != null && reference.element.containingFile != scopeContainingFile) { - LOG.error("findReferencesToHighight() found a reference from a different file: $reference") - } results.add(reference) } return true