Skip to content

Commit c5a0d2c

Browse files
committed
fix: another minor markup fix
1 parent 97b429d commit c5a0d2c

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

twinkle-text/src/main/java/org/codejive/twinkle/fluent/impl/DefaultMarkupParser.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class DefaultMarkupParser implements MarkupParser {
2323
private static Map<String, Color.BasicColor> colors;
2424

2525
private static final Pattern markupPattern = Pattern.compile("(?<!\\{)\\{([^{}]+)}");
26-
private static final Pattern varPattern = Pattern.compile("(?<!\\$)\\$(/?\\d+)");
26+
private static final Pattern varPattern = Pattern.compile("(?<!\\$)\\$(\\d+)");
2727

2828
@Override
2929
public void parse(Fluent fluent, String textWithMarkup, Object... args) {
@@ -95,11 +95,7 @@ private String applySubstitutions(String markup, Object... args) {
9595

9696
protected void applyVar(Appendable appendable, String varName, Object... args) {
9797
try {
98-
if (varName.startsWith("/")) {
99-
appendable.append("/").append(getVar(varName.substring(1), args));
100-
} else {
101-
appendable.append(getVar(varName, args));
102-
}
98+
appendable.append(getVar(varName, args));
10399
} catch (IOException e) {
104100
// Ignore
105101
}

twinkle-text/src/test/java/org/codejive/twinkle/fluent/TestDefaultMarkupParser.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,4 +448,11 @@ public void testTextWithArgumentInMarkup() {
448448
s.parse("{i}{$1}{/i}", "bold");
449449
assertThat(s.result()).isEqualTo(Ansi.italic() + Ansi.bold() + Ansi.italicOff());
450450
}
451+
452+
@Test
453+
public void testTextWithArgumentInMarkup2() {
454+
Setup s = new Setup();
455+
s.parse("{i}{/$1}{/i}", "ul");
456+
assertThat(s.result()).isEqualTo(Ansi.italic() + Ansi.underlinedOff() + Ansi.italicOff());
457+
}
451458
}

0 commit comments

Comments
 (0)