Skip to content

Commit c78b1e5

Browse files
authored
Fix heading 3 through 6 scopes
Closes GH-11. Closes GH-12. Reviewed-by: Titus Wormer <tituswormer@gmail.com>
1 parent c4a90d3 commit c78b1e5

File tree

7 files changed

+61
-20
lines changed

7 files changed

+61
-20
lines changed

grammar.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ repository:
563563
3:
564564
name: punctuation.definition.heading.var(suffix)
565565
- match: var(before)(#{3}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$
566-
name: markup.heading.atx.2.var(suffix)
566+
name: markup.heading.atx.3.var(suffix)
567567
captures:
568568
1:
569569
name: punctuation.definition.heading.var(suffix)
@@ -574,7 +574,7 @@ repository:
574574
3:
575575
name: punctuation.definition.heading.var(suffix)
576576
- match: var(before)(#{4}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$
577-
name: markup.heading.atx.2.var(suffix)
577+
name: markup.heading.atx.4.var(suffix)
578578
captures:
579579
1:
580580
name: punctuation.definition.heading.var(suffix)
@@ -585,7 +585,7 @@ repository:
585585
3:
586586
name: punctuation.definition.heading.var(suffix)
587587
- match: var(before)(#{5}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$
588-
name: markup.heading.atx.2.var(suffix)
588+
name: markup.heading.atx.5.var(suffix)
589589
captures:
590590
1:
591591
name: punctuation.definition.heading.var(suffix)
@@ -596,7 +596,7 @@ repository:
596596
3:
597597
name: punctuation.definition.heading.var(suffix)
598598
- match: var(before)(#{6}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$
599-
name: markup.heading.atx.2.var(suffix)
599+
name: markup.heading.atx.6.var(suffix)
600600
captures:
601601
1:
602602
name: punctuation.definition.heading.var(suffix)

source.mdx.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ const grammar = {
636636
{
637637
match:
638638
'(?:^|\\G)[\\t ]*(#{3}(?!#))(?:[ \\t]+([^\\r\\n]+?)(?:[ \\t]+(#+?))?)?[ \\t]*$',
639-
name: 'markup.heading.atx.2.mdx',
639+
name: 'markup.heading.atx.3.mdx',
640640
captures: {
641641
1: {
642642
name: 'punctuation.definition.heading.mdx'
@@ -657,7 +657,7 @@ const grammar = {
657657
{
658658
match:
659659
'(?:^|\\G)[\\t ]*(#{4}(?!#))(?:[ \\t]+([^\\r\\n]+?)(?:[ \\t]+(#+?))?)?[ \\t]*$',
660-
name: 'markup.heading.atx.2.mdx',
660+
name: 'markup.heading.atx.4.mdx',
661661
captures: {
662662
1: {
663663
name: 'punctuation.definition.heading.mdx'
@@ -678,7 +678,7 @@ const grammar = {
678678
{
679679
match:
680680
'(?:^|\\G)[\\t ]*(#{5}(?!#))(?:[ \\t]+([^\\r\\n]+?)(?:[ \\t]+(#+?))?)?[ \\t]*$',
681-
name: 'markup.heading.atx.2.mdx',
681+
name: 'markup.heading.atx.5.mdx',
682682
captures: {
683683
1: {
684684
name: 'punctuation.definition.heading.mdx'
@@ -699,7 +699,7 @@ const grammar = {
699699
{
700700
match:
701701
'(?:^|\\G)[\\t ]*(#{6}(?!#))(?:[ \\t]+([^\\r\\n]+?)(?:[ \\t]+(#+?))?)?[ \\t]*$',
702-
name: 'markup.heading.atx.2.mdx',
702+
name: 'markup.heading.atx.6.mdx',
703703
captures: {
704704
1: {
705705
name: 'punctuation.definition.heading.mdx'

source.mdx.tmLanguage

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@
919919
<key>match</key>
920920
<string>(?:^|\G)[\t ]*(#{3}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$</string>
921921
<key>name</key>
922-
<string>markup.heading.atx.2.mdx</string>
922+
<string>markup.heading.atx.3.mdx</string>
923923
<key>captures</key>
924924
<dict>
925925
<key>1</key>
@@ -950,7 +950,7 @@
950950
<key>match</key>
951951
<string>(?:^|\G)[\t ]*(#{4}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$</string>
952952
<key>name</key>
953-
<string>markup.heading.atx.2.mdx</string>
953+
<string>markup.heading.atx.4.mdx</string>
954954
<key>captures</key>
955955
<dict>
956956
<key>1</key>
@@ -981,7 +981,7 @@
981981
<key>match</key>
982982
<string>(?:^|\G)[\t ]*(#{5}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$</string>
983983
<key>name</key>
984-
<string>markup.heading.atx.2.mdx</string>
984+
<string>markup.heading.atx.5.mdx</string>
985985
<key>captures</key>
986986
<dict>
987987
<key>1</key>
@@ -1012,7 +1012,7 @@
10121012
<key>match</key>
10131013
<string>(?:^|\G)[\t ]*(#{6}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$</string>
10141014
<key>name</key>
1015-
<string>markup.heading.atx.2.mdx</string>
1015+
<string>markup.heading.atx.6.mdx</string>
10161016
<key>captures</key>
10171017
<dict>
10181018
<key>1</key>

test/headings.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# H1
2+
3+
## H2
4+
5+
### H3
6+
7+
#### H4
8+
9+
##### H5
10+
11+
###### H6

test/headings.md.snap

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
># H1
2+
#^ text.md markup.heading.atx.1.md punctuation.definition.heading.md
3+
# ^ text.md markup.heading.atx.1.md
4+
# ^^ text.md markup.heading.atx.1.md entity.name.section.md
5+
>
6+
>## H2
7+
#^^ text.md markup.heading.atx.2.md punctuation.definition.heading.md
8+
# ^ text.md markup.heading.atx.2.md
9+
# ^^ text.md markup.heading.atx.2.md entity.name.section.md
10+
>
11+
>### H3
12+
#^^^ text.md markup.heading.atx.3.md punctuation.definition.heading.md
13+
# ^ text.md markup.heading.atx.3.md
14+
# ^^ text.md markup.heading.atx.3.md entity.name.section.md
15+
>
16+
>#### H4
17+
#^^^^ text.md markup.heading.atx.4.md punctuation.definition.heading.md
18+
# ^ text.md markup.heading.atx.4.md
19+
# ^^ text.md markup.heading.atx.4.md entity.name.section.md
20+
>
21+
>##### H5
22+
#^^^^^ text.md markup.heading.atx.5.md punctuation.definition.heading.md
23+
# ^ text.md markup.heading.atx.5.md
24+
# ^^ text.md markup.heading.atx.5.md entity.name.section.md
25+
>
26+
>###### H6
27+
#^^^^^^ text.md markup.heading.atx.6.md punctuation.definition.heading.md
28+
# ^ text.md markup.heading.atx.6.md
29+
# ^^ text.md markup.heading.atx.6.md entity.name.section.md
30+
>

text.md.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ const grammar = {
696696
{
697697
match:
698698
'(?:^|\\G)[ ]{0,3}(#{3}(?!#))(?:[ \\t]+([^\\r\\n]+?)(?:[ \\t]+(#+?))?)?[ \\t]*$',
699-
name: 'markup.heading.atx.2.md',
699+
name: 'markup.heading.atx.3.md',
700700
captures: {
701701
1: {
702702
name: 'punctuation.definition.heading.md'
@@ -717,7 +717,7 @@ const grammar = {
717717
{
718718
match:
719719
'(?:^|\\G)[ ]{0,3}(#{4}(?!#))(?:[ \\t]+([^\\r\\n]+?)(?:[ \\t]+(#+?))?)?[ \\t]*$',
720-
name: 'markup.heading.atx.2.md',
720+
name: 'markup.heading.atx.4.md',
721721
captures: {
722722
1: {
723723
name: 'punctuation.definition.heading.md'
@@ -738,7 +738,7 @@ const grammar = {
738738
{
739739
match:
740740
'(?:^|\\G)[ ]{0,3}(#{5}(?!#))(?:[ \\t]+([^\\r\\n]+?)(?:[ \\t]+(#+?))?)?[ \\t]*$',
741-
name: 'markup.heading.atx.2.md',
741+
name: 'markup.heading.atx.5.md',
742742
captures: {
743743
1: {
744744
name: 'punctuation.definition.heading.md'
@@ -759,7 +759,7 @@ const grammar = {
759759
{
760760
match:
761761
'(?:^|\\G)[ ]{0,3}(#{6}(?!#))(?:[ \\t]+([^\\r\\n]+?)(?:[ \\t]+(#+?))?)?[ \\t]*$',
762-
name: 'markup.heading.atx.2.md',
762+
name: 'markup.heading.atx.6.md',
763763
captures: {
764764
1: {
765765
name: 'punctuation.definition.heading.md'

text.md.tmLanguage

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@
10021002
<key>match</key>
10031003
<string>(?:^|\G)[ ]{0,3}(#{3}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$</string>
10041004
<key>name</key>
1005-
<string>markup.heading.atx.2.md</string>
1005+
<string>markup.heading.atx.3.md</string>
10061006
<key>captures</key>
10071007
<dict>
10081008
<key>1</key>
@@ -1033,7 +1033,7 @@
10331033
<key>match</key>
10341034
<string>(?:^|\G)[ ]{0,3}(#{4}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$</string>
10351035
<key>name</key>
1036-
<string>markup.heading.atx.2.md</string>
1036+
<string>markup.heading.atx.4.md</string>
10371037
<key>captures</key>
10381038
<dict>
10391039
<key>1</key>
@@ -1064,7 +1064,7 @@
10641064
<key>match</key>
10651065
<string>(?:^|\G)[ ]{0,3}(#{5}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$</string>
10661066
<key>name</key>
1067-
<string>markup.heading.atx.2.md</string>
1067+
<string>markup.heading.atx.5.md</string>
10681068
<key>captures</key>
10691069
<dict>
10701070
<key>1</key>
@@ -1095,7 +1095,7 @@
10951095
<key>match</key>
10961096
<string>(?:^|\G)[ ]{0,3}(#{6}(?!#))(?:[ \t]+([^\r\n]+?)(?:[ \t]+(#+?))?)?[ \t]*$</string>
10971097
<key>name</key>
1098-
<string>markup.heading.atx.2.md</string>
1098+
<string>markup.heading.atx.6.md</string>
10991099
<key>captures</key>
11001100
<dict>
11011101
<key>1</key>

0 commit comments

Comments
 (0)