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

KT-7929 related: KtDestructuringDeclarationEntry is not resolved to descriptor in OverridingDeprecatedMemberInspection

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-10-21 16:23:18 +03:00
parent 6b9252a5d3
commit 44d10672be
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/OverridingDeprecatedMemberInspection.kt
+2 -4
View File
@@ -22,10 +22,7 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiElementVisitor
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.KtNamedDeclaration
import org.jetbrains.kotlin.psi.KtPropertyAccessor
import org.jetbrains.kotlin.psi.KtVisitorVoid
import org.jetbrains.kotlin.resolve.deprecatedByOverriddenMessage import org.jetbrains.kotlin.resolve.deprecatedByOverriddenMessage
import org.jetbrains.kotlin.resolve.getDeprecation import org.jetbrains.kotlin.resolve.getDeprecation
@@ -41,6 +38,7 @@ class OverridingDeprecatedMemberInspection : AbstractKotlinInspection() {
} }
private fun registerProblemIfNeeded(declaration: KtDeclaration, targetForProblem: PsiElement) { private fun registerProblemIfNeeded(declaration: KtDeclaration, targetForProblem: PsiElement) {
if (declaration is KtDestructuringDeclarationEntry) return
val accessorDescriptor = declaration.resolveToDescriptor() as? CallableMemberDescriptor ?: return val accessorDescriptor = declaration.resolveToDescriptor() as? CallableMemberDescriptor ?: return
val message = accessorDescriptor.getDeprecation()?.deprecatedByOverriddenMessage() ?: return val message = accessorDescriptor.getDeprecation()?.deprecatedByOverriddenMessage() ?: return
idea/testData/inspections/overridingDeprecatedMember/test.kt
Vendored
+6
View File
@@ -45,3 +45,9 @@ interface Explicit : I {
override fun f(): Int { override fun f(): Int {
} }
} }
data class Pair(x: Int, y: Int)
class Exc {
val (a, b) = Pair(1, 2)
}