Minor: deprecated canBeOverriden -> canBeOverridden

This commit is contained in:
Nikolay Krasko
2018-06-21 16:33:36 +03:00
parent 6d29e44d1a
commit 341e7746a2
4 changed files with 40 additions and 3 deletions
+1
View File
@@ -115,6 +115,7 @@
<Problem reference="com.intellij.psi.codeStyle.CommonCodeStyleSettings#getSoftMargins" reason="Absent in 172." />
<Problem reference="com.intellij.util.xmlb.XmlSerializer#serializeInto(java.lang.Object, org.jdom.Element)" reason="Absent in 172." />
<Problem reference="org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler#addSpace" reason="Method was replaced with outher methods in 182. Use addSpaceEx instead." />
<Problem reference="com.intellij.psi.util.PsiUtil#canBeOverridden" reason="Absent in 172. Use org.jetbrains.kotlin.idea.core.util.compat.psi.canBeOverridden() instead." />
</list>
</option>
</inspection_tool>
@@ -12,7 +12,6 @@ import com.intellij.psi.search.searches.DirectClassInheritorsSearch
import com.intellij.psi.search.searches.FunctionalExpressionSearch
import com.intellij.psi.search.searches.OverridingMethodsSearch
import com.intellij.psi.util.MethodSignatureUtil
import com.intellij.psi.util.PsiUtil
import com.intellij.psi.util.TypeConversionUtil
import com.intellij.util.EmptyQuery
import com.intellij.util.MergeQuery
@@ -31,6 +30,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
import org.jetbrains.kotlin.idea.core.getDeepestSuperDeclarations
import org.jetbrains.kotlin.idea.core.isOverridable
import org.jetbrains.kotlin.idea.core.util.compat.psi.canBeOverridden
import org.jetbrains.kotlin.idea.search.allScope
import org.jetbrains.kotlin.idea.search.excludeKotlinSources
import org.jetbrains.kotlin.idea.util.application.runReadAction
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.util.findCallableMemberBySignature
import java.util.*
fun PsiElement.isOverridableElement(): Boolean = when (this) {
is PsiMethod -> PsiUtil.canBeOverriden(this)
is PsiMethod -> canBeOverridden(this)
is KtDeclaration -> isOverridable()
else -> false
}
@@ -104,7 +104,7 @@ object KotlinPsiMethodOverridersSearch : HierarchySearch<PsiMethod>(PsiMethodOve
object PsiMethodOverridingHierarchyTraverser: HierarchyTraverser<PsiMethod> {
override fun nextElements(current: PsiMethod): Iterable<PsiMethod> = KotlinPsiMethodOverridersSearch.searchDirectOverriders(current)
override fun shouldDescend(element: PsiMethod): Boolean = PsiUtil.canBeOverriden(element)
override fun shouldDescend(element: PsiMethod): Boolean = canBeOverridden(element)
}
fun PsiElement.toPossiblyFakeLightMethods(): List<PsiMethod> {
@@ -0,0 +1,18 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.core.util.compat.psi
import com.intellij.psi.PsiMethod
import com.intellij.psi.util.PsiUtil
/**
* Method is absent in 172.
* BUNCH: 173
*/
@Suppress("IncompatibleAPI")
fun canBeOverridden(method: PsiMethod): Boolean {
return PsiUtil.canBeOverridden(method)
}
@@ -0,0 +1,18 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.core.util.compat.psi
import com.intellij.psi.PsiMethod
import com.intellij.psi.util.PsiUtil
/**
* Method is absent in 172.
* BUNCH: 173
*/
@Suppress("IncompatibleAPI")
fun canBeOverridden(method: PsiMethod): Boolean {
return PsiUtil.canBeOverriden(method)
}