Skip to content

Commit 5eb283b

Browse files
committed
Limit escaping in raw strings to quotes
Marking these as escapes for clarity even though the backslash is included in the string content.
1 parent f44650d commit 5eb283b

1 file changed

Lines changed: 38 additions & 56 deletions

File tree

Syntaxes/Python.tmLanguage

Lines changed: 38 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,6 +1825,20 @@
18251825
<key>match</key>
18261826
<string>(\\x[\h]{2})|(\\[0-7]{3})|(\\\n)|(\\\\)|(\\\")|(\\')|(\\a)|(\\b)|(\\f)|(\\n)|(\\r)|(\\t)|(\\v)</string>
18271827
</dict>
1828+
<key>escaped_char_raw_double</key>
1829+
<dict>
1830+
<key>match</key>
1831+
<string>\\"</string>
1832+
<key>name</key>
1833+
<string>constant.character.escape.quote.python</string>
1834+
</dict>
1835+
<key>escaped_char_raw_single</key>
1836+
<dict>
1837+
<key>match</key>
1838+
<string>\\'</string>
1839+
<key>name</key>
1840+
<string>constant.character.escape.quote.python</string>
1841+
</dict>
18281842
<key>escaped_unicode_char</key>
18291843
<dict>
18301844
<key>captures</key>
@@ -2158,11 +2172,7 @@
21582172
</dict>
21592173
<dict>
21602174
<key>include</key>
2161-
<string>#escaped_unicode_char</string>
2162-
</dict>
2163-
<dict>
2164-
<key>include</key>
2165-
<string>#escaped_char</string>
2175+
<string>#escaped_char_raw_double</string>
21662176
</dict>
21672177
<dict>
21682178
<key>include</key>
@@ -2208,11 +2218,7 @@
22082218
</dict>
22092219
<dict>
22102220
<key>include</key>
2211-
<string>#escaped_unicode_char</string>
2212-
</dict>
2213-
<dict>
2214-
<key>include</key>
2215-
<string>#escaped_char</string>
2221+
<string>#escaped_char_raw_double</string>
22162222
</dict>
22172223
</array>
22182224
</dict>
@@ -2254,7 +2260,7 @@
22542260
</dict>
22552261
<dict>
22562262
<key>include</key>
2257-
<string>#escaped_char</string>
2263+
<string>#escaped_char_raw_double</string>
22582264
</dict>
22592265
<dict>
22602266
<key>include</key>
@@ -2300,7 +2306,7 @@
23002306
</dict>
23012307
<dict>
23022308
<key>include</key>
2303-
<string>#escaped_char</string>
2309+
<string>#escaped_char_raw_double</string>
23042310
</dict>
23052311
</array>
23062312
</dict>
@@ -2342,7 +2348,7 @@
23422348
</dict>
23432349
<dict>
23442350
<key>include</key>
2345-
<string>#escaped_char</string>
2351+
<string>#escaped_char_raw_double</string>
23462352
</dict>
23472353
<dict>
23482354
<key>include</key>
@@ -2388,7 +2394,7 @@
23882394
</dict>
23892395
<dict>
23902396
<key>include</key>
2391-
<string>#escaped_char</string>
2397+
<string>#escaped_char_raw_double</string>
23922398
</dict>
23932399
</array>
23942400
</dict>
@@ -2507,11 +2513,7 @@
25072513
</dict>
25082514
<dict>
25092515
<key>include</key>
2510-
<string>#escaped_unicode_char</string>
2511-
</dict>
2512-
<dict>
2513-
<key>include</key>
2514-
<string>#escaped_char</string>
2516+
<string>#escaped_char_raw_double</string>
25152517
</dict>
25162518
<dict>
25172519
<key>include</key>
@@ -2575,11 +2577,7 @@
25752577
</dict>
25762578
<dict>
25772579
<key>include</key>
2578-
<string>#escaped_unicode_char</string>
2579-
</dict>
2580-
<dict>
2581-
<key>include</key>
2582-
<string>#escaped_char</string>
2580+
<string>#escaped_char_raw_double</string>
25832581
</dict>
25842582
</array>
25852583
</dict>
@@ -2626,7 +2624,7 @@
26262624
</dict>
26272625
<dict>
26282626
<key>include</key>
2629-
<string>#escaped_char</string>
2627+
<string>#escaped_char_raw_double</string>
26302628
</dict>
26312629
<dict>
26322630
<key>include</key>
@@ -2677,7 +2675,7 @@
26772675
</dict>
26782676
<dict>
26792677
<key>include</key>
2680-
<string>#escaped_char</string>
2678+
<string>#escaped_char_raw_double</string>
26812679
</dict>
26822680
</array>
26832681
</dict>
@@ -2704,7 +2702,7 @@
27042702
</dict>
27052703
<dict>
27062704
<key>include</key>
2707-
<string>#escaped_char</string>
2705+
<string>#escaped_char_raw_double</string>
27082706
</dict>
27092707
<dict>
27102708
<key>include</key>
@@ -2768,7 +2766,7 @@
27682766
</dict>
27692767
<dict>
27702768
<key>include</key>
2771-
<string>#escaped_char</string>
2769+
<string>#escaped_char_raw_double</string>
27722770
</dict>
27732771
</array>
27742772
</dict>
@@ -3100,11 +3098,7 @@
31003098
</dict>
31013099
<dict>
31023100
<key>include</key>
3103-
<string>#escaped_unicode_char</string>
3104-
</dict>
3105-
<dict>
3106-
<key>include</key>
3107-
<string>#escaped_char</string>
3101+
<string>#escaped_char_raw_single</string>
31083102
</dict>
31093103
<dict>
31103104
<key>include</key>
@@ -3150,11 +3144,7 @@
31503144
</dict>
31513145
<dict>
31523146
<key>include</key>
3153-
<string>#escaped_unicode_char</string>
3154-
</dict>
3155-
<dict>
3156-
<key>include</key>
3157-
<string>#escaped_char</string>
3147+
<string>#escaped_char_raw_single</string>
31583148
</dict>
31593149
</array>
31603150
</dict>
@@ -3196,7 +3186,7 @@
31963186
</dict>
31973187
<dict>
31983188
<key>include</key>
3199-
<string>#escaped_char</string>
3189+
<string>#escaped_char_raw_single</string>
32003190
</dict>
32013191
<dict>
32023192
<key>include</key>
@@ -3242,7 +3232,7 @@
32423232
</dict>
32433233
<dict>
32443234
<key>include</key>
3245-
<string>#escaped_char</string>
3235+
<string>#escaped_char_raw_single</string>
32463236
</dict>
32473237
</array>
32483238
</dict>
@@ -3284,7 +3274,7 @@
32843274
</dict>
32853275
<dict>
32863276
<key>include</key>
3287-
<string>#escaped_char</string>
3277+
<string>#escaped_char_raw_single</string>
32883278
</dict>
32893279
<dict>
32903280
<key>include</key>
@@ -3330,7 +3320,7 @@
33303320
</dict>
33313321
<dict>
33323322
<key>include</key>
3333-
<string>#escaped_char</string>
3323+
<string>#escaped_char_raw_single</string>
33343324
</dict>
33353325
</array>
33363326
</dict>
@@ -3449,11 +3439,7 @@
34493439
</dict>
34503440
<dict>
34513441
<key>include</key>
3452-
<string>#escaped_unicode_char</string>
3453-
</dict>
3454-
<dict>
3455-
<key>include</key>
3456-
<string>#escaped_char</string>
3442+
<string>#escaped_char_raw_single</string>
34573443
</dict>
34583444
<dict>
34593445
<key>include</key>
@@ -3517,11 +3503,7 @@
35173503
</dict>
35183504
<dict>
35193505
<key>include</key>
3520-
<string>#escaped_unicode_char</string>
3521-
</dict>
3522-
<dict>
3523-
<key>include</key>
3524-
<string>#escaped_char</string>
3506+
<string>#escaped_char_raw_single</string>
35253507
</dict>
35263508
</array>
35273509
</dict>
@@ -3568,7 +3550,7 @@
35683550
</dict>
35693551
<dict>
35703552
<key>include</key>
3571-
<string>#escaped_char</string>
3553+
<string>#escaped_char_raw_single</string>
35723554
</dict>
35733555
<dict>
35743556
<key>include</key>
@@ -3619,7 +3601,7 @@
36193601
</dict>
36203602
<dict>
36213603
<key>include</key>
3622-
<string>#escaped_char</string>
3604+
<string>#escaped_char_raw_single</string>
36233605
</dict>
36243606
</array>
36253607
</dict>
@@ -3646,7 +3628,7 @@
36463628
</dict>
36473629
<dict>
36483630
<key>include</key>
3649-
<string>#escaped_char</string>
3631+
<string>#escaped_char_raw_single</string>
36503632
</dict>
36513633
<dict>
36523634
<key>include</key>
@@ -3708,7 +3690,7 @@
37083690
</dict>
37093691
<dict>
37103692
<key>include</key>
3711-
<string>#escaped_char</string>
3693+
<string>#escaped_char_raw_single</string>
37123694
</dict>
37133695
</array>
37143696
</dict>

0 commit comments

Comments
 (0)