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

Fix moving of value parameters and arguments

Browse Source
This commit is contained in:
Alexey Sedunov
2013-06-04 15:35:43 +04:00
parent a78822ddba
commit 7805ee01eb
16 changed files with 200 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/AbstractCodeMoverTest.java
+10 -3
View File
@@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight.moveUpDown;
import com.intellij.codeInsight.editorActions.moveUpDown.MoveStatementDownAction;
import com.intellij.codeInsight.editorActions.moveUpDown.MoveStatementUpAction;
import com.intellij.codeInsight.editorActions.moveUpDown.StatementUpDownMover;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.actionSystem.EditorAction;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.testFramework.LightCodeInsightTestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.InTextDirectivesUtils;
@@ -83,9 +85,14 @@ public abstract class AbstractCodeMoverTest extends LightCodeInsightTestCase {
}
}
private void invokeAndCheck(@NotNull String path, boolean down) {
EditorAction action = down ? new MoveStatementDownAction() : new MoveStatementUpAction();
action.actionPerformed(getEditor(), getCurrentEditorDataContext());
private void invokeAndCheck(@NotNull String path, final boolean down) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
EditorAction action = down ? new MoveStatementDownAction() : new MoveStatementUpAction();
action.actionPerformed(getEditor(), getCurrentEditorDataContext());
}
});
checkResultByFile(path + ".after");
}
idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java
+30
View File
@@ -385,6 +385,36 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt");
}
@TestMetadata("valueArgs1.kt")
public void testValueArgs1() throws Exception {
doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs1.kt");
}
@TestMetadata("valueArgs2.kt")
public void testValueArgs2() throws Exception {
doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs2.kt");
}
@TestMetadata("valueArgs3.kt")
public void testValueArgs3() throws Exception {
doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs3.kt");
}
@TestMetadata("valueArgs4.kt")
public void testValueArgs4() throws Exception {
doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs4.kt");
}
@TestMetadata("valueArgs5.kt")
public void testValueArgs5() throws Exception {
doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs5.kt");
}
@TestMetadata("valueArgs6.kt")
public void testValueArgs6() throws Exception {
doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs6.kt");
}
@TestMetadata("valueParams1.kt")
public void testValueParams1() throws Exception {
doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt");