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

Testing Framework: show highlighting keys when necessary in comparison results

Browse Source
This commit is contained in:
Anton Makeev
2014-11-04 11:44:23 +01:00
parent 976e36d4e3
commit 8728b05310
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java
+18 -4
View File
@@ -519,6 +519,16 @@ public class ExpectedHighlightingData {
}
});
boolean showAttributesKeys = false;
for (ExpectedHighlightingSet eachSet : types.values()) {
for (HighlightInfo eachInfo : eachSet.infos) {
if (eachInfo.forcedTextAttributesKey != null) {
showAttributesKeys = true;
break;
}
}
}
// sort filtered highlighting data by end offset in descending order
Collections.sort(list, new Comparator<Pair<String, HighlightInfo>>() {
@Override
@@ -547,14 +557,14 @@ public class ExpectedHighlightingData {
// combine highlighting data with original text
StringBuilder sb = new StringBuilder();
Couple<Integer> result = composeText(sb, list, 0, text, text.length(), 0);
Couple<Integer> result = composeText(sb, list, 0, text, text.length(), 0, showAttributesKeys);
sb.insert(0, text.substring(0, result.second));
return sb.toString();
}
private static Couple<Integer> composeText(StringBuilder sb,
List<Pair<String, HighlightInfo>> list, int index,
String text, int endPos, int startPos) {
String text, int endPos, int startPos, boolean showAttributesKeys) {
int i = index;
while (i < list.size()) {
Pair<String, HighlightInfo> pair = list.get(i);
@@ -570,12 +580,16 @@ public class ExpectedHighlightingData {
sb.insert(0, "</" + severity + ">");
endPos = info.endOffset;
if (prev != null && prev.endOffset > info.startOffset) {
Couple<Integer> result = composeText(sb, list, i + 1, text, endPos, info.startOffset);
Couple<Integer> result = composeText(sb, list, i + 1, text, endPos, info.startOffset, showAttributesKeys);
i = result.first - 1;
endPos = result.second;
}
sb.insert(0, text.substring(info.startOffset, endPos));
sb.insert(0, "<" + severity + " descr=\"" + info.getDescription() + "\">");
String str = "<" + severity + " descr=\"" + info.getDescription() + "\"";
if (showAttributesKeys) str += " textAttributesKey=\"" + info.forcedTextAttributesKey + "\"";
str += ">";
sb.insert(0, str);
endPos = info.startOffset;
i++;