qiita_marker 0.23.5.0 → 0.23.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15bfc4813af77558d6c0b4ffbb931229e00d558d0c417048b636ce7c27ac31a7
-  data.tar.gz: af9febe461508838d294f9d2d20dfe896c30c467b82b50b36924040c7287c070
+  metadata.gz: 343d2a549df9aee75c4bb3890307425d9a82251a2dfe46826afd6f8a8bfcb245
+  data.tar.gz: bf76c480df59b28e13cace472228b3ca39a60d9ce3406a866125f347c18689c1
 SHA512:
-  metadata.gz: 2fc608ddea2a044b4c64b9f32e8dbc44cf838213f6c67e9457f36fa303b7223a20c932a261e3f21fac256ceab34d018b9c6d9757ce86eecf250a3aefa585407b
-  data.tar.gz: 66b65a1652e9a0904423490cb8999de85d21928f169f72965ca2b90bc32cfadda46193662ebdae70dea6bcb5819a349256a24911f53c65d168bd9285db107968
+  metadata.gz: 0c8c25dda4cadad88e855c84fa02d42de53c54c87665ca6b5530483a78b57e100b3df9869fe1f451faf16679a5de3ed7c6f630c9568258fdb559fd0d255cb2e2
+  data.tar.gz: d0927839957a98673181f2235f8a4e16a6ddfc2fa5bb88259d0cb7723bf925472e8214f98aa5ede40a24d3420af48b8b8e877472278efeb683eba80c171edd92

data/ext/qiita_marker/blocks.c

@@ -22,6 +22,7 @@
 #include "houdini.h"
 #include "buffer.h"
 #include "footnotes.h"
+#include "qfm_custom_block.h"
 
 #define CODE_INDENT 4
 #define TAB_STOP 4
@@ -289,7 +290,9 @@ static cmark_node *finalize(cmark_parser *parser, cmark_node *b) {
     b->end_column = parser->last_line_length;
   } else if (S_type(b) == CMARK_NODE_DOCUMENT ||
              (S_type(b) == CMARK_NODE_CODE_BLOCK && b->as.code.fenced) ||
-             (S_type(b) == CMARK_NODE_HEADING && b->as.heading.setext)) {
+             (S_type(b) == CMARK_NODE_HEADING && b->as.heading.setext) ||
+             /* For make the sourcepos of the `qfm_custom_block` accurate */
+             (cmark_node_get_type(b) == CMARK_NODE_QFM_CUSTOM_BLOCK)) {
     b->end_line = parser->line_number;
     b->end_column = parser->curline.size;
     if (b->end_column && parser->curline.ptr[b->end_column - 1] == '\n')

data/ext/qiita_marker/qfm_custom_block.c

@@ -6,14 +6,13 @@
 #include "houdini.h"
 #include "qfm_custom_block.h"
 #include "qfm_scanners.h"
-#include "strikethrough.h"
 
 cmark_node_type CMARK_NODE_QFM_CUSTOM_BLOCK;
 
 typedef struct {
+  /* info: Text following the opening custom block fence (optional). This is
+   * trimmed of leading and trailing whitespace. */
   cmark_chunk info;
-  bool opening;
-  cmark_strbuf *xml_attr_buff;
 } node_qfm_custom_block;
 
 static void escape_html(cmark_strbuf *dest, const unsigned char *source,
@@ -21,33 +20,6 @@ static void escape_html(cmark_strbuf *dest, const unsigned char *source,
   houdini_escape_html0(dest, source, length, 0);
 }
 
-static bool get_qfm_custom_block_opening(cmark_node *node) {
-  if (node == NULL) {
-    return false;
-  }
-
-  cmark_node_type node_type = cmark_node_get_type(node);
-  if (node_type == CMARK_NODE_QFM_CUSTOM_BLOCK) {
-    return ((node_qfm_custom_block *)node->as.opaque)->opening;
-  } else {
-    return false;
-  }
-}
-
-static bool set_qfm_custom_block_opening(cmark_node *node, bool opening) {
-  if (node == NULL) {
-    return false;
-  }
-
-  cmark_node_type node_type = cmark_node_get_type(node);
-  if (node_type == CMARK_NODE_QFM_CUSTOM_BLOCK) {
-    ((node_qfm_custom_block *)node->as.opaque)->opening = opening;
-    return true;
-  } else {
-    return false;
-  }
-}
-
 static cmark_chunk *get_qfm_custom_block_info(cmark_node *node) {
   if (node == NULL) {
     return NULL;
@@ -81,26 +53,21 @@ static void free_node_qfm_custom_block(cmark_mem *mem, void *ptr) {
   node_qfm_custom_block *cb = (node_qfm_custom_block *)ptr;
 
   cmark_chunk_free(mem, &cb->info);
-  cmark_strbuf_free(cb->xml_attr_buff);
   mem->free(cb);
 }
 
+/* Now, a custom block can contain another custom block, but this behavior is
+ * not a specification. */
 static int matches(cmark_syntax_extension *self, cmark_parser *parser,
                    unsigned char *input, int len,
                    cmark_node *parent_container) {
-  int res = 0;
-
-  if (get_qfm_custom_block_opening(parent_container)) {
-    bufsize_t matched = scan_close_qfm_custom_block_fence(
-        input, len, cmark_parser_get_first_nonspace(parser));
+  int res = 1;
+  bufsize_t matched = scan_close_qfm_custom_block_fence(
+      input, len, cmark_parser_get_first_nonspace(parser));
 
-    if (matched > 0) {
-      set_qfm_custom_block_opening(parent_container, false);
-      cmark_parser_advance_offset(parser, (char *)input,
-                                  len - cmark_parser_get_offset(parser), 0);
-    } else {
-      res = 1;
-    }
+  if (matched > 0) {
+    cmark_parser_advance_offset(parser, (char *)input, matched, 0);
+    res = 0;
   }
 
   return res;
@@ -120,21 +87,34 @@ static cmark_node *try_opening_qfm_custom_block_block(
 
     cmark_node *custom_block_node = cmark_parser_add_child(
         parser, parent_container, CMARK_NODE_QFM_CUSTOM_BLOCK,
-        parser->first_nonspace_column);
+        parser->first_nonspace + 1);
     custom_block_node->as.opaque = (node_qfm_custom_block *)parser->mem->calloc(
         1, sizeof(node_qfm_custom_block));
 
     cmark_strbuf *info = parser->mem->calloc(1, sizeof(cmark_strbuf));
-    cmark_strbuf_init(parser->mem, info, len - matched);
-    cmark_strbuf_put(info, input + matched, len - matched);
-    cmark_strbuf_trim(info);
+    bufsize_t info_startpos = cmark_parser_get_first_nonspace(parser) + matched;
+
+    /* Length from after opening custom block fence to before newline character.
+     */
+    bufsize_t info_len = len - info_startpos;
+    if (info_len > 0 && input[len - 1] == '\n') {
+      info_len -= 1;
+    }
+    if (info_len > 0 && input[len - 1] == '\r') {
+      info_len -= 1;
+    }
 
-    set_qfm_custom_block_opening(custom_block_node, true);
+    cmark_strbuf_init(parser->mem, info, info_len);
+    cmark_strbuf_put(info, input + info_startpos, info_len);
+    cmark_strbuf_trim(info);
     set_qfm_custom_block_info(custom_block_node, (char *)info->ptr);
 
     cmark_node_set_syntax_extension(custom_block_node, self);
     cmark_parser_advance_offset(parser, (char *)input,
-                                len - cmark_parser_get_offset(parser), 0);
+                                cmark_parser_get_first_nonspace(parser) +
+                                    matched + info_len -
+                                    cmark_parser_get_offset(parser),
+                                0);
 
     return custom_block_node;
   }
@@ -155,12 +135,14 @@ static const char *get_type_string(cmark_syntax_extension *self,
 
 static int can_contain(cmark_syntax_extension *self, cmark_node *node,
                        cmark_node_type child_type) {
+  /* Can contain all block nodes */
   cmark_node_type node_type = cmark_node_get_type(node);
 
   return node_type == CMARK_NODE_QFM_CUSTOM_BLOCK;
 }
 
 static int contains_inlines(cmark_syntax_extension *self, cmark_node *node) {
+  /* Can contain all inline nodes */
   cmark_node_type node_type = cmark_node_get_type(node);
 
   return node_type == CMARK_NODE_QFM_CUSTOM_BLOCK;
@@ -210,9 +192,8 @@ static const char *xml_attr(cmark_syntax_extension *self, cmark_node *node) {
   if (node_type == CMARK_NODE_QFM_CUSTOM_BLOCK) {
     cmark_chunk *info = get_qfm_custom_block_info(node);
     cmark_mem *mem = node->content.mem;
-
     cmark_strbuf *xml_attr_buff = mem->calloc(1, sizeof(cmark_strbuf));
-    ((node_qfm_custom_block *)node->as.opaque)->xml_attr_buff = xml_attr_buff;
+
     cmark_strbuf_init(
         mem, xml_attr_buff,
         17 + info->len); // `17` is length of ` data-metadata="` and `"`.
@@ -220,7 +201,7 @@ static const char *xml_attr(cmark_syntax_extension *self, cmark_node *node) {
     cmark_strbuf_puts(xml_attr_buff, (char *)info->data);
     cmark_strbuf_putc(xml_attr_buff, '"');
 
-    return (char *)xml_attr_buff->ptr;
+    return (char *)cmark_strbuf_detach(xml_attr_buff);
   }
 
   return NULL;

data/lib/qiita_marker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module QiitaMarker
-  VERSION = "0.23.5.0"
+  VERSION = "0.23.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_marker
 version: !ruby/object:Gem::Version
-  version: 0.23.5.0
+  version: 0.23.5.1
 platform: ruby
 authors:
 - Qiita Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print