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

DeprecatedSymbolUsageFix: changed from descriptors to import back to fq-names as it's more safe

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-28 20:42:27 +03:00
parent 859128744e
commit 6fbd530eee
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt
+3 -1
View File
@@ -221,7 +221,9 @@ public abstract class DeprecatedSymbolUsageFixBase(
//TODO: drop import of old function (if not needed anymore)? //TODO: drop import of old function (if not needed anymore)?
val file = result.getContainingJetFile() val file = result.getContainingJetFile()
replacement.descriptorsToImport.forEach { ImportInsertHelper.getInstance(project).importDescriptor(file, it) } replacement.fqNamesToImport
.flatMap { file.getResolutionFacade().resolveImportReference(file, it) }
.forEach { ImportInsertHelper.getInstance(project).importDescriptor(file, it) }
result = postProcessInsertedExpression(result, wrapper.addedStatements) result = postProcessInsertedExpression(result, wrapper.addedStatements)
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt
+8 -7
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.core.asExpression import org.jetbrains.kotlin.idea.core.asExpression
import org.jetbrains.kotlin.idea.core.copied import org.jetbrains.kotlin.idea.core.copied
import org.jetbrains.kotlin.idea.core.replaced
import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport
import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.idea.imports.importableFqName
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
@@ -56,9 +57,9 @@ object ReplaceWithAnnotationAnalyzer {
public data class ReplacementExpression( public data class ReplacementExpression(
val expression: JetExpression, val expression: JetExpression,
val descriptorsToImport: Collection<DeclarationDescriptor> val fqNamesToImport: Collection<FqName>
) { ) {
fun copy() = ReplacementExpression(expression.copied(), descriptorsToImport) fun copy() = ReplacementExpression(expression.copied(), fqNamesToImport)
} }
public fun analyze( public fun analyze(
@@ -85,13 +86,13 @@ object ReplaceWithAnnotationAnalyzer {
val psiFactory = JetPsiFactory(project) val psiFactory = JetPsiFactory(project)
var expression = psiFactory.createExpression(annotation.expression) var expression = psiFactory.createExpression(annotation.expression)
val explicitlyImportedSymbols = annotation.imports val importFqNames = annotation.imports
.filter { FqNameUnsafe.isValid(it) } .filter { FqNameUnsafe.isValid(it) }
.map { FqNameUnsafe(it) } .map { FqNameUnsafe(it) }
.filter { it.isSafe() } .filter { it.isSafe() }
.mapTo(LinkedHashSet<FqName>()) { it.toSafe() } .mapTo(LinkedHashSet<FqName>()) { it.toSafe() }
.flatMap { resolutionFacade.resolveImportReference(file, it) }
val descriptorsToImport = explicitlyImportedSymbols.toArrayList() val explicitlyImportedSymbols = importFqNames.flatMap { resolutionFacade.resolveImportReference(file, it) }
val symbolScope = getResolutionScope(symbolDescriptor) val symbolScope = getResolutionScope(symbolDescriptor)
val scope = ChainedScope(symbolDescriptor, "ReplaceWith resolution scope", ExplicitImportsScope(explicitlyImportedSymbols), symbolScope) val scope = ChainedScope(symbolDescriptor, "ReplaceWith resolution scope", ExplicitImportsScope(explicitlyImportedSymbols), symbolScope)
@@ -104,7 +105,7 @@ object ReplaceWithAnnotationAnalyzer {
val target = bindingContext[BindingContext.REFERENCE_TARGET, expression] ?: return@forEachDescendantOfType val target = bindingContext[BindingContext.REFERENCE_TARGET, expression] ?: return@forEachDescendantOfType
if (target.canBeReferencedViaImport() && (target.isExtension || expression.getReceiverExpression() == null)) { if (target.canBeReferencedViaImport() && (target.isExtension || expression.getReceiverExpression() == null)) {
descriptorsToImport.addIfNotNull(target) importFqNames.addIfNotNull(target.importableFqName)
} }
if (expression.getReceiverExpression() == null) { if (expression.getReceiverExpression() == null) {
@@ -137,7 +138,7 @@ object ReplaceWithAnnotationAnalyzer {
} }
} }
return ReplacementExpression(expression, descriptorsToImport) return ReplacementExpression(expression, importFqNames)
} }
private fun getResolutionScope(descriptor: DeclarationDescriptor): JetScope { private fun getResolutionScope(descriptor: DeclarationDescriptor): JetScope {