diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/destructuringDeclarationUsages.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/destructuringDeclarationUsages.kt index 493b443204b..b19e60d2de8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/destructuringDeclarationUsages.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/destructuringDeclarationUsages.kt @@ -42,6 +42,7 @@ import org.jetbrains.kotlin.idea.search.unionSafe import org.jetbrains.kotlin.idea.util.FuzzyType import org.jetbrains.kotlin.idea.util.fuzzyExtensionReceiverType import org.jetbrains.kotlin.idea.util.toFuzzyType +import org.jetbrains.kotlin.kdoc.psi.impl.KDocName import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.kotlin.resolve.dataClassUtils.getComponentIndex @@ -179,7 +180,6 @@ private class Processor( private fun processKotlinDataClassUsage(element: PsiElement): Boolean { //TODO: type aliases - //TODO: doc-comments when (element) { is KtReferenceExpression -> { @@ -242,6 +242,8 @@ private class Processor( if (element.getStrictParentOfType() != null) return true // ignore usage in import } + + is KDocName -> return true // ignore usage in doc-comment } return false // unsupported type of reference diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.kt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.kt index 97d8a141022..b2f8e1e83ae 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.kt +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.kt @@ -8,6 +8,10 @@ fun A.ext1() { val (x, y) = getThis() } +/** + * Doc-comment reference 1: [A] + * Doc-comment reference 2: [ext1] + */ fun List.ext1() { val (x, y) = get(0) } diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt index 660529abf60..9b805eb8b3d 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt @@ -1,4 +1,4 @@ -[dataClass.0.kt] Value read 12 val (x, y) = get(0) +[dataClass.0.kt] Value read 16 val (x, y) = get(0) [dataClass.0.kt] Value read 8 val (x, y) = getThis() [dataClass.1.kt] Value read 4 for ((x, y, z) in arrayOf()) { [dataClass.1.kt] Value read 8 val (x, y) = a