Skip to content

Commit bfe1344

Browse files
committed
add module_binding
1 parent f8eff0a commit bfe1344

File tree

4 files changed

+165
-153
lines changed

4 files changed

+165
-153
lines changed

grammar.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ module.exports = grammar({
185185
$.exception_declaration,
186186
),
187187

188-
_module_binding: $ => prec.left(seq(
188+
module_binding: $ => prec.left(seq(
189189
field('name', choice($.module_identifier, $.type_identifier)),
190190
optional(seq(
191191
':',
@@ -194,20 +194,14 @@ module.exports = grammar({
194194
optional(seq(
195195
'=',
196196
field('definition', $._module_definition),
197-
optional($._module_binding_and)
198197
)),
199198
)),
200199

201-
_module_binding_and: $ => seq(
202-
'and',
203-
$._module_binding
204-
),
205-
206200
module_declaration: $ => seq(
207201
'module',
208202
optional('rec'),
209203
optional('type'),
210-
$._module_binding,
204+
sep1('and', $.module_binding)
211205
),
212206

213207
_module_definition: $ => choice(

queries/textobjects.scm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
; Classes (modules)
55
;------------------
66

7-
(module_declaration definition: ((_) @class.inner)) @class.outer
7+
(module_binding definition: ((_) @class.inner)) @class.outer
88

99
; Blocks
1010
;-------

test/corpus/expressions.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,12 +1191,13 @@ module Test = %graphql(`
11911191
(escape_sequence)
11921192
(escape_sequence)))))))
11931193
(module_declaration
1194-
name: (module_identifier)
1195-
definition: (extension_expression
1196-
(extension_identifier)
1197-
(expression_statement
1198-
(template_string
1199-
(template_string_content))))))
1194+
(module_binding
1195+
name: (module_identifier)
1196+
definition: (extension_expression
1197+
(extension_identifier)
1198+
(expression_statement
1199+
(template_string
1200+
(template_string_content)))))))
12001201

12011202
===========================================
12021203
Raise expression

0 commit comments

Comments
 (0)