Fix ikatyang#33

danielpunkass · Feb 26, 2022 · b49b2da · b49b2da
1 parent 8bee14c
commit b49b2da
Show file tree

Hide file tree

Showing 4 changed files with 70,859 additions and 70,329 deletions.
diff --git a/corpus/issues.txt b/corpus/issues.txt
@@ -41,3 +41,29 @@
     (image
       (image_description)
       (link_destination))))
+
+================================================================================
+#33 - Fenced code block attributes
+================================================================================
+```{R}
+1 + 1
+```
+
+```{}
+1 + 1
+```
+
+--------------------------------------------------------------------------------
+
+(document
+  (fenced_code_block
+    (fenced_code_block_delimiter)
+    (info_string
+      (language))
+    (code_fence_content)
+    (fenced_code_block_delimiter))
+  (fenced_code_block
+    (fenced_code_block_delimiter)
+    (info_string)
+    (code_fence_content)
+    (fenced_code_block_delimiter)))
diff --git a/grammar.js b/grammar.js
@@ -294,10 +294,19 @@ module.exports = grammar(add_inline_rules({
         )),
         code_fence_content: $ => repeat1(choice($._newline, $._text)),
         info_string: $ => choice(
-            seq($.language, repeat(choice($._text, $.backslash_escape, $.entity_reference, $.numeric_character_reference))),
-            repeat1(choice($._text, $.backslash_escape, $.entity_reference, $.numeric_character_reference)),
+            seq(
+                prec.right(repeat1(prec(1, choice('{', '}')))),
+                optional(choice(
+                    seq($.language, repeat(choice($._text, $.backslash_escape, $.entity_reference, $.numeric_character_reference))),
+                    repeat1(choice($._text, $.backslash_escape, $.entity_reference, $.numeric_character_reference)),
+                ))
+            ),
+            choice(
+                seq($.language, repeat(choice($._text, $.backslash_escape, $.entity_reference, $.numeric_character_reference))),
+                repeat1(choice($._text, $.backslash_escape, $.entity_reference, $.numeric_character_reference)),
+            )
         ),
-        language: $ => prec.right(repeat1(prec(1, choice($._word, punctuation_without($, []), $.backslash_escape, $.entity_reference, $.numeric_character_reference)))), 
+        language: $ => prec.right(repeat1(prec(1, choice($._word, punctuation_without($, ['{', '}']), $.backslash_escape, $.entity_reference, $.numeric_character_reference)))), 
 
         // An HTML block. We do not emit addition nodes relating to the kind or structure or of the
         // html block as this is best done using language injections and a proper html parsers.

diff --git a/src/grammar.json b/src/grammar.json
@@ -542,11 +542,139 @@
           "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "language"
+              "type": "PREC_RIGHT",
+              "value": 0,
+              "content": {
+                "type": "REPEAT1",
+                "content": {
+                  "type": "PREC",
+                  "value": 1,
+                  "content": {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": "{"
+                      },
+                      {
+                        "type": "STRING",
+                        "value": "}"
+                      }
+                    ]
+                  }
+                }
+              }
             },
             {
-              "type": "REPEAT",
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SEQ",
+                      "members": [
+                        {
+                          "type": "SYMBOL",
+                          "name": "language"
+                        },
+                        {
+                          "type": "REPEAT",
+                          "content": {
+                            "type": "CHOICE",
+                            "members": [
+                              {
+                                "type": "SYMBOL",
+                                "name": "_text"
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "backslash_escape"
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "entity_reference"
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "numeric_character_reference"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "type": "REPEAT1",
+                      "content": {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "SYMBOL",
+                            "name": "_text"
+                          },
+                          {
+                            "type": "SYMBOL",
+                            "name": "backslash_escape"
+                          },
+                          {
+                            "type": "SYMBOL",
+                            "name": "entity_reference"
+                          },
+                          {
+                            "type": "SYMBOL",
+                            "name": "numeric_character_reference"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "language"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_text"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "backslash_escape"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "entity_reference"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "numeric_character_reference"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            {
+              "type": "REPEAT1",
               "content": {
                 "type": "CHOICE",
                 "members": [
@@ -570,30 +698,6 @@
               }
             }
           ]
-        },
-        {
-          "type": "REPEAT1",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_text"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "backslash_escape"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "entity_reference"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "numeric_character_reference"
-              }
-            ]
-          }
         }
       ]
     },
@@ -730,18 +834,10 @@
                         "type": "STRING",
                         "value": "`"
                       },
-                      {
-                        "type": "STRING",
-                        "value": "{"
-                      },
                       {
                         "type": "STRING",
                         "value": "|"
                       },
-                      {
-                        "type": "STRING",
-                        "value": "}"
-                      },
                       {
                         "type": "STRING",
                         "value": "~"