fix: parse continued latex env as paragraph (close #38)

emiasims · emiasims · commit 081179c52b3e · 2022-10-21T23:23:29.000-04:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-org"
 description = "org grammar for the tree-sitter parsing library"
-version = "1.3.2"
+version = "1.3.3"
 keywords = ["incremental", "parsing", "org"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/milisims/tree-sitter-org"
diff --git a/corpus/basic.tst b/corpus/basic.tst
@@ -1360,6 +1360,32 @@ LatexEnv.5  - Uppercase
       name: (name)
       (name))))
 
+================================================================================
+LatexEnv.6a - Junk
+================================================================================
+\( a \) b
+--------------------------------------------------------------------------------
+
+(document
+  body: (body
+    (paragraph
+      (expr)
+      (expr)
+      (expr)
+      (expr))))
+
+================================================================================
+LatexEnv.6b - Junk
+================================================================================
+\( \)
+--------------------------------------------------------------------------------
+
+(document
+  body: (body
+    (paragraph
+      (expr)
+      (expr))))
+
 ================================================================================
 Precedence.1  - Paragraph comment
 ================================================================================
diff --git a/grammar.js b/grammar.js
@@ -305,14 +305,12 @@ org_grammar = {
           token.immediate('}'),
         ),
         seq(
-          caseInsensitive('\\['),
-          $._nl,
+          token(seq(caseInsensitive('\\['), choice('\n', '\r'))),
           optional(field('contents', $.contents)),
           caseInsensitive('\\]'),
         ),
         seq(
-          caseInsensitive('\\('),
-          $._nl,
+          token(seq(caseInsensitive('\\('), choice('\n', '\r'))),
           optional(field('contents', $.contents)),
           caseInsensitive('\\)'),
         ),
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-org",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Org grammar for tree-sitter",
   "main": "bindings/node",
   "keywords": [
diff --git a/src/grammar.json b/src/grammar.json
@@ -1820,17 +1820,34 @@
               "type": "SEQ",
               "members": [
                 {
-                  "type": "ALIAS",
+                  "type": "TOKEN",
                   "content": {
-                    "type": "PATTERN",
-                    "value": "\\\\\\["
-                  },
-                  "named": false,
-                  "value": "\\["
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "_nl"
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "ALIAS",
+                        "content": {
+                          "type": "PATTERN",
+                          "value": "\\\\\\["
+                        },
+                        "named": false,
+                        "value": "\\["
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": "\n"
+                          },
+                          {
+                            "type": "STRING",
+                            "value": "\r"
+                          }
+                        ]
+                      }
+                    ]
+                  }
                 },
                 {
                   "type": "CHOICE",
@@ -1863,17 +1880,34 @@
               "type": "SEQ",
               "members": [
                 {
-                  "type": "ALIAS",
+                  "type": "TOKEN",
                   "content": {
-                    "type": "PATTERN",
-                    "value": "\\\\\\("
-                  },
-                  "named": false,
-                  "value": "\\("
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "_nl"
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "ALIAS",
+                        "content": {
+                          "type": "PATTERN",
+                          "value": "\\\\\\("
+                        },
+                        "named": false,
+                        "value": "\\("
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": "\n"
+                          },
+                          {
+                            "type": "STRING",
+                            "value": "\r"
+                          }
+                        ]
+                      }
+                    ]
+                  }
                 },
                 {
                   "type": "CHOICE",
diff --git a/src/node-types.json b/src/node-types.json
@@ -1114,18 +1114,10 @@
     "type": "\\",
     "named": false
   },
-  {
-    "type": "\\(",
-    "named": false
-  },
   {
     "type": "\\)",
     "named": false
   },
-  {
-    "type": "\\[",
-    "named": false
-  },
   {
     "type": "\\]",
     "named": false
diff --git a/src/parser.c b/src/parser.c
diff --git a/src/tree_sitter/parser.h b/src/tree_sitter/parser.h

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tree-sitter-org",`
`3`		`- "version": "1.3.2",`
	`3`	`+ "version": "1.3.3",`
`4`	`4`	`"description": "Org grammar for tree-sitter",`
`5`	`5`	`"main": "bindings/node",`
`6`	`6`	`"keywords": [`