From cd2c9f2194e0c06faae2fd044a5a15a270570d0f Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 4 Mar 2015 17:48:01 +0300 Subject: [PATCH] Move package: extractFunction -> introduce --- idea/src/META-INF/plugin.xml | 4 ++-- .../evaluate/extractFunctionForDebuggerUtil.kt | 18 +++++++++--------- .../JetRefactoringSupportProvider.java | 4 ++-- .../extractFunction/ExtractFunctionAction.kt | 2 +- .../ExtractKotlinFunctionHandler.kt | 6 +++--- .../ExtractableCodeDescriptor.kt | 10 +++++----- .../extractFunction/ExtractionData.kt | 2 +- .../extractFunction/duplicateUtil.kt | 2 +- .../extractFunction/extractableAnalysisUtil.kt | 16 ++++++++-------- .../extractFunction/extractorUtil.kt | 12 ++++-------- .../ui/KotlinExtractFunctionDialog.form | 4 ++-- .../ui/KotlinExtractFunctionDialog.java | 4 ++-- .../ui/KotlinFunctionSignatureComponent.kt | 2 +- .../ui/KotlinParameterTablePanel.java | 4 ++-- .../AbstractJetExtractionTest.kt | 14 +++++++------- 15 files changed, 50 insertions(+), 54 deletions(-) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/ExtractFunctionAction.kt (96%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/ExtractKotlinFunctionHandler.kt (97%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/ExtractableCodeDescriptor.kt (97%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/ExtractionData.kt (99%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/duplicateUtil.kt (98%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/extractableAnalysisUtil.kt (98%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/extractorUtil.kt (97%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/ui/KotlinExtractFunctionDialog.form (96%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/ui/KotlinExtractFunctionDialog.java (98%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/ui/KotlinFunctionSignatureComponent.kt (93%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{ => introduce}/extractFunction/ui/KotlinParameterTablePanel.java (98%) diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index a1830afacb4..1ff7591eb61 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -96,7 +96,7 @@ - @@ -125,7 +125,7 @@ - diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt index 8c39e25e231..fdff74380c9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt @@ -17,25 +17,25 @@ package org.jetbrains.kotlin.idea.debugger.evaluate import com.intellij.psi.PsiFile -import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult -import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.ErrorMessage +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.AnalysisResult +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.AnalysisResult.ErrorMessage import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.idea.refactoring.createTempCopy import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionData -import org.jetbrains.kotlin.idea.refactoring.extractFunction.performAnalysis -import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.Status +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractionData +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.performAnalysis +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.AnalysisResult.Status import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil -import org.jetbrains.kotlin.idea.refactoring.extractFunction.validate -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionOptions +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.validate +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractionOptions import org.jetbrains.kotlin.idea.util.application.runReadAction import com.intellij.psi.PsiManager import com.intellij.psi.impl.PsiModificationTrackerImpl import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionGeneratorOptions -import org.jetbrains.kotlin.idea.refactoring.extractFunction.generateDeclaration +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractionGeneratorOptions +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.generateDeclaration import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode import org.jetbrains.kotlin.psi.psiUtil.replaced diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringSupportProvider.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringSupportProvider.java index cfaeb8bebc1..747f5bd6ca9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringSupportProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringSupportProvider.java @@ -23,8 +23,8 @@ import com.intellij.refactoring.changeSignature.ChangeSignatureHandler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureHandler; -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractKotlinFunctionHandler; -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractKotlinFunctionHandlerHelper; +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler; +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandlerHelper; import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinIntroduceVariableHandler; import org.jetbrains.kotlin.idea.refactoring.safeDelete.SafeDeletePackage; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractFunctionAction.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractFunctionAction.kt similarity index 96% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractFunctionAction.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractFunctionAction.kt index fec9cdf2325..29d8265ebbd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractFunctionAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractFunctionAction.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction import com.intellij.refactoring.actions.BasePlatformRefactoringAction import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt similarity index 97% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt index 23803f442fa..e90b5f82329 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction import com.intellij.refactoring.RefactoringActionHandler import com.intellij.openapi.actionSystem.DataContext @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil import com.intellij.refactoring.HelpID import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ui.KotlinExtractFunctionDialog +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.KotlinExtractFunctionDialog import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetElement @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.psi.JetBlockExpression import kotlin.test.fail -import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.Status +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.AnalysisResult.Status import com.intellij.openapi.ui.popup.JBPopupFactory import com.intellij.openapi.ui.MessageType import javax.swing.event.HyperlinkEvent diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractableCodeDescriptor.kt similarity index 97% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractableCodeDescriptor.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractableCodeDescriptor.kt index b9b9e75c89b..ead68871f6c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractableCodeDescriptor.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.psi.JetPsiFactory @@ -31,9 +31,9 @@ import org.jetbrains.kotlin.psi.psiUtil.replaced import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.psi.JetTypeParameter import org.jetbrains.kotlin.psi.JetTypeConstraint -import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.Status +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.AnalysisResult.Status import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle -import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.ErrorMessage +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.AnalysisResult.ErrorMessage import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetDeclaration @@ -45,9 +45,9 @@ import org.jetbrains.kotlin.types.CommonSupertypes import java.util.Collections import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.ExpressionValue import org.jetbrains.kotlin.psi.JetReturnExpression -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.Jump +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValue.ExpressionValue +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValue.Jump import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.types.TypeUtils import kotlin.properties.Delegates diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractionData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractionData.kt similarity index 99% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractionData.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractionData.kt index df24c2651fb..f8c8a182eb7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractionData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractionData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/duplicateUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/duplicateUtil.kt similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/duplicateUtil.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/duplicateUtil.kt index 0aa8f25a6c2..6c50730f33d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/duplicateUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/duplicateUtil.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange import com.intellij.openapi.application.ApplicationManager diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/extractableAnalysisUtil.kt similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractableAnalysisUtil.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/extractableAnalysisUtil.kt index fb5278d92e7..50eedbe9f62 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/extractableAnalysisUtil.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction import com.intellij.psi.PsiElement import org.jetbrains.kotlin.types.* @@ -42,8 +42,8 @@ import org.jetbrains.kotlin.utils.DFS.* import com.intellij.refactoring.util.RefactoringUIUtil import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.diagnostics.Errors -import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.Status -import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.ErrorMessage +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.AnalysisResult.Status +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.AnalysisResult.ErrorMessage import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.* import org.jetbrains.kotlin.cfg.pseudocode.instructions.* import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.* @@ -55,12 +55,12 @@ import org.jetbrains.kotlin.resolve.bindingContextUtil.getTargetFunctionDescript import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsStatement import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.idea.imports.importableFqNameSafe -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.Initializer -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.ParameterUpdate -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.ExpressionValue -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.Jump +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValue.Initializer +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValue.ParameterUpdate +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValue.ExpressionValue +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValue.Jump import org.jetbrains.kotlin.cfg.pseudocodeTraverser.traverseFollowingInstructions -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValueBoxer.AsList +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValueBoxer.AsList import org.jetbrains.kotlin.idea.refactoring.getContextForContainingDeclarationBody import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/extractorUtil.kt similarity index 97% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/extractorUtil.kt index 1135b0abb35..d86d557726f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/extractorUtil.kt @@ -14,19 +14,16 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction import com.intellij.psi.PsiElement import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester import org.jetbrains.kotlin.idea.refactoring.JetNameValidatorImpl -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.ExpressionValue -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.Initializer -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.Jump -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.ParameterUpdate -import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValueBoxer.AsTuple -import org.jetbrains.kotlin.idea.refactoring.isMultiLine +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValue.* import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers +import org.jetbrains.kotlin.idea.refactoring.isMultiLine +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValueBoxer.AsTuple import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange.Match @@ -44,7 +41,6 @@ import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.types.JetType -import org.jetbrains.kotlin.types.TypeUtils import java.util.ArrayList import java.util.Collections import java.util.HashMap diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.form b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form similarity index 96% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.form rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form index f97eb3c14d8..88418efbe75 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.form +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form @@ -1,5 +1,5 @@ -
+ @@ -53,7 +53,7 @@ - + diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java index a106bf457ef..e20541891f3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction.ui; +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui; import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentEvent; @@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.RefactoringPackage; -import org.jetbrains.kotlin.idea.refactoring.extractFunction.*; +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.*; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import javax.swing.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinFunctionSignatureComponent.kt similarity index 93% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinFunctionSignatureComponent.kt index b1e74a5e9ec..8299817c295 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinFunctionSignatureComponent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction.ui +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui import com.intellij.openapi.project.Project import org.jetbrains.kotlin.idea.JetFileType diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinParameterTablePanel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinParameterTablePanel.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java index 38cc9cf9193..823aaa86e4e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ui/KotlinParameterTablePanel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.extractFunction.ui; +package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui; import com.intellij.ui.BooleanTableCellRenderer; import com.intellij.ui.TableUtil; @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester; -import org.jetbrains.kotlin.idea.refactoring.extractFunction.Parameter; +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.Parameter; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt index dc84f6b5edc..afdf59ef729 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable import com.intellij.ide.DataManager import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractKotlinFunctionHandler +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler import java.io.File -import org.jetbrains.kotlin.idea.refactoring.extractFunction.selectElements +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.selectElements import org.jetbrains.kotlin.psi.JetTreeVisitorVoid import com.intellij.psi.PsiComment import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException @@ -32,13 +32,13 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer import kotlin.test.assertEquals import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractKotlinFunctionHandlerHelper -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionGeneratorOptions -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractableCodeDescriptor +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandlerHelper +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractionGeneratorOptions +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractableCodeDescriptor import org.jetbrains.kotlin.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.PluginTestCaseBase -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionData -import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionOptions +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractionData +import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractionOptions import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.PsiWhiteSpace