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

Extract Function: Replace IDEA "Extract Method..." action with "Extract Function..."

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-02 14:39:08 +04:00
parent 07c19b1c9b
commit 1c0d1630e5
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+6 -1
View File
@@ -97,10 +97,15 @@
<add-to-group group-id="KotlinToolsGroup"/>
</action>
<action id="ExtractFunction" class="org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractFunctionAction"
text="Extract _Function..." use-shortcut-of="ExtractMethod">
<add-to-group group-id="IntroduceActionsGroup" anchor="after" relative-to-action="ExtractMethod"/>
</action>
<action id="ExtractFunctionToScope" class="org.jetbrains.jet.plugin.refactoring.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="ExtractMethod"/>
<add-to-group group-id="IntroduceActionsGroup" anchor="after" relative-to-action="ExtractFunction"/>
</action>
</actions>
idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java
+2 -2
View File
@@ -39,8 +39,8 @@ public class JetRefactoringSupportProvider extends RefactoringSupportProvider {
return new KotlinIntroduceVariableHandler();
}
@Override
public RefactoringActionHandler getExtractMethodHandler() {
@NotNull
public RefactoringActionHandler getExtractFunctionHandler() {
return new ExtractKotlinFunctionHandler();
}
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractFunctionToScopeAction.kt → idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractFunctionAction.kt
+14 -11
View File
@@ -23,20 +23,23 @@ import com.intellij.lang.refactoring.RefactoringSupportProvider
import org.jetbrains.jet.lang.psi.JetElement
import org.jetbrains.jet.plugin.refactoring.JetRefactoringSupportProvider
public class ExtractFunctionToScopeAction: BasePlatformRefactoringAction() {
public abstract class AbstractExtractFunctionAction: BasePlatformRefactoringAction() {
{
setInjectedContext(true)
}
override fun isAvailableInEditorOnly(): Boolean {
return true
}
override fun isAvailableInEditorOnly(): Boolean = true
protected override fun isEnabledOnElements(elements: Array<out PsiElement>): Boolean {
return elements.all { it is JetElement }
}
override fun getRefactoringHandler(provider: RefactoringSupportProvider): RefactoringActionHandler? {
return (provider as? JetRefactoringSupportProvider)?.getExtractFunctionToScopeHandler()
}
protected override fun isEnabledOnElements(elements: Array<out PsiElement>): Boolean =
elements.all { it is JetElement }
}
public class ExtractFunctionAction: AbstractExtractFunctionAction() {
override fun getRefactoringHandler(provider: RefactoringSupportProvider): RefactoringActionHandler? =
(provider as? JetRefactoringSupportProvider)?.getExtractFunctionHandler()
}
public class ExtractFunctionToScopeAction: AbstractExtractFunctionAction() {
override fun getRefactoringHandler(provider: RefactoringSupportProvider): RefactoringActionHandler? =
(provider as? JetRefactoringSupportProvider)?.getExtractFunctionToScopeHandler()
}