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

Reformat: QuickFixRegistrar

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-05-08 17:09:03 +03:00
committed by Mikhail Glukhikh
parent e26ab28d45
commit d1c2ea4095
1 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+38 -16
View File
@@ -94,9 +94,11 @@ class QuickFixRegistrar : QuickFixContributor {
NON_MEMBER_FUNCTION_NO_BODY.registerFactory(AddFunctionBodyFix) NON_MEMBER_FUNCTION_NO_BODY.registerFactory(AddFunctionBodyFix)
NOTHING_TO_OVERRIDE.registerFactory(RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OVERRIDE_KEYWORD), NOTHING_TO_OVERRIDE.registerFactory(
ChangeMemberFunctionSignatureFix, RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OVERRIDE_KEYWORD),
AddFunctionToSupertypeFix) ChangeMemberFunctionSignatureFix,
AddFunctionToSupertypeFix
)
VIRTUAL_MEMBER_HIDDEN.registerFactory(AddModifierFix.createFactory(OVERRIDE_KEYWORD)) VIRTUAL_MEMBER_HIDDEN.registerFactory(AddModifierFix.createFactory(OVERRIDE_KEYWORD))
USELESS_CAST.registerFactory(RemoveUselessCastFix) USELESS_CAST.registerFactory(RemoveUselessCastFix)
@@ -120,16 +122,20 @@ class QuickFixRegistrar : QuickFixContributor {
VARIANCE_ON_TYPE_PARAMETER_NOT_ALLOWED.registerFactory(RemoveModifierFix.createRemoveVarianceFactory()) VARIANCE_ON_TYPE_PARAMETER_NOT_ALLOWED.registerFactory(RemoveModifierFix.createRemoveVarianceFactory())
val removeOpenModifierFactory = RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OPEN_KEYWORD) val removeOpenModifierFactory = RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OPEN_KEYWORD)
NON_FINAL_MEMBER_IN_FINAL_CLASS.registerFactory(AddModifierFix.createFactory(OPEN_KEYWORD, KtClass::class.java), NON_FINAL_MEMBER_IN_FINAL_CLASS.registerFactory(
removeOpenModifierFactory) AddModifierFix.createFactory(OPEN_KEYWORD, KtClass::class.java),
removeOpenModifierFactory
)
NON_FINAL_MEMBER_IN_OBJECT.registerFactory(removeOpenModifierFactory) NON_FINAL_MEMBER_IN_OBJECT.registerFactory(removeOpenModifierFactory)
val removeModifierFactory = RemoveModifierFix.createRemoveModifierFactory() val removeModifierFactory = RemoveModifierFix.createRemoveModifierFactory()
GETTER_VISIBILITY_DIFFERS_FROM_PROPERTY_VISIBILITY.registerFactory(removeModifierFactory) GETTER_VISIBILITY_DIFFERS_FROM_PROPERTY_VISIBILITY.registerFactory(removeModifierFactory)
SETTER_VISIBILITY_INCONSISTENT_WITH_PROPERTY_VISIBILITY.registerFactory(removeModifierFactory) SETTER_VISIBILITY_INCONSISTENT_WITH_PROPERTY_VISIBILITY.registerFactory(removeModifierFactory)
PRIVATE_SETTER_FOR_ABSTRACT_PROPERTY.registerFactory(removeModifierFactory) PRIVATE_SETTER_FOR_ABSTRACT_PROPERTY.registerFactory(removeModifierFactory)
PRIVATE_SETTER_FOR_OPEN_PROPERTY.registerFactory(AddModifierFix.createFactory(FINAL_KEYWORD, KtProperty::class.java), PRIVATE_SETTER_FOR_OPEN_PROPERTY.registerFactory(
removeModifierFactory) AddModifierFix.createFactory(FINAL_KEYWORD, KtProperty::class.java),
removeModifierFactory
)
REDUNDANT_MODIFIER_IN_GETTER.registerFactory(removeRedundantModifierFactory) REDUNDANT_MODIFIER_IN_GETTER.registerFactory(removeRedundantModifierFactory)
WRONG_MODIFIER_TARGET.registerFactory(removeModifierFactory) WRONG_MODIFIER_TARGET.registerFactory(removeModifierFactory)
DEPRECATED_MODIFIER.registerFactory(ReplaceModifierFix) DEPRECATED_MODIFIER.registerFactory(ReplaceModifierFix)
@@ -177,8 +183,10 @@ class QuickFixRegistrar : QuickFixContributor {
INVISIBLE_MEMBER.registerFactory(MakeVisibleFactory) INVISIBLE_MEMBER.registerFactory(MakeVisibleFactory)
INVISIBLE_SETTER.registerFactory(MakeVisibleFactory) INVISIBLE_SETTER.registerFactory(MakeVisibleFactory)
for (exposed in listOf(EXPOSED_FUNCTION_RETURN_TYPE, EXPOSED_PARAMETER_TYPE, EXPOSED_PROPERTY_TYPE, EXPOSED_RECEIVER_TYPE, for (exposed in listOf(
EXPOSED_SUPER_CLASS, EXPOSED_SUPER_INTERFACE, EXPOSED_TYPE_PARAMETER_BOUND)) { EXPOSED_FUNCTION_RETURN_TYPE, EXPOSED_PARAMETER_TYPE, EXPOSED_PROPERTY_TYPE, EXPOSED_RECEIVER_TYPE,
EXPOSED_SUPER_CLASS, EXPOSED_SUPER_INTERFACE, EXPOSED_TYPE_PARAMETER_BOUND
)) {
exposed.registerFactory(ChangeVisibilityOnExposureFactory) exposed.registerFactory(ChangeVisibilityOnExposureFactory)
} }
@@ -195,7 +203,8 @@ class QuickFixRegistrar : QuickFixContributor {
VAL_WITH_SETTER.registerFactory(ChangeVariableMutabilityFix.VAL_WITH_SETTER_FACTORY) VAL_WITH_SETTER.registerFactory(ChangeVariableMutabilityFix.VAL_WITH_SETTER_FACTORY)
VAL_REASSIGNMENT.registerFactory( VAL_REASSIGNMENT.registerFactory(
ChangeVariableMutabilityFix.VAL_REASSIGNMENT_FACTORY, LiftAssignmentOutOfTryFix, AssignToPropertyFix) ChangeVariableMutabilityFix.VAL_REASSIGNMENT_FACTORY, LiftAssignmentOutOfTryFix, AssignToPropertyFix
)
CAPTURED_VAL_INITIALIZATION.registerFactory(ChangeVariableMutabilityFix.CAPTURED_VAL_INITIALIZATION_FACTORY) CAPTURED_VAL_INITIALIZATION.registerFactory(ChangeVariableMutabilityFix.CAPTURED_VAL_INITIALIZATION_FACTORY)
CAPTURED_MEMBER_VAL_INITIALIZATION.registerFactory(ChangeVariableMutabilityFix.CAPTURED_MEMBER_VAL_INITIALIZATION_FACTORY) CAPTURED_MEMBER_VAL_INITIALIZATION.registerFactory(ChangeVariableMutabilityFix.CAPTURED_MEMBER_VAL_INITIALIZATION_FACTORY)
VAR_OVERRIDDEN_BY_VAL.registerFactory(ChangeVariableMutabilityFix.VAR_OVERRIDDEN_BY_VAL_FACTORY) VAR_OVERRIDDEN_BY_VAL.registerFactory(ChangeVariableMutabilityFix.VAR_OVERRIDDEN_BY_VAL_FACTORY)
@@ -370,14 +379,19 @@ class QuickFixRegistrar : QuickFixContributor {
NEXT_NONE_APPLICABLE.registerFactory(CreateNextFunctionActionFactory) NEXT_NONE_APPLICABLE.registerFactory(CreateNextFunctionActionFactory)
ITERATOR_MISSING.registerFactory(CreateIteratorFunctionActionFactory) ITERATOR_MISSING.registerFactory(CreateIteratorFunctionActionFactory)
ITERATOR_ON_NULLABLE.registerFactory(MissingIteratorExclExclFixFactory) ITERATOR_ON_NULLABLE.registerFactory(MissingIteratorExclExclFixFactory)
COMPONENT_FUNCTION_MISSING.registerFactory(CreateComponentFunctionActionFactory, CreateDataClassPropertyFromDestructuringActionFactory) COMPONENT_FUNCTION_MISSING.registerFactory(
CreateComponentFunctionActionFactory,
CreateDataClassPropertyFromDestructuringActionFactory
)
DELEGATE_SPECIAL_FUNCTION_MISSING.registerFactory(CreatePropertyDelegateAccessorsActionFactory) DELEGATE_SPECIAL_FUNCTION_MISSING.registerFactory(CreatePropertyDelegateAccessorsActionFactory)
DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE.registerFactory(CreatePropertyDelegateAccessorsActionFactory) DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE.registerFactory(CreatePropertyDelegateAccessorsActionFactory)
UNRESOLVED_REFERENCE.registerFactory(CreateClassFromTypeReferenceActionFactory, UNRESOLVED_REFERENCE.registerFactory(
CreateClassFromReferenceExpressionActionFactory, CreateClassFromTypeReferenceActionFactory,
CreateClassFromCallWithConstructorCalleeActionFactory) CreateClassFromReferenceExpressionActionFactory,
CreateClassFromCallWithConstructorCalleeActionFactory
)
UNRESOLVED_REFERENCE.registerFactory(CreateTypeAliasFromTypeReferenceActionFactory) UNRESOLVED_REFERENCE.registerFactory(CreateTypeAliasFromTypeReferenceActionFactory)
@@ -398,8 +412,16 @@ class QuickFixRegistrar : QuickFixContributor {
DEPRECATION.registerFactory(DeprecatedSymbolUsageFix, DeprecatedSymbolUsageInWholeProjectFix, MigrateExternalExtensionFix) DEPRECATION.registerFactory(DeprecatedSymbolUsageFix, DeprecatedSymbolUsageInWholeProjectFix, MigrateExternalExtensionFix)
DEPRECATION_ERROR.registerFactory(DeprecatedSymbolUsageFix, DeprecatedSymbolUsageInWholeProjectFix, MigrateExternalExtensionFix) DEPRECATION_ERROR.registerFactory(DeprecatedSymbolUsageFix, DeprecatedSymbolUsageInWholeProjectFix, MigrateExternalExtensionFix)
TYPEALIAS_EXPANSION_DEPRECATION.registerFactory(DeprecatedSymbolUsageFix, DeprecatedSymbolUsageInWholeProjectFix, MigrateExternalExtensionFix) TYPEALIAS_EXPANSION_DEPRECATION.registerFactory(
TYPEALIAS_EXPANSION_DEPRECATION_ERROR.registerFactory(DeprecatedSymbolUsageFix, DeprecatedSymbolUsageInWholeProjectFix, MigrateExternalExtensionFix) DeprecatedSymbolUsageFix,
DeprecatedSymbolUsageInWholeProjectFix,
MigrateExternalExtensionFix
)
TYPEALIAS_EXPANSION_DEPRECATION_ERROR.registerFactory(
DeprecatedSymbolUsageFix,
DeprecatedSymbolUsageInWholeProjectFix,
MigrateExternalExtensionFix
)
PROTECTED_CALL_FROM_PUBLIC_INLINE.registerFactory(ReplaceProtectedToPublishedApiCallFix) PROTECTED_CALL_FROM_PUBLIC_INLINE.registerFactory(ReplaceProtectedToPublishedApiCallFix)
POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION.registerFactory(ReplaceJavaAnnotationPositionedArgumentsFix) POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION.registerFactory(ReplaceJavaAnnotationPositionedArgumentsFix)