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

Add UI options for comments generation (KT-5590)

Browse Source 
#KT-5590 Fixed
This commit is contained in:
Nikolay Krasko
2018-12-21 16:06:32 +03:00
parent 3eb4895acf
commit 5a40fc8679
17 changed files with 256 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+16 -9
View File
@@ -635,18 +635,25 @@ public class KotlinTestUtils {
}
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor) {
Caret caret = editor.getCaretModel().getCurrentCaret();
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
assertEqualsToFile(expectedFile, editor, true);
}
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()
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor, Boolean enableSelectionTags) {
Caret caret = editor.getCaretModel().getCurrentCaret();
List<TagsTestDataUtil.TagInfo> tags = Lists.newArrayList(
new TagsTestDataUtil.TagInfo<>(caret.getOffset(), true, "caret")
);
if (enableSelectionTags) {
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
tags.add(new TagsTestDataUtil.TagInfo<>(selectionStart, true, "selection"));
tags.add(new TagsTestDataUtil.TagInfo<>(selectionEnd, false, "selection"));
}
String afterText = TagsTestDataUtil.insertTagsInText(tags, editor.getDocument().getText());
assertEqualsToFile(expectedFile, afterText);
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173
+16 -9
View File
@@ -631,18 +631,25 @@ public class KotlinTestUtils {
}
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor) {
Caret caret = editor.getCaretModel().getCurrentCaret();
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
assertEqualsToFile(expectedFile, editor, true);
}
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()
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor, Boolean enableSelectionTags) {
Caret caret = editor.getCaretModel().getCurrentCaret();
List<TagsTestDataUtil.TagInfo> tags = Lists.newArrayList(
new TagsTestDataUtil.TagInfo<>(caret.getOffset(), true, "caret")
);
if (enableSelectionTags) {
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
tags.add(new TagsTestDataUtil.TagInfo<>(selectionStart, true, "selection"));
tags.add(new TagsTestDataUtil.TagInfo<>(selectionEnd, false, "selection"));
}
String afterText = TagsTestDataUtil.insertTagsInText(tags, editor.getDocument().getText());
assertEqualsToFile(expectedFile, afterText);
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
+16 -9
View File
@@ -631,18 +631,25 @@ public class KotlinTestUtils {
}
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor) {
Caret caret = editor.getCaretModel().getCurrentCaret();
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
assertEqualsToFile(expectedFile, editor, true);
}
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()
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor, Boolean enableSelectionTags) {
Caret caret = editor.getCaretModel().getCurrentCaret();
List<TagsTestDataUtil.TagInfo> tags = Lists.newArrayList(
new TagsTestDataUtil.TagInfo<>(caret.getOffset(), true, "caret")
);
if (enableSelectionTags) {
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
tags.add(new TagsTestDataUtil.TagInfo<>(selectionStart, true, "selection"));
tags.add(new TagsTestDataUtil.TagInfo<>(selectionEnd, false, "selection"));
}
String afterText = TagsTestDataUtil.insertTagsInText(tags, editor.getDocument().getText());
assertEqualsToFile(expectedFile, afterText);
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
+16 -9
View File
@@ -631,18 +631,25 @@ public class KotlinTestUtils {
}
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor) {
Caret caret = editor.getCaretModel().getCurrentCaret();
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
assertEqualsToFile(expectedFile, editor, true);
}
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()
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull Editor editor, Boolean enableSelectionTags) {
Caret caret = editor.getCaretModel().getCurrentCaret();
List<TagsTestDataUtil.TagInfo> tags = Lists.newArrayList(
new TagsTestDataUtil.TagInfo<>(caret.getOffset(), true, "caret")
);
if (enableSelectionTags) {
int selectionStart = caret.getSelectionStart();
int selectionEnd = caret.getSelectionEnd();
tags.add(new TagsTestDataUtil.TagInfo<>(selectionStart, true, "selection"));
tags.add(new TagsTestDataUtil.TagInfo<>(selectionEnd, false, "selection"));
}
String afterText = TagsTestDataUtil.insertTagsInText(tags, editor.getDocument().getText());
assertEqualsToFile(expectedFile, afterText);
}