Skip to content

Commit e658de1

Browse files
committed
Add punctuation scopes to parens in Oniguruma
Fixes #143.
1 parent dcf4d3a commit e658de1

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

Package/Sublime Text Syntax Definition/Oniguruma RegExp.sublime-syntax

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,21 @@ contexts:
112112
group:
113113
- include: group-comment
114114
- match: \(
115-
scope: keyword.control.group.regexp
115+
scope: keyword.control.group.regexp punctuation.section.group.begin.oniguruma
116116
push: group-start
117117

118118
group-extended:
119119
- include: group-comment
120120
- match: \(
121-
scope: keyword.control.group.regexp
121+
scope: keyword.control.group.regexp punctuation.section.group.begin.oniguruma
122122
push: group-start-extended
123123

124124
group-start-common:
125125
# Other modifiers (must come after other modifier matches)
126126
- match: '(\?(?:[ixms]*-)?[ixms]+)(\))'
127127
captures:
128128
1: storage.modifier.mode.regexp
129-
2: keyword.control.group.regexp
129+
2: keyword.control.group.regexp punctuation.section.group.end.oniguruma
130130
pop: true
131131

132132
group-start:
@@ -138,7 +138,7 @@ contexts:
138138
- match: '(\?[ims]*x[ixms]*(?:-[ims]+)?)(\))'
139139
captures:
140140
1: storage.modifier.mode.regexp
141-
2: keyword.control.group.regexp
141+
2: keyword.control.group.regexp punctuation.section.group.end.oniguruma
142142
set: [base-group-extended, unexpected-quantifier-pop]
143143
# Groups with 'x' mode
144144
- match: '\?[ims]*x[ixms]*(?:-[ims]+)?:'
@@ -167,7 +167,7 @@ contexts:
167167
- match: '(\?[ims]*-[ims]*x[imxs]*)(\))'
168168
captures:
169169
1: storage.modifier.mode.regexp
170-
2: keyword.control.group.regexp
170+
2: keyword.control.group.regexp punctuation.section.group.end.oniguruma
171171
set: [base-group, unexpected-quantifier-pop]
172172
# Groups without 'x' mode
173173
- match: '\?[ims]*-[ims]*x[imxs]*:'
@@ -193,14 +193,14 @@ contexts:
193193
group-body:
194194
- meta_content_scope: meta.group.regexp
195195
- match: \)
196-
scope: meta.group.regexp keyword.control.group.regexp
196+
scope: meta.group.regexp keyword.control.group.regexp punctuation.section.group.end.oniguruma
197197
pop: true
198198
- include: base-group
199199

200200
group-body-extended:
201201
- meta_content_scope: meta.group.extended.regexp
202202
- match: \)
203-
scope: meta.group.extended.regexp keyword.control.group.regexp
203+
scope: meta.group.extended.regexp keyword.control.group.regexp punctuation.section.group.end.oniguruma
204204
pop: true
205205
- include: base-group-extended
206206

Package/Sublime Text Syntax Definition/syntax_test_onig-regexp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ hello++
214214

215215
(?:a|b|c)
216216
#^^^^^^^^ meta.group
217-
# <- keyword.control.group
217+
# <- keyword.control.group punctuation.section.group.begin.oniguruma
218218
#^^ constant.other.assertion
219219
# ^ keyword.operator
220-
# ^ keyword.control.group
220+
# ^ keyword.control.group punctuation.section.group.end.oniguruma
221221

222222

223223
###################
@@ -267,25 +267,25 @@ where escape characters are ignored.\).
267267
# ^^^^^^^^^ comment
268268
(?-x)
269269
) # no comment
270-
# <- keyword.control.group
270+
# <- keyword.control.group punctuation.section.group.end.oniguruma
271271
# ^ - comment
272272

273273
(?sm-ixxs)
274274
#^^^^^^^^ storage.modifier.mode.regexp
275275

276276
(?i:hello)
277277
#^^^^^^^^^^ meta.group.regexp
278-
#^ keyword.control.group.regexp
278+
#^ keyword.control.group.regexp punctuation.section.group.begin.oniguruma
279279
# ^^^ storage.modifier.mode.regexp
280280
# ^ - storage.modifier.mode.regexp
281-
# ^ keyword.control.group.regexp
281+
# ^ keyword.control.group.regexp punctuation.section.group.end.oniguruma
282282

283283
(?i-s:hello)
284284
#^^^^^^^^^^^^ meta.group.regexp
285-
#^ keyword.control.group.regexp
285+
#^ keyword.control.group.regexp punctuation.section.group.begin.oniguruma
286286
# ^^^^^ storage.modifier.mode.regexp
287287
# ^ - storage.modifier.mode.regexp
288-
# ^ keyword.control.group.regexp
288+
# ^ keyword.control.group.regexp punctuation.section.group.end.oniguruma
289289

290290
# not a comment
291291
^ - comment
@@ -404,7 +404,7 @@ where escape characters are ignored.\).
404404

405405
(?x)
406406
(?<element> \g<stag> \g<content>* \g<etag> ){0}
407-
# <- meta.group.extended keyword.control.group
407+
# <- meta.group.extended keyword.control.group punctuation.section.group.begin.oniguruma
408408
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.group.extended
409409
#^^^^^^^^^^ keyword.other.named-capture-group.regexp
410410
# ^^^^^^^ entity.name.capture-group.regexp
@@ -419,11 +419,11 @@ where escape characters are ignored.\).
419419
# ^^^^^^^^ keyword.other.backref-and-recursion.regexp
420420
# ^^^^ variable.other.backref-and-recursion.regexp
421421
# ^ meta.ignored-whitespace.regexp
422-
# ^ keyword.control.group
422+
# ^ keyword.control.group punctuation.section.group.end.oniguruma
423423
# ^^^ keyword.operator.quantifier.regexp
424424
# ^ meta.ignored-whitespace.regexp
425425
(?<stag> < \g<name> \s* > ){0}
426-
# <- meta.group.extended keyword.control.group
426+
# <- meta.group.extended keyword.control.group punctuation.section.group.begin.oniguruma
427427
#^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.group.extended
428428
#^^^^^^^ keyword.other.named-capture-group.regexp
429429
# ^ meta.ignored-whitespace.regexp
@@ -436,7 +436,7 @@ where escape characters are ignored.\).
436436
# ^ meta.ignored-whitespace.regexp
437437
# ^ meta.literal.regexp
438438
# ^ meta.ignored-whitespace.regexp
439-
# ^ keyword.control.group
439+
# ^ keyword.control.group punctuation.section.group.end.oniguruma
440440
# ^^^ keyword.operator.quantifier.regexp
441441
(?<name> [a-zA-Z_:]+ ){0}
442442
# <- meta.group.extended keyword.control.group
@@ -449,31 +449,31 @@ where escape characters are ignored.\).
449449
# ^ keyword.control.set
450450
# ^ keyword.operator.quantifier
451451
# ^ meta.ignored-whitespace.regexp
452-
# ^ keyword.control.group
452+
# ^ keyword.control.group punctuation.section.group.end.oniguruma
453453
# ^^^ keyword.operator.quantifier.regexp
454454
(?<content> [^<&]+ (\g<element> | [^<&]+)* ){0}
455-
# <- meta.group.extended keyword.control.group
455+
# <- meta.group.extended keyword.control.group punctuation.section.group.begin.oniguruma
456456
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.group.extended
457457
#^^^^^^^^^^ keyword.other.named-capture-group.regexp
458458
# ^^^^^ meta.set
459459
# ^^ keyword.control.set
460460
# ^ keyword.operator.quantifier
461461
# ^ meta.ignored-whitespace.regexp
462462
# ^^^^^^^^^^^^^^^^^^^^^^ meta.group.extended meta.group.extended
463-
# ^ keyword.control.group
463+
# ^ keyword.control.group punctuation.section.group.begin.oniguruma
464464
# ^^^^^^^^^^^ keyword.other.backref-and-recursion.regexp
465465
# ^ meta.ignored-whitespace.regexp
466466
# ^ keyword.operator.alternation
467467
# ^ meta.ignored-whitespace.regexp
468468
# ^^^^^ meta.set
469469
# ^ keyword.operator.quantifier
470-
# ^ keyword.control.group
470+
# ^ keyword.control.group punctuation.section.group.end.oniguruma
471471
# ^ keyword.operator.quantifier
472472
# ^ meta.ignored-whitespace.regexp
473-
# ^ keyword.control.group
473+
# ^ keyword.control.group punctuation.section.group.end.oniguruma
474474
# ^^^ keyword.operator.quantifier.regexp
475475
(?'etag' </ \k<name+1> > ){0}
476-
# <- meta.group.extended keyword.control.group
476+
# <- meta.group.extended keyword.control.group punctuation.section.group.begin.oniguruma
477477
#^^^^^^^^^^^^^^^^^^^^^^^^^ meta.group.extended
478478
#^^^^^^^ keyword.other.named-capture-group.regexp
479479
# ^ meta.ignored-whitespace.regexp
@@ -484,7 +484,7 @@ where escape characters are ignored.\).
484484
# ^ meta.ignored-whitespace.regexp
485485
# ^ meta.literal.regexp
486486
# ^ meta.ignored-whitespace.regexp
487-
# ^ keyword.control.group
487+
# ^ keyword.control.group punctuation.section.group.end.oniguruma
488488
# ^^^ keyword.operator.quantifier.regexp
489489
\g<element>
490490
#^^^^^^^^^^ keyword.other.backref-and-recursion.regexp

0 commit comments

Comments
 (0)