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

IDEA-CR-39880: Refactoring: extracted duplicated code

Browse Source
This commit is contained in:
Alexey Merkulov
2018-12-13 18:17:39 +03:00
parent d8e4166b0d
commit 11a4a71e09
1 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java
+27 -31
View File
@@ -437,26 +437,14 @@ public class ExpectedHighlightingData {
}
public void checkResult(Collection<HighlightInfo> infos, String text, @Nullable String filePath) {
String fileName = myFile == null ? "" : myFile.getName() + ": ";
StringBuilder failMessage = new StringBuilder();
for (HighlightInfo info : reverseCollection(infos)) {
if (!expectedInfosContainsInfo(info) && !myIgnoreExtraHighlighting) {
int startOffset = info.startOffset;
int endOffset = info.endOffset;
String s = text.substring(startOffset, endOffset);
String desc = info.getDescription();
if (failMessage.length() > 0) {
failMessage.append('\n');
if (!myIgnoreExtraHighlighting) {
for (HighlightInfo info : reverseCollection(infos)) {
if (!expectedInfosContainsInfo(info)) {
reportProblem(failMessage, text, info, "extra ");
failMessage.append(" [").append(info.type).append(']');
}
failMessage.append(fileName).append("extra ")
.append(rangeString(text, startOffset, endOffset))
.append(": '").append(s).append('\'');
if (desc != null) {
failMessage.append(" (").append(desc).append(')');
}
failMessage.append(" [").append(info.type).append(']');
}
}
@@ -465,20 +453,7 @@ public class ExpectedHighlightingData {
Set<HighlightInfo> expInfos = highlightingSet.infos;
for (HighlightInfo expectedInfo : expInfos) {
if (!infosContainsExpectedInfo(infos, expectedInfo) && highlightingSet.enabled) {
int startOffset = expectedInfo.startOffset;
int endOffset = expectedInfo.endOffset;
String s = text.substring(startOffset, endOffset);
String desc = expectedInfo.getDescription();
if (failMessage.length() > 0) {
failMessage.append('\n');
}
failMessage.append(fileName).append("missing ")
.append(rangeString(text, startOffset, endOffset))
.append(": '").append(s).append('\'');
if (desc != null) {
failMessage.append(" (").append(desc).append(")");
}
reportProblem(failMessage, text, expectedInfo, "missing ");
}
}
}
@@ -496,6 +471,27 @@ public class ExpectedHighlightingData {
}
}
private void reportProblem(@NotNull StringBuilder failMessage,
@NotNull String text,
@NotNull HighlightInfo info,
@NotNull String messageType) {
String fileName = myFile == null ? "" : myFile.getName() + ": ";
int startOffset = info.startOffset;
int endOffset = info.endOffset;
String s = text.substring(startOffset, endOffset);
String desc = info.getDescription();
if (failMessage.length() > 0) {
failMessage.append('\n');
}
failMessage.append(fileName).append(messageType)
.append(rangeString(text, startOffset, endOffset))
.append(": '").append(s).append('\'');
if (desc != null) {
failMessage.append(" (").append(desc).append(')');
}
}
private static <T> List<T> reverseCollection(Collection<T> infos) {
return ContainerUtil.reverse(infos instanceof List ? (List<T>)infos : new ArrayList<>(infos));
}