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

Renames

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-14 20:41:45 +03:00
parent c849c029cc
commit 17123a3cf2
13 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.kt
+2 -2
View File
@@ -69,13 +69,13 @@ class ChangeFunctionLiteralSignatureFix(
return diagnosticWithParameters.psiElement as? JetFunctionLiteral
}
override fun createQuickFixData(element: JetFunctionLiteral, diagnostic: Diagnostic): Data? {
override fun extractFixData(element: JetFunctionLiteral, diagnostic: Diagnostic): Data? {
val descriptor = element.resolveToDescriptor() as? FunctionDescriptor ?: return null
val parameterTypes = Errors.EXPECTED_PARAMETERS_NUMBER_MISMATCH.cast(diagnostic).b
return Data(element, descriptor, parameterTypes)
}
override fun createQuickFix(data: Data)
override fun createFix(data: Data)
= ChangeFunctionLiteralSignatureFix(data.functionLiteral, data.descriptor, data.parameterTypes)
}
}
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt
+2 -2
View File
@@ -83,12 +83,12 @@ abstract class ChangeFunctionSignatureFix(
return diagnostic.psiElement.getNonStrictParentOfType<JetCallElement>()
}
override fun createQuickFixData(element: JetCallElement, diagnostic: Diagnostic): Data? {
override fun extractFixData(element: JetCallElement, diagnostic: Diagnostic): Data? {
val descriptor = DiagnosticFactory.cast(diagnostic, Errors.TOO_MANY_ARGUMENTS, Errors.NO_VALUE_FOR_PARAMETER).a
return Data(element, descriptor)
}
override fun createQuickFix(data: Data) = createFix(data.callElement, data.callElement, data.descriptor)
override fun createFix(data: Data) = createFix(data.callElement, data.callElement, data.descriptor)
private fun createFix(callElement: JetCallElement, context: PsiElement, descriptor: CallableDescriptor): ChangeFunctionSignatureFix? {
val functionDescriptor = when (descriptor) {
idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionFactoryWithDelegate.kt
+7 -7
View File
@@ -30,16 +30,16 @@ abstract class KotlinSingleIntentionActionFactoryWithDelegate<E : JetElement, D
private val isLowPriority: Boolean = false
) : KotlinIntentionActionFactoryWithDelegate<E, D>() {
protected abstract fun createQuickFix(data: D): IntentionAction?
protected abstract fun createFix(data: D): IntentionAction?
protected override final fun createQuickFixes(
protected override final fun createFixes(
originalElementPointer: SmartPsiElementPointer<E>,
diagnostic: Diagnostic,
quickFixDataFactory: () -> D?
): List<QuickFixWithDelegateFactory> {
fun createAction(): IntentionAction? {
val data = quickFixDataFactory() ?: return null
return createQuickFix(data)
return createFix(data)
}
val delegateFactory = if (isLowPriority)
@@ -53,13 +53,13 @@ abstract class KotlinSingleIntentionActionFactoryWithDelegate<E : JetElement, D
abstract class KotlinIntentionActionFactoryWithDelegate<E : JetElement, D : Any> : JetIntentionActionsFactory() {
protected abstract fun getElementOfInterest(diagnostic: Diagnostic): E?
protected abstract fun createQuickFixes(
protected abstract fun createFixes(
originalElementPointer: SmartPsiElementPointer<E>,
diagnostic: Diagnostic,
quickFixDataFactory: () -> D?
): List<QuickFixWithDelegateFactory>
protected abstract fun createQuickFixData(element: E, diagnostic: Diagnostic): D?
protected abstract fun extractFixData(element: E, diagnostic: Diagnostic): D?
override final fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction>? {
val diagnosticMessage = DefaultErrorMessages.render(diagnostic)
@@ -74,7 +74,7 @@ abstract class KotlinIntentionActionFactoryWithDelegate<E : JetElement, D : Any>
// Cache null values
var cachedData: Ref<D>? = null
val actions: List<QuickFixWithDelegateFactory> = try {
createQuickFixes(originalElementPointer, diagnostic) factory@ {
createFixes(originalElementPointer, diagnostic) factory@ {
val element = originalElementPointer.element ?: return@factory null
val diagnosticElement = diagnosticElementPointer.element ?: return@factory null
if (!diagnosticElement.isValid || !element.isValid) return@factory null
@@ -85,7 +85,7 @@ abstract class KotlinIntentionActionFactoryWithDelegate<E : JetElement, D : Any>
.forElement(diagnosticElement)
.firstOrNull { DefaultErrorMessages.render(it) == diagnosticMessage } ?: return@factory null
if (cachedData == null) {
cachedData = Ref(createQuickFixData(element, currentDiagnostic))
cachedData = Ref(extractFixData(element, currentDiagnostic))
}
cachedData!!.get()
}.filter { it.isAvailable(project, null, file) }
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt
+2 -2
View File
@@ -44,10 +44,10 @@ public abstract class CreateCallableMemberFromUsageFactory<E : JetElement>(
protected open fun createCallableInfo(element: E, diagnostic: Diagnostic): CallableInfo? = null
override fun createQuickFixData(element: E, diagnostic: Diagnostic): List<CallableInfo>
override fun extractFixData(element: E, diagnostic: Diagnostic): List<CallableInfo>
= createCallableInfo(element, diagnostic).singletonOrEmptyList()
override fun createQuickFixes(
override fun createFixes(
originalElementPointer: SmartPsiElementPointer<E>,
diagnostic: Diagnostic,
quickFixDataFactory: () -> List<CallableInfo>?
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreatePropertyDelegateAccessorsActionFactory.kt
+1 -1
View File
@@ -39,7 +39,7 @@ object CreatePropertyDelegateAccessorsActionFactory : CreateCallableMemberFromUs
return diagnostic.psiElement as? JetExpression
}
override fun createQuickFixData(element: JetExpression, diagnostic: Diagnostic): List<CallableInfo> {
override fun extractFixData(element: JetExpression, diagnostic: Diagnostic): List<CallableInfo> {
val context = element.analyze()
fun isApplicableForAccessor(accessor: PropertyAccessorDescriptor?): Boolean =
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt
+1 -1
View File
@@ -51,7 +51,7 @@ public object CreateClassFromCallWithConstructorCalleeActionFactory : CreateClas
return (if (element is JetAnnotationEntry) ClassKind.ANNOTATION_CLASS else ClassKind.PLAIN_CLASS).singletonList()
}
override fun createQuickFixData(element: JetCallElement, diagnostic: Diagnostic): ClassInfo? {
override fun extractFixData(element: JetCallElement, diagnostic: Diagnostic): ClassInfo? {
val isAnnotation = element is JetAnnotationEntry
val callee = element.calleeExpression as? JetConstructorCalleeExpression ?: return null
val calleeRef = callee.constructorReferenceExpression ?: return null
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt
+1 -1
View File
@@ -54,7 +54,7 @@ public object CreateClassFromConstructorCallActionFactory: CreateClassFromUsageF
return classKind.singletonList()
}
override fun createQuickFixData(element: JetCallExpression, diagnostic: Diagnostic): ClassInfo? {
override fun extractFixData(element: JetCallExpression, diagnostic: Diagnostic): ClassInfo? {
val diagElement = diagnostic.psiElement
if (diagElement.getNonStrictParentOfType<JetTypeReference>() != null) return null
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt
+1 -1
View File
@@ -111,7 +111,7 @@ public object CreateClassFromReferenceExpressionActionFactory : CreateClassFromU
}
}
override fun createQuickFixData(element: JetSimpleNameExpression, diagnostic: Diagnostic): ClassInfo? {
override fun extractFixData(element: JetSimpleNameExpression, diagnostic: Diagnostic): ClassInfo? {
val file = element.containingFile as? JetFile ?: return null
val name = element.getReferencedName()
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt
+1 -1
View File
@@ -58,7 +58,7 @@ public object CreateClassFromTypeReferenceActionFactory : CreateClassFromUsageFa
}
}
override fun createQuickFixData(element: JetUserType, diagnostic: Diagnostic): ClassInfo? {
override fun extractFixData(element: JetUserType, diagnostic: Diagnostic): ClassInfo? {
val name = element.referenceExpression?.getReferencedName() ?: return null
if (element.parent?.parent is JetConstructorCalleeExpression) return null
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFactory.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetElement
abstract class CreateClassFromUsageFactory<E : JetElement> : KotlinIntentionActionFactoryWithDelegate<E, ClassInfo>() {
protected abstract fun getPossibleClassKinds(element: E, diagnostic: Diagnostic): List<ClassKind>
override fun createQuickFixes(
override fun createFixes(
originalElementPointer: SmartPsiElementPointer<E>,
diagnostic: Diagnostic,
quickFixDataFactory: () -> ClassInfo?
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt
+1 -1
View File
@@ -36,7 +36,7 @@ public object CreateParameterByNamedArgumentActionFactory: CreateParameterFromUs
return if (argument.isNamed()) argument else null
}
override fun createQuickFixData(element: JetValueArgument, diagnostic: Diagnostic): CreateParameterData<JetValueArgument>? {
override fun extractFixData(element: JetValueArgument, diagnostic: Diagnostic): CreateParameterData<JetValueArgument>? {
val result = (diagnostic.psiFile as? JetFile)?.analyzeFullyAndGetResult() ?: return null
val context = result.bindingContext
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
+1 -1
View File
@@ -52,7 +52,7 @@ object CreateParameterByRefActionFactory : CreateParameterFromUsageFactory<JetSi
return refExpr
}
override fun createQuickFixData(
override fun extractFixData(
element: JetSimpleNameExpression,
diagnostic: Diagnostic
): CreateParameterData<JetSimpleNameExpression>? {
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt
+1 -1
View File
@@ -30,7 +30,7 @@ data class CreateParameterData<E : JetElement>(
)
abstract class CreateParameterFromUsageFactory<E : JetElement>: KotlinSingleIntentionActionFactoryWithDelegate<E, CreateParameterData<E>>() {
override fun createQuickFix(data: CreateParameterData<E>): IntentionAction? {
override fun createFix(data: CreateParameterData<E>): IntentionAction? {
return CreateParameterFromUsageFix(
data.parameterInfo.callableDescriptor as FunctionDescriptor,
data.parameterInfo,