Merge remote-tracking branch 'origin/master'

# Conflicts: # VERSION.md # flexmark/flexmark.iml
vsch · Sep 21, 2016 · 0cf7005 · 0cf7005
2 parents a550892 + d9e0e9a
commit 0cf7005
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/flexmark-java.wiki b/flexmark-java.wiki
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/ast/Node.java b/flexmark-util/src/main/java/com/vladsch/flexmark/ast/Node.java
@@ -239,7 +239,7 @@ public String toString() {
     }
 
     public void getAstExtra(StringBuilder out) {
-        return;
+
     }
 
     public void astExtraChars(StringBuilder out) {
@@ -360,7 +360,7 @@ public static void segmentSpan(StringBuilder out, int startOffset, int endOffset
     }
 
     public static void segmentSpanChars(StringBuilder out, int startOffset, int endOffset, String name, String chars) {
-        segmentSpanChars(out,startOffset,endOffset, name, chars, "", "");
+        segmentSpanChars(out, startOffset, endOffset, name, chars, "", "");
     }
 
     public static void segmentSpanChars(StringBuilder out, int startOffset, int endOffset, String name, String chars1, String splice, String chars2) {
@@ -404,7 +404,7 @@ private static void escapeJavaString(StringBuilder out, String chars) {
                     break;
                 default:
                     if (c < ' ') {
-                        out.append('%').append(String.format("%02x",(int)c));
+                        out.append('%').append(String.format("%02x", (int) c));
                     } else {
                         out.append(c);
                     }
@@ -433,9 +433,12 @@ public static void delimitedSegmentSpan(StringBuilder out, BasedSequence opening
     }
 
     public static void delimitedSegmentSpanChars(StringBuilder out, BasedSequence openingSequence, BasedSequence sequence, BasedSequence closingSequence, String name) {
-        if (openingSequence.isNotNull()) segmentSpanChars(out, openingSequence.getStartOffset(), openingSequence.getEndOffset(), name + "Open", openingSequence.toString());
-        if (sequence.isNotNull()) segmentSpanChars(out, sequence.getStartOffset(), sequence.getEndOffset(), name, sequence.toVisibleWhitespaceString());
-        if (closingSequence.isNotNull()) segmentSpanChars(out, closingSequence.getStartOffset(), closingSequence.getEndOffset(), name + "Close", closingSequence.toString());
+        if (openingSequence.isNotNull())
+            segmentSpanChars(out, openingSequence.getStartOffset(), openingSequence.getEndOffset(), name + "Open", openingSequence.toString());
+        if (sequence.isNotNull())
+            segmentSpanChars(out, sequence.getStartOffset(), sequence.getEndOffset(), name, sequence.toVisibleWhitespaceString());
+        if (closingSequence.isNotNull())
+            segmentSpanChars(out, closingSequence.getStartOffset(), closingSequence.getEndOffset(), name + "Close", closingSequence.toString());
     }
 
     public void takeChildren(Node node) {

diff --git a/flexmark/flexmark.iml b/flexmark/flexmark.iml
@@ -22,6 +22,7 @@
     <orderEntry type="library" scope="TEST" name="org.openjdk.jmh:jmh-generator-annprocess:1.12" level="project" />
     <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="project" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
+    <orderEntry type="module" module-name="flexmark-util" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="module" module-name="flexmark-util" />
@@ -30,4 +31,4 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-math3:3.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.openjdk.jmh:jmh-generator-annprocess:1.12" level="project" />
   </component>
-</module>
+</module>