Skip to content

Commit ae1d1b0

Browse files
author
Yury Selivanov
committed
Namespace regexp common rules
1 parent 50b47e1 commit ae1d1b0

4 files changed

Lines changed: 72 additions & 74 deletions

File tree

‎grammars/MagicRegExp.YAML-tmLanguage‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@ patterns:
1212
repository:
1313
$apply:
1414
- file: 'regexp.inc.yaml'
15-
vars:
16-
name: 'base'
1715

1816
expression:
1917
patterns:
20-
- include: '#base-expression'
18+
- include: '#regexp-base-expression'
2119
- include: '#character-set'
2220
- include: '#comments'
23-
- include: '#flags'
21+
- include: '#regexp-flags'
2422
- include: '#named-group'
25-
- include: '#backreference'
23+
- include: '#regexp-backreference'
2624
- include: '#lookahead'
2725
- include: '#lookahead-negative'
2826
- include: '#lookbehind'
@@ -44,7 +42,7 @@ repository:
4442
'1': {name: constant.other.set.regexp
4543
punctuation.character.set.end.regexp}
4644
patterns:
47-
- include: '#charecter-set-escapes'
45+
- include: '#regexp-charecter-set-escapes'
4846
- name: constant.character.set.regexp
4947
match: '[^\n]'
5048

‎grammars/MagicRegExp.cson‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repository:
1515
expression:
1616
patterns: [
1717
{
18-
include: "#base-expression"
18+
include: "#regexp-base-expression"
1919
}
2020
{
2121
include: "#character-set"
@@ -24,13 +24,13 @@ repository:
2424
include: "#comments"
2525
}
2626
{
27-
include: "#flags"
27+
include: "#regexp-flags"
2828
}
2929
{
3030
include: "#named-group"
3131
}
3232
{
33-
include: "#backreference"
33+
include: "#regexp-backreference"
3434
}
3535
{
3636
include: "#lookahead"
@@ -70,7 +70,7 @@ repository:
7070
name: "constant.other.set.regexp punctuation.character.set.end.regexp"
7171
patterns: [
7272
{
73-
include: "#charecter-set-escapes"
73+
include: "#regexp-charecter-set-escapes"
7474
}
7575
{
7676
name: "constant.character.set.regexp"
@@ -216,7 +216,7 @@ repository:
216216
include: "#expression"
217217
}
218218
]
219-
"base-expression":
219+
"regexp-base-expression":
220220
patterns: [
221221
{
222222
name: "support.other.match.any.regexp"
@@ -249,16 +249,16 @@ repository:
249249
'''
250250
}
251251
{
252-
include: "#escape-sequence"
252+
include: "#regexp-escape-sequence"
253253
}
254254
]
255-
"backreference-number":
255+
"regexp-backreference-number":
256256
name: "meta.backreference.regexp"
257257
match: "(\\\\[1-9]\\d?)"
258258
captures:
259259
"1":
260260
name: "entity.name.tag.backreference.regexp"
261-
backreference:
261+
"regexp-backreference":
262262
name: "meta.backreference.named.regexp"
263263
match: '''
264264
(?x)
@@ -272,13 +272,13 @@ repository:
272272
name: "entity.name.tag.named.backreference.regexp"
273273
"3":
274274
name: "punctuation.parenthesis.backreference.named.end.regexp support.other.parenthesis.regexp"
275-
flags:
275+
"regexp-flags":
276276
name: "storage.modifier.flag.regexp"
277277
match: "\\(\\?[aiLmsux]+\\)"
278-
"escape-special":
278+
"regexp-escape-special":
279279
name: "support.other.escape.special.regexp"
280280
match: "\\\\([AbBdDsSwWZ])"
281-
"escape-character":
281+
"regexp-escape-character":
282282
name: "constant.character.escape.regexp"
283283
match: '''
284284
(?x)
@@ -289,7 +289,7 @@ repository:
289289
)
290290
291291
'''
292-
"escape-unicode":
292+
"regexp-escape-unicode":
293293
name: "constant.character.unicode.regexp"
294294
match: '''
295295
(?x)
@@ -299,47 +299,47 @@ repository:
299299
)
300300
301301
'''
302-
"escape-catchall":
302+
"regexp-escape-catchall":
303303
name: "constant.character.escape.regexp"
304304
match: "\\\\(.|\\n)"
305-
"escape-sequence":
305+
"regexp-escape-sequence":
306306
patterns: [
307307
{
308-
include: "#escape-special"
308+
include: "#regexp-escape-special"
309309
}
310310
{
311-
include: "#escape-character"
311+
include: "#regexp-escape-character"
312312
}
313313
{
314-
include: "#escape-unicode"
314+
include: "#regexp-escape-unicode"
315315
}
316316
{
317-
include: "#backreference-number"
317+
include: "#regexp-backreference-number"
318318
}
319319
{
320-
include: "#escape-catchall"
320+
include: "#regexp-escape-catchall"
321321
}
322322
]
323-
"charecter-set-escapes":
323+
"regexp-charecter-set-escapes":
324324
patterns: [
325325
{
326326
name: "constant.character.escape.regexp"
327327
match: "\\\\[abfnrtv\\\\]"
328328
}
329329
{
330-
include: "#escape-special"
330+
include: "#regexp-escape-special"
331331
}
332332
{
333333
name: "constant.character.escape.regexp"
334334
match: "\\\\([0-7]{1,3})"
335335
}
336336
{
337-
include: "#escape-character"
337+
include: "#regexp-escape-character"
338338
}
339339
{
340-
include: "#escape-unicode"
340+
include: "#regexp-escape-unicode"
341341
}
342342
{
343-
include: "#escape-catchall"
343+
include: "#regexp-escape-catchall"
344344
}
345345
]

‎grammars/MagicRegExp.tmLanguage‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<array>
3131
<dict>
3232
<key>include</key>
33-
<string>#base-expression</string>
33+
<string>#regexp-base-expression</string>
3434
</dict>
3535
<dict>
3636
<key>include</key>
@@ -42,15 +42,15 @@
4242
</dict>
4343
<dict>
4444
<key>include</key>
45-
<string>#flags</string>
45+
<string>#regexp-flags</string>
4646
</dict>
4747
<dict>
4848
<key>include</key>
4949
<string>#named-group</string>
5050
</dict>
5151
<dict>
5252
<key>include</key>
53-
<string>#backreference</string>
53+
<string>#regexp-backreference</string>
5454
</dict>
5555
<dict>
5656
<key>include</key>
@@ -120,7 +120,7 @@
120120
<array>
121121
<dict>
122122
<key>include</key>
123-
<string>#charecter-set-escapes</string>
123+
<string>#regexp-charecter-set-escapes</string>
124124
</dict>
125125
<dict>
126126
<key>name</key>
@@ -429,7 +429,7 @@
429429
</dict>
430430
</array>
431431
</dict>
432-
<key>base-expression</key>
432+
<key>regexp-base-expression</key>
433433
<dict>
434434
<key>patterns</key>
435435
<array>
@@ -475,11 +475,11 @@
475475
</dict>
476476
<dict>
477477
<key>include</key>
478-
<string>#escape-sequence</string>
478+
<string>#regexp-escape-sequence</string>
479479
</dict>
480480
</array>
481481
</dict>
482-
<key>backreference-number</key>
482+
<key>regexp-backreference-number</key>
483483
<dict>
484484
<key>name</key>
485485
<string>meta.backreference.regexp</string>
@@ -494,7 +494,7 @@
494494
</dict>
495495
</dict>
496496
</dict>
497-
<key>backreference</key>
497+
<key>regexp-backreference</key>
498498
<dict>
499499
<key>name</key>
500500
<string>meta.backreference.named.regexp</string>
@@ -521,21 +521,21 @@
521521
</dict>
522522
</dict>
523523
</dict>
524-
<key>flags</key>
524+
<key>regexp-flags</key>
525525
<dict>
526526
<key>name</key>
527527
<string>storage.modifier.flag.regexp</string>
528528
<key>match</key>
529529
<string>\(\?[aiLmsux]+\)</string>
530530
</dict>
531-
<key>escape-special</key>
531+
<key>regexp-escape-special</key>
532532
<dict>
533533
<key>name</key>
534534
<string>support.other.escape.special.regexp</string>
535535
<key>match</key>
536536
<string>\\([AbBdDsSwWZ])</string>
537537
</dict>
538-
<key>escape-character</key>
538+
<key>regexp-escape-character</key>
539539
<dict>
540540
<key>name</key>
541541
<string>constant.character.escape.regexp</string>
@@ -548,7 +548,7 @@
548548
)
549549
</string>
550550
</dict>
551-
<key>escape-unicode</key>
551+
<key>regexp-escape-unicode</key>
552552
<dict>
553553
<key>name</key>
554554
<string>constant.character.unicode.regexp</string>
@@ -560,40 +560,40 @@
560560
)
561561
</string>
562562
</dict>
563-
<key>escape-catchall</key>
563+
<key>regexp-escape-catchall</key>
564564
<dict>
565565
<key>name</key>
566566
<string>constant.character.escape.regexp</string>
567567
<key>match</key>
568568
<string>\\(.|\n)</string>
569569
</dict>
570-
<key>escape-sequence</key>
570+
<key>regexp-escape-sequence</key>
571571
<dict>
572572
<key>patterns</key>
573573
<array>
574574
<dict>
575575
<key>include</key>
576-
<string>#escape-special</string>
576+
<string>#regexp-escape-special</string>
577577
</dict>
578578
<dict>
579579
<key>include</key>
580-
<string>#escape-character</string>
580+
<string>#regexp-escape-character</string>
581581
</dict>
582582
<dict>
583583
<key>include</key>
584-
<string>#escape-unicode</string>
584+
<string>#regexp-escape-unicode</string>
585585
</dict>
586586
<dict>
587587
<key>include</key>
588-
<string>#backreference-number</string>
588+
<string>#regexp-backreference-number</string>
589589
</dict>
590590
<dict>
591591
<key>include</key>
592-
<string>#escape-catchall</string>
592+
<string>#regexp-escape-catchall</string>
593593
</dict>
594594
</array>
595595
</dict>
596-
<key>charecter-set-escapes</key>
596+
<key>regexp-charecter-set-escapes</key>
597597
<dict>
598598
<key>patterns</key>
599599
<array>
@@ -605,7 +605,7 @@
605605
</dict>
606606
<dict>
607607
<key>include</key>
608-
<string>#escape-special</string>
608+
<string>#regexp-escape-special</string>
609609
</dict>
610610
<dict>
611611
<key>name</key>
@@ -615,15 +615,15 @@
615615
</dict>
616616
<dict>
617617
<key>include</key>
618-
<string>#escape-character</string>
618+
<string>#regexp-escape-character</string>
619619
</dict>
620620
<dict>
621621
<key>include</key>
622-
<string>#escape-unicode</string>
622+
<string>#regexp-escape-unicode</string>
623623
</dict>
624624
<dict>
625625
<key>include</key>
626-
<string>#escape-catchall</string>
626+
<string>#regexp-escape-catchall</string>
627627
</dict>
628628
</array>
629629
</dict>

0 commit comments

Comments
 (0)