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

Allow generate closed start tags and do not reorder specific tags

Browse Source
This commit is contained in:
Nikolay Krasko
2019-01-17 14:40:19 +03:00
parent 3548d25095
commit ad3114aa5f
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/TagsTestDataUtil.java
+20 -3
View File
@@ -68,11 +68,12 @@ public class TagsTestDataUtil {
String tagText; String tagText;
if (point.isStart) { if (point.isStart) {
String attributesString = point.getAttributesString(); String attributesString = point.getAttributesString();
String closeSuffix = point.isClosed ? "/" : "";
if (attributesString.isEmpty()) { if (attributesString.isEmpty()) {
tagText = String.format("<%s>", point.getName()); tagText = String.format("<%s%s>", point.getName(), closeSuffix);
} }
else { else {
tagText = String.format("<%s %s>", point.getName(), attributesString); tagText = String.format("<%s %s%s>", point.getName(), attributesString, closeSuffix);
} }
} }
else { else {
@@ -88,11 +89,23 @@ public class TagsTestDataUtil {
public static class TagInfo<Data> implements Comparable<TagInfo<?>> { public static class TagInfo<Data> implements Comparable<TagInfo<?>> {
protected final int offset; protected final int offset;
protected final boolean isStart; protected final boolean isStart;
protected final boolean isClosed;
protected final boolean isFixed;
protected final Data data; protected final Data data;
public TagInfo(int offset, boolean start, Data data) { public TagInfo(int offset, boolean start, Data data) {
this(offset, start, false, false, data);
}
public TagInfo(int offset, boolean isStart, boolean isClosed, boolean isFixed, Data data) {
if (isClosed && !isStart) {
throw new IllegalArgumentException("isClosed should be true only for start tags");
}
this.offset = offset; this.offset = offset;
isStart = start; this.isStart = isStart;
this.isClosed = isClosed;
this.isFixed = isFixed;
this.data = data; this.data = data;
} }
@@ -107,6 +120,10 @@ public class TagsTestDataUtil {
return isStart ? -1 : 1; return isStart ? -1 : 1;
} }
if (isFixed || other.isFixed) {
return 0;
}
String thisTag = this.getName(); String thisTag = this.getName();
String otherTag = other.getName(); String otherTag = other.getName();