|
1 | 1 | package org.commonmark.renderer.text; |
2 | 2 |
|
3 | | -import org.commonmark.internal.renderer.text.BulletListHolder; |
4 | | -import org.commonmark.internal.renderer.text.ListHolder; |
5 | | -import org.commonmark.internal.renderer.text.OrderedListHolder; |
6 | 3 | import org.commonmark.node.*; |
7 | 4 | import org.commonmark.renderer.NodeRenderer; |
8 | 5 |
|
@@ -161,19 +158,30 @@ public void visit(Link link) { |
161 | 158 | @Override |
162 | 159 | public void visit(ListItem listItem) { |
163 | 160 | if (listHolder != null && listHolder instanceof OrderedListHolder) { |
164 | | - OrderedListHolder orderedListHolder = (OrderedListHolder) listHolder; |
165 | | - String indent = stripNewlines() ? "" : orderedListHolder.getIndent(); |
166 | | - textContent.write(indent + orderedListHolder.getCounter() + orderedListHolder.getDelimiter() + " "); |
| 161 | + var orderedListHolder = (OrderedListHolder) listHolder; |
| 162 | + var marker = orderedListHolder.getCounter() + orderedListHolder.getDelimiter(); |
| 163 | + var spaces = " "; |
| 164 | + textContent.write(marker); |
| 165 | + textContent.write(spaces); |
| 166 | + textContent.pushPrefix(repeat(" ", marker.length() + spaces.length())); |
167 | 167 | visitChildren(listItem); |
168 | 168 | textContent.block(); |
| 169 | + textContent.popPrefix(); |
169 | 170 | orderedListHolder.increaseCounter(); |
170 | 171 | } else if (listHolder != null && listHolder instanceof BulletListHolder) { |
171 | 172 | BulletListHolder bulletListHolder = (BulletListHolder) listHolder; |
172 | 173 | if (!stripNewlines()) { |
173 | | - textContent.write(bulletListHolder.getIndent() + bulletListHolder.getMarker() + " "); |
| 174 | + var marker = bulletListHolder.getMarker(); |
| 175 | + var spaces = " "; |
| 176 | + textContent.write(marker); |
| 177 | + textContent.write(spaces); |
| 178 | + textContent.pushPrefix(repeat(" ", marker.length() + spaces.length())); |
174 | 179 | } |
175 | 180 | visitChildren(listItem); |
176 | 181 | textContent.block(); |
| 182 | + if (!stripNewlines()) { |
| 183 | + textContent.popPrefix(); |
| 184 | + } |
177 | 185 | } |
178 | 186 | } |
179 | 187 |
|
@@ -268,4 +276,61 @@ private static String stripTrailingNewline(String s) { |
268 | 276 | return s; |
269 | 277 | } |
270 | 278 | } |
| 279 | + |
| 280 | + // Keep for Android compat (String.repeat only available on Android 12 and later) |
| 281 | + private static String repeat(String s, int count) { |
| 282 | + var sb = new StringBuilder(s.length() * count); |
| 283 | + for (int i = 0; i < count; i++) { |
| 284 | + sb.append(s); |
| 285 | + } |
| 286 | + return sb.toString(); |
| 287 | + } |
| 288 | + |
| 289 | + private static class BulletListHolder extends ListHolder { |
| 290 | + private final String marker; |
| 291 | + |
| 292 | + public BulletListHolder(ListHolder parent, BulletList list) { |
| 293 | + super(parent); |
| 294 | + marker = list.getMarker(); |
| 295 | + } |
| 296 | + |
| 297 | + public String getMarker() { |
| 298 | + return marker; |
| 299 | + } |
| 300 | + } |
| 301 | + |
| 302 | + private abstract static class ListHolder { |
| 303 | + private final ListHolder parent; |
| 304 | + |
| 305 | + ListHolder(ListHolder parent) { |
| 306 | + this.parent = parent; |
| 307 | + } |
| 308 | + |
| 309 | + public ListHolder getParent() { |
| 310 | + return parent; |
| 311 | + } |
| 312 | + } |
| 313 | + |
| 314 | + private static class OrderedListHolder extends ListHolder { |
| 315 | + private final String delimiter; |
| 316 | + private int counter; |
| 317 | + |
| 318 | + public OrderedListHolder(ListHolder parent, OrderedList list) { |
| 319 | + super(parent); |
| 320 | + delimiter = list.getMarkerDelimiter() != null ? list.getMarkerDelimiter() : "."; |
| 321 | + counter = list.getMarkerStartNumber() != null ? list.getMarkerStartNumber() : 1; |
| 322 | + } |
| 323 | + |
| 324 | + public String getDelimiter() { |
| 325 | + return delimiter; |
| 326 | + } |
| 327 | + |
| 328 | + public int getCounter() { |
| 329 | + return counter; |
| 330 | + } |
| 331 | + |
| 332 | + public void increaseCounter() { |
| 333 | + counter++; |
| 334 | + } |
| 335 | + } |
271 | 336 | } |
0 commit comments