Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#512: Changed from Set to List to store HTML node renderer handlers i… #514

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ public HtmlConverterState getState() {
for (int i = nodeRendererFactories.size() - 1; i >= 0; i--) {
HtmlNodeRendererFactory htmlNodeRendererFactory = nodeRendererFactories.get(i);
HtmlNodeRenderer htmlNodeRenderer = htmlNodeRendererFactory.apply(this.myOptions);
Set<HtmlNodeRendererHandler<?>> formattingHandlers = htmlNodeRenderer.getHtmlNodeRendererHandlers();
List<HtmlNodeRendererHandler<?>> formattingHandlers = htmlNodeRenderer.getHtmlNodeRendererHandlers();
if (formattingHandlers == null) continue;

for (HtmlNodeRendererHandler<?> nodeType : formattingHandlers) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vladsch.flexmark.html2md.converter;

import java.util.Set;
import java.util.List;

/**
* A renderer for a set of node types.
Expand All @@ -9,5 +9,5 @@ public interface HtmlNodeRenderer {
/**
* @return the mapping of nodes this renderer handles to rendering function
*/
Set<HtmlNodeRendererHandler<?>> getHtmlNodeRendererHandlers();
List<HtmlNodeRendererHandler<?>> getHtmlNodeRendererHandlers();
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public Set<HtmlConverterPhase> getHtmlConverterPhases() {
}

@Override
public Set<HtmlNodeRendererHandler<?>> getHtmlNodeRendererHandlers() {
HashSet<HtmlNodeRendererHandler<? extends Node>> result = new HashSet<>(Arrays.asList(
public List<HtmlNodeRendererHandler<?>> getHtmlNodeRendererHandlers() {
List<HtmlNodeRendererHandler<? extends Node>> result = new ArrayList<>(Arrays.asList(
// Generic unknown node formatter
new HtmlNodeRendererHandler<>(FlexmarkHtmlConverter.COMMENT_NODE, Comment.class, this::processComment),
new HtmlNodeRendererHandler<>(FlexmarkHtmlConverter.A_NODE, Element.class, this::processA),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package com.vladsch.flexmark.html2md.converter;

import com.vladsch.flexmark.util.data.DataHolder;

import com.vladsch.flexmark.util.data.MutableDataSet;

import org.junit.Test;

import static com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter.UNWRAPPED_TAGS;
import static org.junit.Assert.assertEquals;

public class HtmlNodeRendererHandlerTest {
@Test
public void overrideDefinitionListRendererHandler() {
String markdown;
int incorrect = 0;

DataHolder flexmarkOptions = new MutableDataSet()
.set(UNWRAPPED_TAGS, new String[]{"article", "address", "frameset", "section", "small", "iframe",
"dl", "dt", "dd",})
.toImmutable();
FlexmarkHtmlConverter converter = FlexmarkHtmlConverter.builder(flexmarkOptions).build();

for (int i = 0; i < 10000; i++) {
String html = "<dl id=\"definition-list\">\n" +
"<div>\n" +
"<dt></dt>\n" +
"<dd>Data 1</dd>\n" +
"<span>\n" +
"<dd>Data 2</dd>\n" +
"</span>\n" +
"</div>\n" +
"</dl>";

markdown = converter.convert(html);

if (!markdown.contains("Data 2")) {
incorrect++;
}
}

assertEquals(0, incorrect);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

public class HtmlToMarkdownCustomizedSample {
Expand Down Expand Up @@ -77,8 +78,8 @@ public CustomHtmlNodeConverter(DataHolder options) {
}

@Override
public Set<HtmlNodeRendererHandler<?>> getHtmlNodeRendererHandlers() {
return new HashSet<>(Collections.singletonList(
public List<HtmlNodeRendererHandler<?>> getHtmlNodeRendererHandlers() {
return new ArrayList<>(Collections.singletonList(
new HtmlNodeRendererHandler<>("kbd", Element.class, this::processKbd)
));
}
Expand Down