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

Safe delete: search for actual declarations more accurately

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-06-26 13:37:19 +03:00
parent 5bdaef4983
commit 465d5c077e
9 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+13 -7
View File
@@ -51,6 +51,7 @@ import org.jetbrains.kotlin.idea.refactoring.isTrueJavaMethod
import org.jetbrains.kotlin.idea.references.KtReference
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters
import org.jetbrains.kotlin.idea.search.projectScope
import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages
import org.jetbrains.kotlin.idea.util.actualsForExpected
import org.jetbrains.kotlin.idea.util.liftToExpected
@@ -58,6 +59,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
import org.jetbrains.kotlin.psi.psiUtil.parameterIndex
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
@@ -97,7 +99,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
return elementsToSearch.asSequence().flatMap {
val searchParameters = KotlinReferencesSearchParameters(
it,
it.useScope,
if (it.hasActualModifier()) it.project.projectScope() else it.useScope,
kotlinOptions = KotlinReferencesSearchOptions(acceptCallableOverrides = true)
)
ReferencesSearch.search(searchParameters).asSequence()
@@ -265,14 +267,18 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
}
is KtSecondaryConstructor -> {
element.getRepresentativeLightMethod()?.let { method ->
findDelegationCallUsages(method)
findUsagesByJavaProcessor(method, false)
} ?: findKotlinDeclarationUsages(element)
if (element.hasActualModifier()) {
findKotlinDeclarationUsages(element)
} else {
element.getRepresentativeLightMethod()?.let { method ->
findDelegationCallUsages(method)
findUsagesByJavaProcessor(method, false)
} ?: findKotlinDeclarationUsages(element)
}
}
is KtNamedFunction -> {
if (element.isLocal) {
if (element.isLocal || element.hasActualModifier()) {
findKotlinDeclarationUsages(element)
} else {
val lightMethods = element.toLightMethods()
@@ -293,7 +299,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
}
is KtProperty -> {
if (element.isLocal) {
if (element.isLocal || element.hasActualModifier()) {
findKotlinDeclarationUsages(element)
} else {
findUsagesByJavaProcessor(element)
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt.172
+13 -7
View File
@@ -49,6 +49,7 @@ import org.jetbrains.kotlin.idea.refactoring.isTrueJavaMethod
import org.jetbrains.kotlin.idea.references.KtReference
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters
import org.jetbrains.kotlin.idea.search.projectScope
import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages
import org.jetbrains.kotlin.idea.util.actualsForExpected
import org.jetbrains.kotlin.idea.util.liftToExpected
@@ -56,6 +57,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
import org.jetbrains.kotlin.psi.psiUtil.parameterIndex
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
@@ -92,7 +94,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
return elementsToSearch.asSequence().flatMap {
val searchParameters = KotlinReferencesSearchParameters(
it,
it.useScope,
if (it.hasActualModifier()) it.project.projectScope() else it.useScope,
kotlinOptions = KotlinReferencesSearchOptions(acceptCallableOverrides = true)
)
ReferencesSearch.search(searchParameters)
@@ -251,14 +253,18 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
}
is KtSecondaryConstructor -> {
element.getRepresentativeLightMethod()?.let { method ->
findDelegationCallUsages(method)
findUsagesByJavaProcessor(method, false)
} ?: findKotlinDeclarationUsages(element)
if (element.hasActualModifier()) {
findKotlinDeclarationUsages(element)
} else {
element.getRepresentativeLightMethod()?.let { method ->
findDelegationCallUsages(method)
findUsagesByJavaProcessor(method, false)
} ?: findKotlinDeclarationUsages(element)
}
}
is KtNamedFunction -> {
if (element.isLocal) {
if (element.isLocal || element.hasActualModifier()) {
findKotlinDeclarationUsages(element)
}
else {
@@ -281,7 +287,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
}
is KtProperty -> {
if (element.isLocal) {
if (element.isLocal || element.hasActualModifier()) {
findKotlinDeclarationUsages(element)
}
else {
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt.173
+13 -7
View File
@@ -51,6 +51,7 @@ import org.jetbrains.kotlin.idea.refactoring.isTrueJavaMethod
import org.jetbrains.kotlin.idea.references.KtReference
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters
import org.jetbrains.kotlin.idea.search.projectScope
import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages
import org.jetbrains.kotlin.idea.util.actualsForExpected
import org.jetbrains.kotlin.idea.util.liftToExpected
@@ -58,6 +59,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
import org.jetbrains.kotlin.psi.psiUtil.parameterIndex
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
@@ -94,7 +96,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
return elementsToSearch.asSequence().flatMap {
val searchParameters = KotlinReferencesSearchParameters(
it,
it.useScope,
if (it.hasActualModifier()) it.project.projectScope() else it.useScope,
kotlinOptions = KotlinReferencesSearchOptions(acceptCallableOverrides = true)
)
ReferencesSearch.search(searchParameters)
@@ -261,14 +263,18 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
}
is KtSecondaryConstructor -> {
element.getRepresentativeLightMethod()?.let { method ->
findDelegationCallUsages(method)
findUsagesByJavaProcessor(method, false)
} ?: findKotlinDeclarationUsages(element)
if (element.hasActualModifier()) {
findKotlinDeclarationUsages(element)
} else {
element.getRepresentativeLightMethod()?.let { method ->
findDelegationCallUsages(method)
findUsagesByJavaProcessor(method, false)
} ?: findKotlinDeclarationUsages(element)
}
}
is KtNamedFunction -> {
if (element.isLocal) {
if (element.isLocal || element.hasActualModifier()) {
findKotlinDeclarationUsages(element)
}
else {
@@ -291,7 +297,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
}
is KtProperty -> {
if (element.isLocal) {
if (element.isLocal || element.hasActualModifier()) {
findKotlinDeclarationUsages(element)
}
else {
idea/testData/refactoring/safeDeleteMultiModule/byImplClass/conflicts.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
class test.Foo has 1 usage that is not safe to delete.
class test.Foo has 3 usages that are not safe to delete.
idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/conflicts.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
function Foo.foo(Int) has 2 usages that are not safe to delete.
function Foo.foo(Int) has 3 usages that are not safe to delete.
idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/conflicts.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
property Foo.foo has 2 usages that are not safe to delete.
property Foo.foo has 3 usages that are not safe to delete.
idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/conflicts.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
constructor Foo(Int) has 2 usages that are not safe to delete.
constructor Foo(Int) has 3 usages that are not safe to delete.
idea/testData/refactoring/safeDeleteMultiModule/byImplFun/conflicts.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
function test.foo(Int) has 2 usages that are not safe to delete.
function test.foo(Int) has 3 usages that are not safe to delete.
idea/testData/refactoring/safeDeleteMultiModule/byImplVal/conflicts.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
property test.foo has 2 usages that are not safe to delete.
property test.foo has 3 usages that are not safe to delete.