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

No need to intersect with element's useScope - it's performed by reference search by default

Browse Source
This commit is contained in:
Valentin Kipyatkov
2020-02-10 11:55:05 +02:00
parent f43626f57f
commit e71bd4e4a4
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
+12 -14
View File
@@ -71,7 +71,7 @@ abstract class Slicer(
val options = KotlinFunctionFindUsagesOptions(project).apply { val options = KotlinFunctionFindUsagesOptions(project).apply {
isSearchForTextOccurrences = false isSearchForTextOccurrences = false
isSkipImportStatements = true isSkipImportStatements = true
searchScope = scope.intersectWith(function.useScope) searchScope = scope
} }
val descriptor = function.unsafeResolveToDescriptor() as? CallableMemberDescriptor ?: return val descriptor = function.unsafeResolveToDescriptor() as? CallableMemberDescriptor ?: return
@@ -115,6 +115,16 @@ abstract class Slicer(
kind: AccessKind, kind: AccessKind,
usageProcessor: (UsageInfo) -> Unit usageProcessor: (UsageInfo) -> Unit
) { ) {
val options = KotlinPropertyFindUsagesOptions(project).apply {
isReadAccess = kind == AccessKind.READ_ONLY || kind == AccessKind.READ_OR_WRITE
isWriteAccess =
kind == AccessKind.WRITE_ONLY || kind == AccessKind.WRITE_WITH_OPTIONAL_READ || kind == AccessKind.READ_OR_WRITE
isReadWriteAccess = kind == AccessKind.WRITE_WITH_OPTIONAL_READ || kind == AccessKind.READ_OR_WRITE
isSearchForTextOccurrences = false
isSkipImportStatements = true
searchScope = scope
}
val allDeclarations = mutableListOf(declaration) val allDeclarations = mutableListOf(declaration)
val descriptor = declaration.unsafeResolveToDescriptor() val descriptor = declaration.unsafeResolveToDescriptor()
if (descriptor is CallableMemberDescriptor) { if (descriptor is CallableMemberDescriptor) {
@@ -123,19 +133,7 @@ abstract class Slicer(
} }
} }
for (aDeclaration in allDeclarations) { allDeclarations.forEach { it.processAllExactUsages(options, usageProcessor) }
aDeclaration.processAllExactUsages(
KotlinPropertyFindUsagesOptions(project).apply {
isReadAccess = kind == AccessKind.READ_ONLY || kind == AccessKind.READ_OR_WRITE
isWriteAccess = kind == AccessKind.WRITE_ONLY || kind == AccessKind.WRITE_WITH_OPTIONAL_READ || kind == AccessKind.READ_OR_WRITE
isReadWriteAccess = kind == AccessKind.WRITE_WITH_OPTIONAL_READ || kind == AccessKind.READ_OR_WRITE
isSearchForTextOccurrences = false
isSkipImportStatements = true
searchScope = scope.intersectWith(aDeclaration.useScope)
},
usageProcessor
)
}
} }
protected fun canProcessParameter(parameter: KtParameter) = !parameter.isVarArg protected fun canProcessParameter(parameter: KtParameter) = !parameter.isVarArg