Skip to content

Commit 6cc777b

Browse files
author
MattDMo
committed
Latest build
1 parent f8fc7d8 commit 6cc777b

File tree

1 file changed

+134
-9
lines changed

1 file changed

+134
-9
lines changed

‎PythonImproved.tmLanguage‎

Lines changed: 134 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<array>
3535
<dict>
3636
<key>match</key>
37-
<string>(?&lt;!^from\s|^import\s)(\.{3})</string>
37+
<string>(?&lt;!^from\s|^import\s)(\b\.{3}\b)</string>
3838
<key>name</key>
3939
<string>support.type.ellipsis.python</string>
4040
</dict>
@@ -82,7 +82,7 @@
8282
<key>match</key>
8383
<string>\b(?i:(0x\h+)L)</string>
8484
<key>name</key>
85-
<string>constant.numeric.integer.long.hexadecimal.python</string>
85+
<string>constant.numeric.integer.hexadecimal.long.python</string>
8686
</dict>
8787
<dict>
8888
<key>match</key>
@@ -94,7 +94,7 @@
9494
<key>match</key>
9595
<string>\b(?i:(0b[01]+)L)</string>
9696
<key>name</key>
97-
<string>constant.numeric.integer.long.binary.python</string>
97+
<string>constant.numeric.integer.binary.long.python</string>
9898
</dict>
9999
<dict>
100100
<key>match</key>
@@ -106,7 +106,7 @@
106106
<key>match</key>
107107
<string>\b(?i:(0[o]?[0-7]+)L)</string>
108108
<key>name</key>
109-
<string>constant.numeric.integer.long.octal.python</string>
109+
<string>constant.numeric.integer.octal.long.python</string>
110110
</dict>
111111
<dict>
112112
<key>match</key>
@@ -150,7 +150,7 @@
150150
<key>match</key>
151151
<string>\b(?i:([1-9]+[0-9]*|0)L)</string>
152152
<key>name</key>
153-
<string>constant.numeric.integer.long.decimal.python</string>
153+
<string>constant.numeric.integer.decimal.long.python</string>
154154
</dict>
155155
<dict>
156156
<key>match</key>
@@ -525,10 +525,15 @@
525525
</dict>
526526
<dict>
527527
<key>begin</key>
528-
<string>\s*((?:async\s+)?def)\s+(?=[[:alpha:]_][[:alnum:]_]*)</string>
528+
<string>\s*(?:(async)\s+)?(def)\s+(?=[[:alpha:]_][[:alnum:]_]*)</string>
529529
<key>beginCaptures</key>
530530
<dict>
531531
<key>1</key>
532+
<dict>
533+
<key>name</key>
534+
<string>storage.modifier.async.python</string>
535+
</dict>
536+
<key>2</key>
532537
<dict>
533538
<key>name</key>
534539
<string>storage.type.function.python</string>
@@ -574,13 +579,23 @@
574579
<key>captures</key>
575580
<dict>
576581
<key>1</key>
582+
<dict>
583+
<key>name</key>
584+
<string>storage.modifier.async.python</string>
585+
</dict>
586+
<key>2</key>
577587
<dict>
578588
<key>name</key>
579589
<string>storage.type.function.python</string>
580590
</dict>
591+
<key>3</key>
592+
<dict>
593+
<key>name</key>
594+
<string>storage.type.function.inline.python</string>
595+
</dict>
581596
</dict>
582597
<key>match</key>
583-
<string>\b(((?:async\s+)?def)|lambda)\b</string>
598+
<string>\b(?:(?:(async)\s+)?(def)|(lambda))\b</string>
584599
</dict>
585600
<dict>
586601
<key>comment</key>
@@ -1706,7 +1721,7 @@
17061721
</dict>
17071722
</dict>
17081723
<key>match</key>
1709-
<string>(#+).*$\n?</string>
1724+
<string>(#+).*$</string>
17101725
<key>name</key>
17111726
<string>comment.line.number-sign.python</string>
17121727
</dict>
@@ -1995,7 +2010,7 @@
19952010
(\\[0-7]{3}) |
19962011
(\\\n) |
19972012
(\\\\) |
1998-
(\\\") |
2013+
(\\") |
19992014
(\\') |
20002015
(\\a) |
20012016
(\\b) |
@@ -2005,6 +2020,20 @@
20052020
(\\t) |
20062021
(\\v)</string>
20072022
</dict>
2023+
<key>escaped_char_raw_double</key>
2024+
<dict>
2025+
<key>match</key>
2026+
<string>\\"</string>
2027+
<key>name</key>
2028+
<string>constant.character.escape.quote.python</string>
2029+
</dict>
2030+
<key>escaped_char_raw_single</key>
2031+
<dict>
2032+
<key>match</key>
2033+
<string>\\'</string>
2034+
<key>name</key>
2035+
<string>constant.character.escape.quote.python</string>
2036+
</dict>
20082037
<key>escaped_unicode_char</key>
20092038
<dict>
20102039
<key>captures</key>
@@ -2446,6 +2475,10 @@
24462475
<key>include</key>
24472476
<string>#constant_placeholder</string>
24482477
</dict>
2478+
<dict>
2479+
<key>include</key>
2480+
<string>#escaped_char_raw_double</string>
2481+
</dict>
24492482
<dict>
24502483
<key>include</key>
24512484
<string>#regular_expressions</string>
@@ -2491,6 +2524,10 @@
24912524
<key>include</key>
24922525
<string>#constant_placeholder</string>
24932526
</dict>
2527+
<dict>
2528+
<key>include</key>
2529+
<string>#escaped_char_raw_double</string>
2530+
</dict>
24942531
</array>
24952532
</dict>
24962533
<dict>
@@ -2532,6 +2569,10 @@
25322569
<key>include</key>
25332570
<string>#constant_placeholder</string>
25342571
</dict>
2572+
<dict>
2573+
<key>include</key>
2574+
<string>#escaped_char_raw_double</string>
2575+
</dict>
25352576
<dict>
25362577
<key>include</key>
25372578
<string>#regular_expressions</string>
@@ -2577,6 +2618,10 @@
25772618
<key>include</key>
25782619
<string>#constant_placeholder</string>
25792620
</dict>
2621+
<dict>
2622+
<key>include</key>
2623+
<string>#escaped_char_raw_double</string>
2624+
</dict>
25802625
</array>
25812626
</dict>
25822627
<dict>
@@ -2618,6 +2663,10 @@
26182663
<key>include</key>
26192664
<string>#constant_placeholder</string>
26202665
</dict>
2666+
<dict>
2667+
<key>include</key>
2668+
<string>#escaped_char_raw_double</string>
2669+
</dict>
26212670
<dict>
26222671
<key>include</key>
26232672
<string>#regular_expressions</string>
@@ -2663,6 +2712,10 @@
26632712
<key>include</key>
26642713
<string>#constant_placeholder</string>
26652714
</dict>
2715+
<dict>
2716+
<key>include</key>
2717+
<string>#escaped_char_raw_double</string>
2718+
</dict>
26662719
</array>
26672720
</dict>
26682721
<dict>
@@ -2811,6 +2864,10 @@
28112864
<key>include</key>
28122865
<string>#constant_placeholder</string>
28132866
</dict>
2867+
<dict>
2868+
<key>include</key>
2869+
<string>#escaped_char_raw_double</string>
2870+
</dict>
28142871
<dict>
28152872
<key>include</key>
28162873
<string>#regular_expressions</string>
@@ -2861,6 +2918,10 @@
28612918
<key>include</key>
28622919
<string>#constant_placeholder</string>
28632920
</dict>
2921+
<dict>
2922+
<key>include</key>
2923+
<string>#escaped_char_raw_double</string>
2924+
</dict>
28642925
</array>
28652926
</dict>
28662927
<dict>
@@ -2907,6 +2968,10 @@
29072968
<key>include</key>
29082969
<string>#constant_placeholder</string>
29092970
</dict>
2971+
<dict>
2972+
<key>include</key>
2973+
<string>#escaped_char_raw_double</string>
2974+
</dict>
29102975
<dict>
29112976
<key>include</key>
29122977
<string>#regular_expressions</string>
@@ -2957,6 +3022,10 @@
29573022
<key>include</key>
29583023
<string>#constant_placeholder</string>
29593024
</dict>
3025+
<dict>
3026+
<key>include</key>
3027+
<string>#escaped_char_raw_double</string>
3028+
</dict>
29603029
</array>
29613030
</dict>
29623031
<dict>
@@ -3003,6 +3072,10 @@
30033072
<key>include</key>
30043073
<string>#constant_placeholder</string>
30053074
</dict>
3075+
<dict>
3076+
<key>include</key>
3077+
<string>#escaped_char_raw_double</string>
3078+
</dict>
30063079
<dict>
30073080
<key>include</key>
30083081
<string>#regular_expressions</string>
@@ -3053,6 +3126,10 @@
30533126
<key>include</key>
30543127
<string>#constant_placeholder</string>
30553128
</dict>
3129+
<dict>
3130+
<key>include</key>
3131+
<string>#escaped_char_raw_double</string>
3132+
</dict>
30563133
</array>
30573134
</dict>
30583135
<dict>
@@ -3333,6 +3410,10 @@
33333410
<key>include</key>
33343411
<string>#constant_placeholder</string>
33353412
</dict>
3413+
<dict>
3414+
<key>include</key>
3415+
<string>#escaped_char_raw_single</string>
3416+
</dict>
33363417
<dict>
33373418
<key>include</key>
33383419
<string>#regular_expressions</string>
@@ -3378,6 +3459,10 @@
33783459
<key>include</key>
33793460
<string>#constant_placeholder</string>
33803461
</dict>
3462+
<dict>
3463+
<key>include</key>
3464+
<string>#escaped_char_raw_single</string>
3465+
</dict>
33813466
</array>
33823467
</dict>
33833468
<dict>
@@ -3419,6 +3504,10 @@
34193504
<key>include</key>
34203505
<string>#constant_placeholder</string>
34213506
</dict>
3507+
<dict>
3508+
<key>include</key>
3509+
<string>#escaped_char_raw_single</string>
3510+
</dict>
34223511
<dict>
34233512
<key>include</key>
34243513
<string>#regular_expressions</string>
@@ -3464,6 +3553,10 @@
34643553
<key>include</key>
34653554
<string>#constant_placeholder</string>
34663555
</dict>
3556+
<dict>
3557+
<key>include</key>
3558+
<string>#escaped_char_raw_single</string>
3559+
</dict>
34673560
</array>
34683561
</dict>
34693562
<dict>
@@ -3505,6 +3598,10 @@
35053598
<key>include</key>
35063599
<string>#constant_placeholder</string>
35073600
</dict>
3601+
<dict>
3602+
<key>include</key>
3603+
<string>#escaped_char_raw_single</string>
3604+
</dict>
35083605
<dict>
35093606
<key>include</key>
35103607
<string>#regular_expressions</string>
@@ -3550,6 +3647,10 @@
35503647
<key>include</key>
35513648
<string>#constant_placeholder</string>
35523649
</dict>
3650+
<dict>
3651+
<key>include</key>
3652+
<string>#escaped_char_raw_single</string>
3653+
</dict>
35533654
</array>
35543655
</dict>
35553656
<dict>
@@ -3691,6 +3792,10 @@
36913792
<key>include</key>
36923793
<string>#constant_placeholder</string>
36933794
</dict>
3795+
<dict>
3796+
<key>include</key>
3797+
<string>#escaped_char_raw_single</string>
3798+
</dict>
36943799
<dict>
36953800
<key>include</key>
36963801
<string>#regular_expressions</string>
@@ -3736,6 +3841,10 @@
37363841
<key>include</key>
37373842
<string>#constant_placeholder</string>
37383843
</dict>
3844+
<dict>
3845+
<key>include</key>
3846+
<string>#escaped_char_raw_single</string>
3847+
</dict>
37393848
</array>
37403849
</dict>
37413850
<dict>
@@ -3777,6 +3886,10 @@
37773886
<key>include</key>
37783887
<string>#constant_placeholder</string>
37793888
</dict>
3889+
<dict>
3890+
<key>include</key>
3891+
<string>#escaped_char_raw_single</string>
3892+
</dict>
37803893
<dict>
37813894
<key>include</key>
37823895
<string>#regular_expressions</string>
@@ -3822,6 +3935,10 @@
38223935
<key>include</key>
38233936
<string>#constant_placeholder</string>
38243937
</dict>
3938+
<dict>
3939+
<key>include</key>
3940+
<string>#escaped_char_raw_single</string>
3941+
</dict>
38253942
</array>
38263943
</dict>
38273944
<dict>
@@ -3863,6 +3980,10 @@
38633980
<key>include</key>
38643981
<string>#constant_placeholder</string>
38653982
</dict>
3983+
<dict>
3984+
<key>include</key>
3985+
<string>#escaped_char_raw_single</string>
3986+
</dict>
38663987
<dict>
38673988
<key>include</key>
38683989
<string>#regular_expressions</string>
@@ -3908,6 +4029,10 @@
39084029
<key>include</key>
39094030
<string>#constant_placeholder</string>
39104031
</dict>
4032+
<dict>
4033+
<key>include</key>
4034+
<string>#escaped_char_raw_single</string>
4035+
</dict>
39114036
</array>
39124037
</dict>
39134038
<dict>

0 commit comments

Comments
 (0)