MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

WEB-34683 Multiline TODOs for JavaScript/TypeScript

Browse Source
This commit is contained in:
Anton Lobov
2018-09-07 11:27:08 +02:00
parent 5561cb9bc7
commit 812b56052e
2 changed files with 87 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/java/todo/JavaMultiLineTodoTest.java
+5 -73
View File
@@ -1,21 +1,10 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.java.todo;
import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.impl.DocumentImpl;
import com.intellij.openapi.util.Segment;
import com.intellij.openapi.util.TextRange;
import com.intellij.testFramework.EditorTestUtil;
import com.intellij.codeInsight.daemon.todo.TodoItemsTestCase;
import com.intellij.ide.highlighter.JavaFileType;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
public class JavaMultiLineTodoTest extends LightDaemonAnalyzerTestCase {
public class JavaMultiLineTodoTest extends TodoItemsTestCase {
public void testSuccessiveLineComments() {
testTodos("// [TODO first line]\n" +
"// [second line]");
@@ -67,65 +56,8 @@ public class JavaMultiLineTodoTest extends LightDaemonAnalyzerTestCase {
"}");
}
private void testTodos(String text) {
configureFromFileText("Foo.java", text);
EditorTestUtil.setEditorVisibleSize(myEditor, 1000, 1000); // set visible area for highlighting
List<TextRange> expectedTodoRanges = extractExpectedTodoRanges(myEditor.getDocument());
List<HighlightInfo> highlightInfos = doHighlighting();
List<TextRange> actualTodoRanges = getActualTodoRanges(highlightInfos);
assertTodoRanges(expectedTodoRanges, actualTodoRanges);
}
private void checkTodos(String text) {
DocumentImpl document = new DocumentImpl(text);
List<TextRange> expectedTodoRanges = extractExpectedTodoRanges(document);
List<HighlightInfo> highlightInfos = doHighlighting();
checkResultByText(document.getText());
List<TextRange> actualTodoRanges = getActualTodoRanges(highlightInfos);
assertTodoRanges(expectedTodoRanges, actualTodoRanges);
}
private static List<TextRange> extractExpectedTodoRanges(Document document) {
ArrayList<TextRange> result = new ArrayList<>();
int offset = 0;
int startPos;
while ((startPos = document.getText().indexOf('[', offset)) != -1) {
int finalStartPos = startPos;
WriteCommandAction.runWriteCommandAction(ourProject, () -> document.deleteString(finalStartPos, finalStartPos + 1));
int endPos = document.getText().indexOf(']', startPos);
if (endPos == -1) break;
WriteCommandAction.runWriteCommandAction(ourProject, () -> document.deleteString(endPos, endPos + 1));
result.add(new TextRange(startPos, endPos));
}
return result;
}
private static List<TextRange> getActualTodoRanges(List<HighlightInfo> highlightInfos) {
return highlightInfos.stream()
.filter(info -> info.type == HighlightInfoType.TODO)
.map(info -> TextRange.create(info.getHighlighter()))
.sorted(Segment.BY_START_OFFSET_THEN_END_OFFSET)
.collect(Collectors.toList());
}
private static void assertTodoRanges(List<TextRange> expectedTodoRanges, List<TextRange> actualTodoRanges) {
assertEquals("Unexpected todos highlihghting", generatePresentation(expectedTodoRanges), generatePresentation(actualTodoRanges));
}
private static String generatePresentation(List<TextRange> ranges) {
StringBuilder b = new StringBuilder(myEditor.getDocument().getText());
int prevStart = Integer.MAX_VALUE;
for (int i = ranges.size() - 1; i >= 0; i--) {
TextRange r = ranges.get(i);
assertTrue(r.getEndOffset() <= prevStart);
b.insert(r.getEndOffset(), ']');
b.insert(prevStart = r.getStartOffset(), '[');
}
return b.toString();
}
@Override
protected boolean doInspections() {
return false;
protected String getFileExtension() {
return JavaFileType.DEFAULT_EXTENSION;
}
}
java/testFramework/src/com/intellij/codeInsight/daemon/todo/TodoItemsTestCase.java
+82
View File
@@ -0,0 +1,82 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.daemon.todo;
import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.impl.DocumentImpl;
import com.intellij.openapi.util.Segment;
import com.intellij.openapi.util.TextRange;
import com.intellij.testFramework.EditorTestUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
public abstract class TodoItemsTestCase extends LightDaemonAnalyzerTestCase {
protected abstract String getFileExtension();
protected void testTodos(String text) {
configureFromFileText("Foo." + getFileExtension(), text);
EditorTestUtil.setEditorVisibleSize(myEditor, 1000, 1000); // set visible area for highlighting
List<TextRange> expectedTodoRanges = extractExpectedTodoRanges(myEditor.getDocument());
List<HighlightInfo> highlightInfos = doHighlighting();
List<TextRange> actualTodoRanges = getActualTodoRanges(highlightInfos);
assertTodoRanges(expectedTodoRanges, actualTodoRanges);
}
protected void checkTodos(String text) {
DocumentImpl document = new DocumentImpl(text);
List<TextRange> expectedTodoRanges = extractExpectedTodoRanges(document);
List<HighlightInfo> highlightInfos = doHighlighting();
checkResultByText(document.getText());
List<TextRange> actualTodoRanges = getActualTodoRanges(highlightInfos);
assertTodoRanges(expectedTodoRanges, actualTodoRanges);
}
private static List<TextRange> extractExpectedTodoRanges(Document document) {
ArrayList<TextRange> result = new ArrayList<>();
int offset = 0;
int startPos;
while ((startPos = document.getText().indexOf('[', offset)) != -1) {
int finalStartPos = startPos;
WriteCommandAction.runWriteCommandAction(ourProject, () -> document.deleteString(finalStartPos, finalStartPos + 1));
int endPos = document.getText().indexOf(']', startPos);
if (endPos == -1) break;
WriteCommandAction.runWriteCommandAction(ourProject, () -> document.deleteString(endPos, endPos + 1));
result.add(new TextRange(startPos, endPos));
}
return result;
}
private static List<TextRange> getActualTodoRanges(List<HighlightInfo> highlightInfos) {
return highlightInfos.stream()
.filter(info -> info.type == HighlightInfoType.TODO)
.map(info -> TextRange.create(info.getHighlighter()))
.sorted(Segment.BY_START_OFFSET_THEN_END_OFFSET)
.collect(Collectors.toList());
}
private static void assertTodoRanges(List<TextRange> expectedTodoRanges, List<TextRange> actualTodoRanges) {
assertEquals("Unexpected todos highlighting", generatePresentation(expectedTodoRanges), generatePresentation(actualTodoRanges));
}
private static String generatePresentation(List<TextRange> ranges) {
StringBuilder b = new StringBuilder(myEditor.getDocument().getText());
int prevStart = Integer.MAX_VALUE;
for (int i = ranges.size() - 1; i >= 0; i--) {
TextRange r = ranges.get(i);
assertTrue(r.getEndOffset() <= prevStart);
b.insert(r.getEndOffset(), ']');
b.insert(prevStart = r.getStartOffset(), '[');
}
return b.toString();
}
@Override
protected boolean doInspections() {
return false;
}
}