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

Move check with selection tags to base check

Browse Source
This commit is contained in:
Nikolay Krasko
2018-12-12 18:21:08 +03:00
parent 06dad5f45b
commit 0482fe9414
8 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+12 -2
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -634,8 +635,17 @@ public class KotlinTestUtils {
}
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor) {
String actualText = editor.getDocument().getText();
String afterText = new StringBuilder(actualText).insert(editor.getCaretModel().getOffset(), "<caret>").toString();
Caret caret = editor.getCaretModel().getCurrentCaret();
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
String afterText = TagsTestDataUtil.insertTagsInText(
Lists.<TagsTestDataUtil.TagInfo>newArrayList(
new TagsTestDataUtil.TagInfo<>(caret.getOffset(), true, "caret"),
new TagsTestDataUtil.TagInfo<>(selectionStart, true, "selection"),
new TagsTestDataUtil.TagInfo<>(selectionEnd, false, "selection")),
editor.getDocument().getText()
);
assertEqualsToFile(expectedFile, afterText);
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173
+12 -2
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -629,8 +630,17 @@ public class KotlinTestUtils {
}
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor) {
String actualText = editor.getDocument().getText();
String afterText = new StringBuilder(actualText).insert(editor.getCaretModel().getOffset(), "<caret>").toString();
Caret caret = editor.getCaretModel().getCurrentCaret();
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
String afterText = TagsTestDataUtil.insertTagsInText(
Lists.<TagsTestDataUtil.TagInfo>newArrayList(
new TagsTestDataUtil.TagInfo<>(caret.getOffset(), true, "caret"),
new TagsTestDataUtil.TagInfo<>(selectionStart, true, "selection"),
new TagsTestDataUtil.TagInfo<>(selectionEnd, false, "selection")),
editor.getDocument().getText()
);
assertEqualsToFile(expectedFile, afterText);
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
+12 -2
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -629,8 +630,17 @@ public class KotlinTestUtils {
}
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor) {
String actualText = editor.getDocument().getText();
String afterText = new StringBuilder(actualText).insert(editor.getCaretModel().getOffset(), "<caret>").toString();
Caret caret = editor.getCaretModel().getCurrentCaret();
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
String afterText = TagsTestDataUtil.insertTagsInText(
Lists.<TagsTestDataUtil.TagInfo>newArrayList(
new TagsTestDataUtil.TagInfo<>(caret.getOffset(), true, "caret"),
new TagsTestDataUtil.TagInfo<>(selectionStart, true, "selection"),
new TagsTestDataUtil.TagInfo<>(selectionEnd, false, "selection")),
editor.getDocument().getText()
);
assertEqualsToFile(expectedFile, afterText);
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
+12 -2
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -629,8 +630,17 @@ public class KotlinTestUtils {
}
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor) {
String actualText = editor.getDocument().getText();
String afterText = new StringBuilder(actualText).insert(editor.getCaretModel().getOffset(), "<caret>").toString();
Caret caret = editor.getCaretModel().getCurrentCaret();
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
String afterText = TagsTestDataUtil.insertTagsInText(
Lists.<TagsTestDataUtil.TagInfo>newArrayList(
new TagsTestDataUtil.TagInfo<>(caret.getOffset(), true, "caret"),
new TagsTestDataUtil.TagInfo<>(selectionStart, true, "selection"),
new TagsTestDataUtil.TagInfo<>(selectionEnd, false, "selection")),
editor.getDocument().getText()
);
assertEqualsToFile(expectedFile, afterText);
}
idea/tests/org/jetbrains/kotlin/test/TagsTestDataUtil.java → compiler/tests-common/tests/org/jetbrains/kotlin/test/TagsTestDataUtil.java
View File
idea/testData/joinLines/addSemicolon/FunctionCallsWithMutlineSeparator.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
fun foo() {
println()<caret>
println()<selection><caret></selection>
println()
}
idea/testData/joinLines/removeBraces/FunctionWithOneLineReturn.kt.after
Vendored
+1 -1
View File
@@ -1 +1 @@
fun foo(): Int =<caret> 1
fun foo(): Int =<selection><caret></selection> 1
idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java
+1 -20
View File
@@ -16,9 +16,6 @@
package org.jetbrains.kotlin.idea;
import com.google.common.collect.Lists;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Editor;
import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
@@ -26,7 +23,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TagsTestDataUtil;
import java.io.File;
@@ -183,21 +179,6 @@ public class WordSelectionTest extends KotlinLightCodeInsightFixtureTestCase {
}
private void wrapToFileComparisonFailure(String failedFilePath) {
Editor editor = myFixture.getEditor();
Caret caret = editor.getCaretModel().getCurrentCaret();
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
String actualText = TagsTestDataUtil.insertTagsInText(
Lists.<TagsTestDataUtil.TagInfo>newArrayList(
new TagsTestDataUtil.TagInfo<String>(caret.getOffset(), true, "caret"),
new TagsTestDataUtil.TagInfo<String>(selectionStart, true, "selection"),
new TagsTestDataUtil.TagInfo<String>(selectionEnd, false, "selection")),
editor.getDocument().getText()
);
KotlinTestUtils.assertEqualsToFile(new File(failedFilePath), actualText);
KotlinTestUtils.assertEqualsToFile(new File(failedFilePath), myFixture.getEditor());
}
}