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

Reformat: DeprecatedSymbolUsageFixBase

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-05-22 17:56:33 +03:00
parent 7cb4c91277
commit 0655e153c3
1 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
+41 -28
View File
@@ -55,8 +55,8 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
//TODO: different replacements for property accessors //TODO: different replacements for property accessors
abstract class DeprecatedSymbolUsageFixBase( abstract class DeprecatedSymbolUsageFixBase(
element: KtSimpleNameExpression, element: KtSimpleNameExpression,
val replaceWith: ReplaceWith val replaceWith: ReplaceWith
) : KotlinQuickFixAction<KtSimpleNameExpression>(element) { ) : KotlinQuickFixAction<KtSimpleNameExpression>(element) {
override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean { override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean {
@@ -67,14 +67,13 @@ abstract class DeprecatedSymbolUsageFixBase(
final override fun invoke(project: Project, editor: Editor?, file: KtFile) { final override fun invoke(project: Project, editor: Editor?, file: KtFile) {
val element = element ?: return val element = element ?: return
val strategy = buildUsageReplacementStrategy(element, replaceWith, recheckAnnotation = false, reformat = true, editor = editor) ?: return val strategy = buildUsageReplacementStrategy(
element, replaceWith, recheckAnnotation = false, reformat = true, editor = editor
) ?: return
invoke(strategy, project, editor) invoke(strategy, project, editor)
} }
protected abstract fun invoke( protected abstract fun invoke(replacementStrategy: UsageReplacementStrategy, project: Project, editor: Editor?)
replacementStrategy: UsageReplacementStrategy,
project: Project,
editor: Editor?)
companion object { companion object {
fun fetchReplaceWithPattern(descriptor: DeclarationDescriptor, project: Project): ReplaceWith? { fun fetchReplaceWithPattern(descriptor: DeclarationDescriptor, project: Project): ReplaceWith? {
@@ -88,16 +87,18 @@ abstract class DeprecatedSymbolUsageFixBase(
val imports = importValues.map { (it as StringValue).value } val imports = importValues.map { (it as StringValue).value }
// should not be available for descriptors with optional parameters if we cannot fetch default values for them (currently for library with no sources) // should not be available for descriptors with optional parameters if we cannot fetch default values for them (currently for library with no sources)
if (descriptor is CallableDescriptor && if (descriptor is CallableDescriptor && descriptor.valueParameters.any {
descriptor.valueParameters.any { it.hasDefaultValue() && OptionalParametersHelper.defaultParameterValue(it, project) == null }) return null it.hasDefaultValue() && OptionalParametersHelper.defaultParameterValue(it, project) == null
}
) return null
return ReplaceWith(pattern, imports) return ReplaceWith(pattern, imports)
} }
data class Data( data class Data(
val nameExpression: KtSimpleNameExpression, val nameExpression: KtSimpleNameExpression,
val replaceWith: ReplaceWith, val replaceWith: ReplaceWith,
val descriptor: DeclarationDescriptor val descriptor: DeclarationDescriptor
) )
fun extractDataFromDiagnostic(deprecatedDiagnostic: Diagnostic): Data? { fun extractDataFromDiagnostic(deprecatedDiagnostic: Diagnostic): Data? {
@@ -124,11 +125,11 @@ abstract class DeprecatedSymbolUsageFixBase(
} }
private fun buildUsageReplacementStrategy( private fun buildUsageReplacementStrategy(
element: KtSimpleNameExpression, element: KtSimpleNameExpression,
replaceWith: ReplaceWith, replaceWith: ReplaceWith,
recheckAnnotation: Boolean, recheckAnnotation: Boolean,
reformat: Boolean, reformat: Boolean,
editor: Editor? = null editor: Editor? = null
): UsageReplacementStrategy? { ): UsageReplacementStrategy? {
val resolutionFacade = element.getResolutionFacade() val resolutionFacade = element.getResolutionFacade()
val bindingContext = resolutionFacade.analyze(element, BodyResolveMode.PARTIAL) val bindingContext = resolutionFacade.analyze(element, BodyResolveMode.PARTIAL)
@@ -147,7 +148,9 @@ abstract class DeprecatedSymbolUsageFixBase(
is CallableDescriptor -> { is CallableDescriptor -> {
val resolvedCall = element.getResolvedCall(bindingContext) ?: return null val resolvedCall = element.getResolvedCall(bindingContext) ?: return null
if (!resolvedCall.isReallySuccess()) return null if (!resolvedCall.isReallySuccess()) return null
val replacement = ReplaceWithAnnotationAnalyzer.analyzeCallableReplacement(replaceWith, target, resolutionFacade, reformat) ?: return null val replacement = ReplaceWithAnnotationAnalyzer.analyzeCallableReplacement(
replaceWith, target, resolutionFacade, reformat
) ?: return null
return CallableUsageReplacementStrategy(replacement, inlineSetter = false) return CallableUsageReplacementStrategy(replacement, inlineSetter = false)
} }
@@ -157,19 +160,23 @@ abstract class DeprecatedSymbolUsageFixBase(
replacementType != null -> { replacementType != null -> {
if (editor != null) { if (editor != null) {
val typeAlias = element val typeAlias = element
.getStrictParentOfType<KtUserType>() .getStrictParentOfType<KtUserType>()
?.getStrictParentOfType<KtTypeReference>() ?.getStrictParentOfType<KtTypeReference>()
?.getStrictParentOfType<KtTypeAlias>() ?.getStrictParentOfType<KtTypeAlias>()
if (typeAlias != null) { if (typeAlias != null) {
val usedConstructorWithOwnReplaceWith = usedConstructorsWithOwnReplaceWith( val usedConstructorWithOwnReplaceWith = usedConstructorsWithOwnReplaceWith(
element.project, target, typeAlias) element.project, target, typeAlias
)
if (usedConstructorWithOwnReplaceWith != null) { if (usedConstructorWithOwnReplaceWith != null) {
val constructorStr = DescriptorRenderer.ONLY_NAMES_WITH_SHORT_TYPES.render(usedConstructorWithOwnReplaceWith) val constructorStr = DescriptorRenderer.ONLY_NAMES_WITH_SHORT_TYPES.render(
usedConstructorWithOwnReplaceWith
)
HintManager.getInstance().showErrorHint( HintManager.getInstance().showErrorHint(
editor, editor,
"There is own 'ReplaceWith' on '$constructorStr' that is used through this alias. " + "There is own 'ReplaceWith' on '$constructorStr' that is used through this alias. " +
"Please replace usages first.") "Please replace usages first."
)
return null return null
} }
} }
@@ -180,7 +187,12 @@ abstract class DeprecatedSymbolUsageFixBase(
} }
target is ClassDescriptor -> { target is ClassDescriptor -> {
val constructor = target.unsubstitutedPrimaryConstructor ?: return null val constructor = target.unsubstitutedPrimaryConstructor ?: return null
val replacementExpression = ReplaceWithAnnotationAnalyzer.analyzeCallableReplacement(replaceWith, constructor, resolutionFacade, reformat) ?: return null val replacementExpression = ReplaceWithAnnotationAnalyzer.analyzeCallableReplacement(
replaceWith,
constructor,
resolutionFacade,
reformat
) ?: return null
ClassUsageReplacementStrategy(null, replacementExpression, element.project) ClassUsageReplacementStrategy(null, replacementExpression, element.project)
} }
else -> null else -> null
@@ -192,7 +204,8 @@ abstract class DeprecatedSymbolUsageFixBase(
} }
private fun usedConstructorsWithOwnReplaceWith( private fun usedConstructorsWithOwnReplaceWith(
project: Project, classifier: ClassifierDescriptorWithTypeParameters, typeAlias: PsiElement): ConstructorDescriptor? { project: Project, classifier: ClassifierDescriptorWithTypeParameters, typeAlias: PsiElement
): ConstructorDescriptor? {
val specialReplaceWithForConstructor = classifier.constructors.filter { val specialReplaceWithForConstructor = classifier.constructors.filter {
DeprecatedSymbolUsageFixBase.fetchReplaceWithPattern(it, project) != null DeprecatedSymbolUsageFixBase.fetchReplaceWithPattern(it, project) != null
}.toSet() }.toSet()