Skip to content

Commit 636dbe7

Browse files
committed
grammar: remove shim again
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
1 parent becebeb commit 636dbe7

File tree

12 files changed

+17184
-17339
lines changed

12 files changed

+17184
-17339
lines changed

CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Changelog
22

3-
## 1.1.0 - not yet released
3+
## 1.1.0 - 2023-07-25
44

55
feature
66
* add dialects so we can have different queries in `nvim-treesitter`
7-
* fix structure of comments in block bodies
87

98
fix:
109
* fix ci acceptance workflow

dialects/terraform/src/grammar.json

Lines changed: 15 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,8 @@
55
"type": "CHOICE",
66
"members": [
77
{
8-
"type": "CHOICE",
9-
"members": [
10-
{
11-
"type": "SYMBOL",
12-
"name": "body"
13-
},
14-
{
15-
"type": "SYMBOL",
16-
"name": "object"
17-
}
18-
]
8+
"type": "SYMBOL",
9+
"name": "body"
1910
},
2011
{
2112
"type": "BLANK"
@@ -26,41 +17,20 @@
2617
"type": "CHOICE",
2718
"members": [
2819
{
29-
"type": "SYMBOL",
30-
"name": "_shim"
31-
},
32-
{
33-
"type": "SEQ",
34-
"members": [
35-
{
36-
"type": "CHOICE",
37-
"members": [
38-
{
39-
"type": "SYMBOL",
40-
"name": "_shim"
41-
},
42-
{
43-
"type": "BLANK"
44-
}
45-
]
46-
},
47-
{
48-
"type": "REPEAT1",
49-
"content": {
50-
"type": "CHOICE",
51-
"members": [
52-
{
53-
"type": "SYMBOL",
54-
"name": "attribute"
55-
},
56-
{
57-
"type": "SYMBOL",
58-
"name": "block"
59-
}
60-
]
20+
"type": "REPEAT1",
21+
"content": {
22+
"type": "CHOICE",
23+
"members": [
24+
{
25+
"type": "SYMBOL",
26+
"name": "attribute"
27+
},
28+
{
29+
"type": "SYMBOL",
30+
"name": "block"
6131
}
62-
}
63-
]
32+
]
33+
}
6434
}
6535
]
6636
},
@@ -1805,10 +1775,6 @@
18051775
{
18061776
"type": "SYMBOL",
18071777
"name": "heredoc_identifier"
1808-
},
1809-
{
1810-
"type": "SYMBOL",
1811-
"name": "_shim"
18121778
}
18131779
],
18141780
"inline": [],

dialects/terraform/src/node-types.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
"fields": {},
140140
"children": {
141141
"multiple": true,
142-
"required": false,
142+
"required": true,
143143
"types": [
144144
{
145145
"type": "attribute",
@@ -202,10 +202,6 @@
202202
{
203203
"type": "body",
204204
"named": true
205-
},
206-
{
207-
"type": "object",
208-
"named": true
209205
}
210206
]
211207
}

0 commit comments

Comments
 (0)