coradoc-adoc 2.0.32 → 2.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451e2ccdd5dbbd4771079ee9bdc1041c3ee0d3ff74847237d7f3d4aea5064031
-  data.tar.gz: 9f161020aca1c07565f9f20c510114b562925cbfb55d4666db14f1d61a68ed81
+  metadata.gz: 70861dce3318bead6c8153bfa44090dc2da49a1f9889cb517dcdb559a4eaeb9c
+  data.tar.gz: 94b397c634354792bb99678f71d3fc15221cb1f7feb42894d514e96c644f47f1
 SHA512:
-  metadata.gz: 20150d6a118ae76db46737ca68c47b87a1195cd716ee88700de2afdb06094dd3edee9c66a5b224702e20c6333d28c4082d9840e24b590210154abe46643aad7a
-  data.tar.gz: a881fc61dd3bce4e276f3db93fd250d3cf0cd0ab18a2e93a296887a416070b43b0da61972818e79ff0d7c00bd9f4af6320bb8cae8976402fff8519943ce05299
+  metadata.gz: f2283331458aaae5a07cd9f135aa3e8e2a6b09f9e7df12336233dd43313c2dc4775e988ef49ef23428a131019fb00c3feaaf0127b9f7521e222fc460c12b5c83
+  data.tar.gz: 7c0cc22f6919a661e4d17adf687611ae7c2194bd4bf3dd7184ba073bc44e7e38ab716e20764affab27d97b7536f4caac02151ad170dde5c531871588ea7f643f

data/lib/coradoc/asciidoc/parser/list.rb

@@ -17,21 +17,56 @@ module Coradoc
           line_start? >> str("+\n")
         end
 
+        # Single source of truth for "what can appear between consecutive
+        # list items without ending the list". Asciidoctor treats blank
+        # lines and `//` comment lines as non-terminating inside every
+        # list type. Comments are consumed without capture — they are
+        # structurally invisible inside a list (no CommentLine node is
+        # emitted). Tag directives (`// tag::`) keep their separate
+        # handling via `comment_line_content`'s `tag.absent?` guard.
+        def list_item_separator
+          (comment_line_content | empty_line).repeat(0)
+        end
+
+        # Single source of truth for "what block can attach to a list
+        # item via a `+` continuation marker". The `+` line is consumed
+        # by {#list_item_attached}; this rule expresses only the block
+        # that follows. Definition lists are intentionally excluded —
+        # `+` before a continuing dlist run is handled inside
+        # `dlist_item` as a continuation marker so the run nests by
+        # delimiter depth (see there).
+        def list_attached_block
+          admonition_line | unordered_list(1) | ordered_list(1) | paragraph | block
+        end
+
+        # Shared `+`-continuation attachment for every list item type
+        # (ulist, olist, dlist). A `+` line directly followed by an
+        # attached block becomes a child of the current item. The
+        # `list_continuation.present?` lookahead prevents greedy
+        # over-match when the `+` actually belongs to surrounding
+        # context.
+        def list_item_attached
+          (list_continuation.present? >>
+             list_continuation >>
+             list_attached_block
+          ).repeat(0).as(:attached)
+        end
+
         def ordered_list(nesting_level = 1)
           attrs = (attribute_list >> newline).maybe
           r = olist_item(nesting_level)
-          attrs >> (empty_line.repeat(0) >> r).repeat(1).as(:ordered)
+          attrs >> (list_item_separator >> r).repeat(1).as(:ordered)
         end
 
         def unordered_list(nesting_level = 1)
           attrs = (attribute_list >> newline).maybe
           r = ulist_item(nesting_level)
-          attrs >> (empty_line.repeat(0) >> r).repeat(1).as(:unordered)
+          attrs >> (list_item_separator >> r).repeat(1).as(:unordered)
         end
 
         def definition_list(_delimiter = nil)
           (attribute_list >> newline).maybe >>
-            dlist_item.repeat(1).as(:definition_list) >>
+            (list_item_separator >> dlist_item).repeat(1).as(:definition_list) >>
             dlist_item.absent?
         end
 
@@ -56,11 +91,7 @@ module Coradoc
                  (list_body_text_line >>
                   list_item_continuation_lines).as(:lines)
 
-          att = (list_continuation.present? >>
-                  list_continuation >>
-                  (admonition_line | paragraph | block)
-                ).repeat(0).as(:attached)
-          item >>= att.maybe
+          item >>= list_item_attached.maybe
 
           if nesting_level <= 4
             item >>= (list_marker(nesting_level + 1).present? >>
@@ -108,11 +139,7 @@ module Coradoc
                  (list_body_text_line >>
                   list_item_continuation_lines).as(:lines)
 
-          att = (list_continuation.present? >>
-                  list_continuation >>
-                  (admonition_line | paragraph | block)
-                ).repeat(0).as(:attached)
-          item >>= att.maybe
+          item >>= list_item_attached.maybe
 
           if nesting_level <= 4
             item >>= (list_marker(nesting_level + 1).present? >>
@@ -273,11 +300,14 @@ module Coradoc
 
           item = multi_line | inline
 
-          attached = (list_continuation.present? >>
-                       list_continuation >>
-                       (admonition_line | paragraph | block)
-                     ).repeat(0).as(:attached)
-          item >>= attached.maybe
+          item >>= list_item_attached.maybe
+
+          # A `+` line directly before a continuing dlist run is a
+          # list-continuation marker (asciidoctor semantics): consume it
+          # so the following items stay in the current list and nest by
+          # delimiter depth. Without this, the `+` dangles and the run
+          # splits off as a detached sibling list.
+          item >>= (list_continuation >> dlist_item.present?).repeat(0)
 
           item.as(:definition_list_item)
         end

data/lib/coradoc/asciidoc/parser/text.rb

@@ -121,6 +121,26 @@ module Coradoc
           ).as(:block_image)
         end
 
+        # Non-capturing form of {#comment_line}. Same shape (a `//`
+        # comment line, excluding tag directives like `// tag::`), but
+        # consumes without producing an AST node.
+        #
+        # Used by list rules to absorb inter-item comments so the list
+        # continues across them — asciidoctor treats `//` comments inside
+        # any list as structurally invisible. Uses raw character matchers
+        # instead of `text` so no inner captures leak into the consuming
+        # rule's AST.
+        #
+        # Single source of truth for the comment-line shape: any future
+        # adjustment to the `//`-line grammar happens here and both the
+        # capturing and non-capturing forms stay in sync.
+        def comment_line_content
+          tag.absent? >>
+            str('//') >> str('/').absent? >>
+            space? >>
+            match('[^\n]').repeat(0) >> line_ending
+        end
+
         def comment_line
           tag.absent? >>
             (str('//') >> str('/').absent? >>

data/lib/coradoc/asciidoc/transform/element_transformers/list_transformer.rb

@@ -114,14 +114,17 @@ module Coradoc
 
             def transform_list_item(item)
               content_val = item.content
-              children = ToCoreModel.transform_inline_content(content_val)
+              inline_children = ToCoreModel.transform_inline_content(content_val)
+              attached_children = Array(item.attached).filter_map do |block|
+                ToCoreModel.transform(block)
+              end
 
               li = Coradoc::CoreModel::ListItem.new(
                 content: ToCoreModel.extract_text_content(content_val),
                 marker: item.marker,
                 source_line: item.source_line
               )
-              li.children = children
+              li.children = inline_children + attached_children
 
               nested_lists = extract_nested_lists(item)
               li.nested_list = nested_lists.first if nested_lists.size == 1

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.32'
+    VERSION = '2.0.33'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-adoc
 version: !ruby/object:Gem::Version
-  version: 2.0.32
+  version: 2.0.33
 platform: ruby
 authors:
 - Ribose Inc.