Skip to content

Commit 149ec0f

Browse files
committed
Renamed prefixDelimReplace to prefixDelimiterReplace - unnecessary abbreviation.
1 parent 62fed8f commit 149ec0f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/main/java/com/diffplug/freshmark/FreshMark.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public String compileSection(String section, String program, String input) {
6161
.set("link").toFunc2(FreshMark::link)
6262
.set("image").toFunc2(FreshMark::image)
6363
.set("shield").toFunc4(FreshMark::shield)
64-
.set("prefixDelimReplace").toFunc4(FreshMark::prefixDelimReplace)
64+
.set("prefixDelimiterReplace").toFunc4(FreshMark::prefixDelimiterReplace)
6565
.buildTyped(Language.nashorn());
6666

6767
// apply the templating engine to the program
@@ -108,11 +108,11 @@ private static String shieldEscape(String raw) {
108108
}
109109

110110
/** Replaces everything between the */
111-
static String prefixDelimReplace(String input, String prefix, String delim, String replacement) {
111+
static String prefixDelimiterReplace(String input, String prefix, String delimiter, String replacement) {
112112
StringBuilder builder = new StringBuilder(input.length() * 3 / 2);
113113

114114
int lastElement = 0;
115-
Pattern pattern = Pattern.compile("(.*?" + Pattern.quote(prefix) + ")(.*?)(" + Pattern.quote(delim) + ")", Pattern.DOTALL);
115+
Pattern pattern = Pattern.compile("(.*?" + Pattern.quote(prefix) + ")(.*?)(" + Pattern.quote(delimiter) + ")", Pattern.DOTALL);
116116
Matcher matcher = pattern.matcher(input);
117117
while (matcher.find()) {
118118
builder.append(matcher.group(1));

src/test/java/com/diffplug/freshmark/FreshMarkTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class FreshMarkTest {
2929
public void testPrefixDelimReplacement() {
3030
String before = TestResource.getTestResource("javadoc_before.txt");
3131
String after = TestResource.getTestResource("javadoc_after.txt");
32-
String afterActual = FreshMark.prefixDelimReplace(before, "https://diffplug.github.io/durian/javadoc/", "/", "4.0");
32+
String afterActual = FreshMark.prefixDelimiterReplace(before, "https://diffplug.github.io/durian/javadoc/", "/", "4.0");
3333
Assert.assertEquals(after, afterActual);
3434
}
3535

src/test/resources/full_after.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ output = [
2121
Guava has become indispensable for many Java developers. Because of its wide adoption, it must be conservative regarding its minimum requirements.
2222

2323
<!---freshmark javadoc
24-
output = prefixDelimReplace(input, 'https://{{org}}.github.io/{{name}}/javadoc/', '/', stable)
24+
output = prefixDelimiterReplace(input, 'https://{{org}}.github.io/{{name}}/javadoc/', '/', stable)
2525
-->
2626
Durian complements Guava with some features which are too spiky for Guava, such as:
2727
* [One-liner exception handling](test/com/diffplug/common/base/ErrorsExample.java?ts=4) for Java 8 functional interfaces (even with checked exceptions).

src/test/resources/full_before.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ output = [
2121
Guava has become indispensable for many Java developers. Because of its wide adoption, it must be conservative regarding its minimum requirements.
2222

2323
<!---freshmark javadoc
24-
output = prefixDelimReplace(input, 'https://{{org}}.github.io/{{name}}/javadoc/', '/', stable)
24+
output = prefixDelimiterReplace(input, 'https://{{org}}.github.io/{{name}}/javadoc/', '/', stable)
2525
-->
2626
Durian complements Guava with some features which are too spiky for Guava, such as:
2727
* [One-liner exception handling](test/com/diffplug/common/base/ErrorsExample.java?ts=4) for Java 8 functional interfaces (even with checked exceptions).

0 commit comments

Comments
 (0)