Move package: extractFunction -> introduce

idea/src/META-INF/plugin.xml

@@ -96,7 +96,7 @@
       <add-to-group group-id="KotlinToolsGroup"/>
     </action>
 
-    <action id="ExtractFunction" class="org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractFunctionAction"
+    <action id="ExtractFunction" class="org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractFunctionAction"
             text="Extract _Function..." use-shortcut-of="ExtractMethod">
       <add-to-group group-id="IntroduceActionsGroup" anchor="after" relative-to-action="ExtractMethod"/>
     </action>
@@ -125,7 +125,7 @@
       <add-to-group group-id="KotlinToolsGroup" anchor="last"/>
     </action>
 
-    <action id="ExtractFunctionToScope" class="org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractFunctionToScopeAction"
+    <action id="ExtractFunctionToScope" class="org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractFunctionToScopeAction"
             text="Extract Function to _Scope...">
       <keyboard-shortcut keymap="$default" first-keystroke="control alt shift M"/>
       <add-to-group group-id="IntroduceActionsGroup" anchor="after" relative-to-action="ExtractFunction"/>

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.introduce.extractFunction.AnalysisResult
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.ErrorMessage
+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.introduce.extractFunction.ExtractionData
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.performAnalysis
+import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.performAnalysis
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.Status
+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.introduce.extractFunction.validate
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionOptions
+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.introduce.extractFunction.ExtractionGeneratorOptions
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.generateDeclaration
+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

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.introduce.extractFunction.ExtractKotlinFunctionHandler;
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractKotlinFunctionHandlerHelper;
+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.*;

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

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

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

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

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

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.introduce.extractFunction.AnalysisResult.Status
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.ErrorMessage
+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.introduce.extractFunction.OutputValue.Initializer
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.ParameterUpdate
+import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValue.ParameterUpdate
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.ExpressionValue
+import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.OutputValue.ExpressionValue
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.Jump
+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

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.introduce.extractFunction.OutputValue.*
-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.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

idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.refactoring.extractFunction.ui.KotlinExtractFunctionDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.KotlinExtractFunctionDialog">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
@@ -53,7 +53,7 @@
             <properties/>
             <border type="none" title="Signature Preview"/>
             <children>
-              <component id="7722b" class="org.jetbrains.kotlin.idea.refactoring.extractFunction.ui.KotlinFunctionSignatureComponent" binding="signaturePreviewField" custom-create="true">
+              <component id="7722b" class="org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.KotlinFunctionSignatureComponent" binding="signaturePreviewField" custom-create="true">
                 <constraints>
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
                     <minimum-size width="500" height="100"/>

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.*;

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

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;
 

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.introduce.extractFunction.ExtractKotlinFunctionHandlerHelper
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionGeneratorOptions
+import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractionGeneratorOptions
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractableCodeDescriptor
+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.introduce.extractFunction.ExtractionData
-import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionOptions
+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