From 0f43d4d07ce3e2e8bcc9dd7c921cb481417adf30 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 29 Sep 2014 15:07:15 +0400 Subject: [PATCH] Create From Usage: Move callable builder to separate package --- .../{createFunction => callableBuilder}/CallableBuilder.kt | 5 ++--- .../{createFunction => callableBuilder}/CallableInfo.kt | 2 +- .../templateExpressions.kt | 2 +- .../{createFunction => callableBuilder}/typeUtils.kt | 4 ++-- .../createFunction/CreateBinaryOperationActionFactory.kt | 1 + .../createFunction/CreateComponentFunctionActionFactory.kt | 1 + .../createFunction/CreateFunctionFromCallActionFactory.kt | 1 + .../createFunction/CreateFunctionFromUsageFix.kt | 1 + .../createFunction/CreateGetFunctionActionFactory.kt | 1 + .../createFunction/CreateHasNextFunctionActionFactory.kt | 1 + .../createFunction/CreateInvokeFunctionActionFactory.kt | 1 + .../createFunction/CreateIteratorFunctionActionFactory.kt | 1 + .../createFunction/CreateNextFunctionActionFactory.kt | 1 + .../createFunction/CreateSetFunctionActionFactory.kt | 1 + .../createFunction/CreateUnaryOperationActionFactory.kt | 1 + 15 files changed, 17 insertions(+), 7 deletions(-) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{createFunction => callableBuilder}/CallableBuilder.kt (99%) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{createFunction => callableBuilder}/CallableInfo.kt (98%) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{createFunction => callableBuilder}/templateExpressions.kt (98%) rename idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/{createFunction => callableBuilder}/typeUtils.kt (97%) diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CallableBuilder.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CallableBuilder.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 6e0b397ade9..d037248d7bc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CallableBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder import com.intellij.codeInsight.navigation.NavigationUtil import com.intellij.codeInsight.template.* @@ -53,10 +53,9 @@ import org.jetbrains.jet.plugin.refactoring.CollectingValidator import org.jetbrains.jet.plugin.util.isUnit import com.intellij.util.ArrayUtil import com.intellij.psi.PsiWhiteSpace -import org.jetbrains.jet.plugin.refactoring.isMultiLine -import org.jetbrains.jet.plugin.refactoring.getLineCount import com.intellij.psi.PsiElement import org.jetbrains.jet.lexer.JetTokens +import org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.util.application.runWriteAction private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList" diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CallableInfo.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CallableInfo.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt index ba2204050ea..1c396eee270 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CallableInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder import java.util.Collections import org.jetbrains.jet.lang.psi.JetExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/templateExpressions.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/templateExpressions.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt index 01fd990387d..061ed849ea3 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/templateExpressions.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder import com.intellij.codeInsight.template.Expression import com.intellij.codeInsight.template.ExpressionContext diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/typeUtils.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/typeUtils.kt rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt index 6acea0c9c44..280095fcbea 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/typeUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -1,4 +1,4 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor @@ -70,7 +70,7 @@ private fun JetType.getTypeParameters(): Set { return typeParameters } -private fun JetExpression.guessTypes(context: BindingContext): Array { +fun JetExpression.guessTypes(context: BindingContext): Array { // if we know the actual type of the expression val theType1 = context[BindingContext.EXPRESSION_TYPE, this] if (theType1 != null) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt index d5b76b5cecd..d23b8f0ad98 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt @@ -10,6 +10,7 @@ import org.jetbrains.jet.lang.types.Variance import java.util.Collections import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lexer.JetTokens +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* public object CreateBinaryOperationActionFactory: JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt index 34fd520db3f..73bf54915ed 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt @@ -9,6 +9,7 @@ import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.jet.lang.psi.JetMultiDeclaration import org.jetbrains.jet.lang.psi.JetForExpression import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateComponentFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromCallActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromCallActionFactory.kt index cd3e5b33a1f..d4fd95c71b2 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromCallActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromCallActionFactory.kt @@ -14,6 +14,7 @@ import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.scopes.receivers.Qualifier +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateFunctionFromCallActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt index 7b176117f69..bdd1c7a6cd6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt @@ -13,6 +13,7 @@ import org.jetbrains.jet.lang.psi.JetClassOrObject import org.jetbrains.jet.plugin.refactoring.chooseContainerElementIfNecessary import org.jetbrains.jet.plugin.refactoring.getExtractionContainers import org.jetbrains.jet.lang.psi.JetClassBody +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* public class CreateFunctionFromUsageFix(element: PsiElement, val functionInfo: CallableInfo) : CreateFromUsageFixBase(element) { override fun getText(): String { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt index 3c5522bbee6..fd181870527 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt @@ -6,6 +6,7 @@ import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.jet.lang.psi.JetArrayAccessExpression import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateGetFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt index 38e8777ec87..a1ead783cd6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt @@ -9,6 +9,7 @@ import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.jet.lang.psi.JetForExpression import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateHasNextFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt index a4804b48228..56962c3e1a1 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt @@ -9,6 +9,7 @@ import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.psi.JetCallExpression import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.diagnostics.Errors +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateInvokeFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt index a11b03d4657..fe0918c8f74 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt @@ -13,6 +13,7 @@ import org.jetbrains.jet.plugin.caches.resolve.getBindingContext import org.jetbrains.jet.lang.types.TypeProjectionImpl import java.util.Collections import org.jetbrains.jet.lang.types.JetTypeImpl +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateIteratorFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt index a80854d71c4..7bb9ce6be0f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt @@ -9,6 +9,7 @@ import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.jet.lang.psi.JetForExpression +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateNextFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt index 101c4777c3c..c6164102c0a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt @@ -9,6 +9,7 @@ import org.jetbrains.jet.lang.types.Variance import java.util.ArrayList import org.jetbrains.jet.lang.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateSetFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt index 53dcf1ea101..63a95dcc595 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt @@ -10,6 +10,7 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression import org.jetbrains.jet.lang.types.Variance import java.util.Collections import org.jetbrains.jet.lang.psi.JetUnaryExpression +import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* public object CreateUnaryOperationActionFactory: JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? {