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

Shorten References: Allow import insertion when function and property have the same name

Browse Source 
#KT-22745 Fixed
This commit is contained in:
Alexey Sedunov
2018-02-27 19:15:14 +03:00
parent df4cd14161
commit df4c80f43a
8 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
+11 -4
View File
@@ -514,13 +514,20 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
}
return when {
targetsMatch || resolvedCallsMatch -> AnalyzeQualifiedElementResult.ShortenNow
targetsMatch || resolvedCallsMatch ->
AnalyzeQualifiedElementResult.ShortenNow
// it makes no sense to insert import when there is a conflict with function, property etc
targetsWhenShort.any { it !is ClassifierDescriptorWithTypeParameters && it !is PackageViewDescriptor } -> AnalyzeQualifiedElementResult.Skip
// Function doesn't conflict with property
targets.all { it is FunctionDescriptor } && targetsWhenShort.all { it is PropertyDescriptor } ->
AnalyzeQualifiedElementResult.ImportDescriptors(targets)
// In other cases it makes no sense to insert import when there is a conflict with function, property etc
targetsWhenShort.any { it !is ClassifierDescriptorWithTypeParameters && it !is PackageViewDescriptor } ->
AnalyzeQualifiedElementResult.Skip
else -> AnalyzeQualifiedElementResult.ImportDescriptors(targets)
else ->
AnalyzeQualifiedElementResult.ImportDescriptors(targets)
}
}