grammar: remove shim again

Signed-off-by: Michael Hoffmann <[email protected]>
tree-sitter-grammars · Jul 25, 2023 · 636dbe7 · 636dbe7
1 parent becebeb
commit 636dbe7
Show file tree

Hide file tree

Showing 12 changed files with 17,184 additions and 17,339 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,9 @@
 # Changelog
 
-## 1.1.0 - not yet released
+## 1.1.0 - 2023-07-25
 
 feature
 * add dialects so we can have different queries in `nvim-treesitter`
-* fix structure of comments in block bodies
 
 fix:
 * fix ci acceptance workflow

diff --git a/dialects/terraform/src/grammar.json b/dialects/terraform/src/grammar.json
@@ -5,17 +5,8 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "body"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "object"
-            }
-          ]
+          "type": "SYMBOL",
+          "name": "body"
         },
         {
           "type": "BLANK"
@@ -26,41 +17,20 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "_shim"
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "_shim"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
-            },
-            {
-              "type": "REPEAT1",
-              "content": {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "attribute"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "block"
-                  }
-                ]
+          "type": "REPEAT1",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "attribute"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "block"
               }
-            }
-          ]
+            ]
+          }
         }
       ]
     },
@@ -1805,10 +1775,6 @@
     {
       "type": "SYMBOL",
       "name": "heredoc_identifier"
-    },
-    {
-      "type": "SYMBOL",
-      "name": "_shim"
     }
   ],
   "inline": [],

diff --git a/dialects/terraform/src/node-types.json b/dialects/terraform/src/node-types.json
@@ -139,7 +139,7 @@
     "fields": {},
     "children": {
       "multiple": true,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "attribute",
@@ -202,10 +202,6 @@
         {
           "type": "body",
           "named": true
-        },
-        {
-          "type": "object",
-          "named": true
         }
       ]
     }