feat: better insertions and use std::iswpunct

nvim-neorg · Sep 11, 2021 · dc8dbb7 · dc8dbb7
1 parent bb30e76
commit dc8dbb7
Show file tree

Hide file tree

Showing 8 changed files with 8,355 additions and 8,151 deletions.
diff --git a/build/Release/obj.target/tree_sitter_norg_binding.node b/build/Release/obj.target/tree_sitter_norg_binding.node
diff --git a/build/Release/obj.target/tree_sitter_norg_binding/src/parser.o b/build/Release/obj.target/tree_sitter_norg_binding/src/parser.o
diff --git a/build/Release/tree_sitter_norg_binding.node b/build/Release/tree_sitter_norg_binding.node
diff --git a/grammar.js b/grammar.js
@@ -1386,7 +1386,16 @@ module.exports = grammar({
             ),
 
         word: $ =>
-            token.immediate(/[a-zA-Z0-9_\-\+]+/),
+            seq(
+                token(/[a-z0-9_\-\+]+/),
+                token(/[a-zA-Z0-9_\-\+]*/),
+            ),
+
+        capitalized_word: $ =>
+            seq(
+                token(/[A-Z0-9_\-\+]+/),
+                token(/[a-zA-Z0-9_\-\+]*/),
+            ),
 
         insertion: $ =>
             prec.right(0,
@@ -1395,7 +1404,10 @@ module.exports = grammar({
 
                     field(
                         "item",
-                        $.word,
+                        choice(
+                            $.capitalized_word,
+                            $.word
+                        )
                     ),
 
                     choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -2913,11 +2913,42 @@
       }
     },
     "word": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "PATTERN",
-        "value": "[a-zA-Z0-9_\\-\\+]+"
-      }
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PATTERN",
+            "value": "[a-z0-9_\\-\\+]+"
+          }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PATTERN",
+            "value": "[a-zA-Z0-9_\\-\\+]*"
+          }
+        }
+      ]
+    },
+    "capitalized_word": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PATTERN",
+            "value": "[A-Z0-9_\\-\\+]+"
+          }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "PATTERN",
+            "value": "[a-zA-Z0-9_\\-\\+]*"
+          }
+        }
+      ]
     },
     "insertion": {
       "type": "PREC_RIGHT",
@@ -2933,8 +2964,17 @@
             "type": "FIELD",
             "name": "item",
             "content": {
-              "type": "SYMBOL",
-              "name": "word"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "capitalized_word"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "word"
+                }
+              ]
             }
           },
           {

diff --git a/src/node-types.json b/src/node-types.json
@@ -1,4 +1,9 @@
 [
+  {
+    "type": "capitalized_word",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "carryover_tag",
     "named": true,
@@ -785,6 +790,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "capitalized_word",
+            "named": true
+          },
           {
             "type": "word",
             "named": true
@@ -2869,6 +2878,11 @@
       ]
     }
   },
+  {
+    "type": "word",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "\n",
     "named": false
@@ -3116,9 +3130,5 @@
   {
     "type": "weak_paragraph_delimiter",
     "named": true
-  },
-  {
-    "type": "word",
-    "named": true
   }
 ]