Skip to content

Commit 4030374

Browse files
chbk1st1
chbk
authored and
1st1
committed
Tokenize @ and . in decorators (#110)
* Tokenize `@` in decorators * Tokenize periods in decorators
1 parent a891320 commit 4030374

File tree

18 files changed

+126
-104
lines changed

18 files changed

+126
-104
lines changed

‎grammars/MagicPython.cson‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ repository:
14791479
begin: '''
14801480
(?x)
14811481
^\\s*
1482-
(@) \\s* (?=[[:alpha:]_]\\w*)
1482+
((@)) \\s* (?=[[:alpha:]_]\\w*)
14831483
14841484
'''
14851485
end: '''
@@ -1493,6 +1493,8 @@ repository:
14931493
beginCaptures:
14941494
"1":
14951495
name: "entity.name.function.decorator.python"
1496+
"2":
1497+
name: "punctuation.definition.decorator.python"
14961498
endCaptures:
14971499
"1":
14981500
name: "punctuation.definition.arguments.end.python"
@@ -1518,9 +1520,12 @@ repository:
15181520
name: "entity.name.function.decorator.python"
15191521
match: '''
15201522
(?x)
1521-
([[:alpha:]_]\\w*) | \\.
1523+
([[:alpha:]_]\\w*) | (\\.)
15221524
15231525
'''
1526+
captures:
1527+
"2":
1528+
name: "punctuation.separator.period.python"
15241529
}
15251530
{
15261531
include: "#line-continuation"

‎grammars/MagicPython.tmLanguage‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2331,7 +2331,7 @@
23312331
<key>begin</key>
23322332
<string>(?x)
23332333
^\s*
2334-
(@) \s* (?=[[:alpha:]_]\w*)
2334+
((@)) \s* (?=[[:alpha:]_]\w*)
23352335
</string>
23362336
<key>end</key>
23372337
<string>(?x)
@@ -2347,6 +2347,11 @@
23472347
<key>name</key>
23482348
<string>entity.name.function.decorator.python</string>
23492349
</dict>
2350+
<key>2</key>
2351+
<dict>
2352+
<key>name</key>
2353+
<string>punctuation.definition.decorator.python</string>
2354+
</dict>
23502355
</dict>
23512356
<key>endCaptures</key>
23522357
<dict>
@@ -2390,8 +2395,16 @@
23902395
<string>entity.name.function.decorator.python</string>
23912396
<key>match</key>
23922397
<string>(?x)
2393-
([[:alpha:]_]\w*) | \.
2398+
([[:alpha:]_]\w*) | (\.)
23942399
</string>
2400+
<key>captures</key>
2401+
<dict>
2402+
<key>2</key>
2403+
<dict>
2404+
<key>name</key>
2405+
<string>punctuation.separator.period.python</string>
2406+
</dict>
2407+
</dict>
23952408
</dict>
23962409
<dict>
23972410
<key>include</key>

‎grammars/src/MagicPython.syntax.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ repository:
11381138
begin: |
11391139
(?x)
11401140
^\s*
1141-
(@) \s* (?=[[:alpha:]_]\w*)
1141+
((@)) \s* (?=[[:alpha:]_]\w*)
11421142
end: |
11431143
(?x)
11441144
( \) )
@@ -1147,6 +1147,7 @@ repository:
11471147
| (?=\n|\#)
11481148
beginCaptures:
11491149
'1': {name: entity.name.function.decorator.python}
1150+
'2': {name: punctuation.definition.decorator.python}
11501151
endCaptures:
11511152
'1': {name: punctuation.definition.arguments.end.python}
11521153
'2': {name: invalid.illegal.decorator.python}
@@ -1162,7 +1163,9 @@ repository:
11621163
- name: entity.name.function.decorator.python
11631164
match: |
11641165
(?x)
1165-
([[:alpha:]_]\w*) | \.
1166+
([[:alpha:]_]\w*) | (\.)
1167+
captures:
1168+
'2': {name: punctuation.separator.period.python}
11661169
- include: '#line-continuation'
11671170
- name: invalid.illegal.decorator.python
11681171
match: |

‎misc/scopes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ punctuation.comment.end.regexp
8484
punctuation.definition.arguments.begin.python
8585
punctuation.definition.arguments.end.python
8686
punctuation.definition.comment.python
87+
punctuation.definition.decorator.python
8788
punctuation.definition.dict.begin.python
8889
punctuation.definition.dict.end.python
8990
punctuation.definition.inheritance.begin.python

‎test/atom-spec/python-spec.js‎

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.

‎test/classes/class12.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class : meta.class.python, source.python, storage.type.class.python
1717
F : entity.name.type.class.python, meta.class.python, source.python
1818
: : meta.class.python, punctuation.section.class.begin.python, source.python
1919
: meta.function.decorator.python, source.python
20-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
20+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
2121
classmethod : meta.function.decorator.python, source.python, support.type.python
2222
: meta.function.python, source.python
2323
def : meta.function.python, source.python, storage.type.function.python

‎test/classes/class2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class Spam(Foo.Bar, Bar.name={'very': 'odd'}):
55

66

77

8-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
8+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
99
dec : entity.name.function.decorator.python, meta.function.decorator.python, source.python
1010
# : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
1111
Bar.name=... is not legal, but the test is for highlighter not breaking badly : comment.line.number-sign.python, source.python

‎test/docstrings/regr1.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def foo():
88
# : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
99
: : comment.line.number-sign.python, source.python
1010
: meta.function.decorator.python, source.python
11-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
11+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
1212
asd : entity.name.function.decorator.python, meta.function.decorator.python, source.python
1313
: meta.function.python, source.python
1414
def : meta.function.python, source.python, storage.type.function.python

‎test/functions/async1.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ async def foo():
77

88

99

10-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
10+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
1111
foo : entity.name.function.decorator.python, meta.function.decorator.python, source.python
1212
async : meta.function.python, source.python, storage.type.function.async.python
1313
: meta.function.python, source.python

‎test/functions/decorators1.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ def decorated(a): pass
88

99

1010

11-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
11+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
1212
some_decorator : entity.name.function.decorator.python, meta.function.decorator.python, source.python
1313
: meta.function.decorator.python, source.python
1414
# : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
1515
with comment : comment.line.number-sign.python, source.python
16-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
16+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
1717
some : entity.name.function.decorator.python, meta.function.decorator.python, source.python
18-
. : entity.name.function.decorator.python, meta.function.decorator.python, source.python
18+
. : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.separator.period.python, source.python
1919
class : keyword.control.flow.python, meta.function.decorator.python, source.python
20-
. : entity.name.function.decorator.python, meta.function.decorator.python, source.python
20+
. : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.separator.period.python, source.python
2121
decorator : entity.name.function.decorator.python, meta.function.decorator.python, source.python
22-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
22+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
2323
some_decorator : entity.name.function.decorator.python, meta.function.decorator.python, source.python
2424
( : meta.function.decorator.python, punctuation.definition.arguments.begin.python, source.python
2525
1 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function.decorator.python, source.python
2626
) : meta.function.decorator.python, punctuation.definition.arguments.end.python, source.python
27-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
27+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
2828
some : entity.name.function.decorator.python, meta.function.decorator.python, source.python
29-
. : entity.name.function.decorator.python, meta.function.decorator.python, source.python
29+
. : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.separator.period.python, source.python
3030
decorator : entity.name.function.decorator.python, meta.function.decorator.python, source.python
3131
: meta.function.decorator.python, source.python
3232
( : meta.function.decorator.python, punctuation.definition.arguments.begin.python, source.python
@@ -35,7 +35,7 @@ class : keyword.control.flow.python, meta.function.decorator.python, sou
3535
: meta.function-call.arguments.python, meta.function.decorator.python, source.python
3636
3 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function.decorator.python, source.python
3737
) : meta.function.decorator.python, punctuation.definition.arguments.end.python, source.python
38-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
38+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
3939
some_decorator : entity.name.function.decorator.python, meta.function.decorator.python, source.python
4040
( : meta.function.decorator.python, punctuation.definition.arguments.begin.python, source.python
4141
a : meta.function-call.arguments.python, meta.function.decorator.python, source.python, variable.parameter.function-call.python
@@ -58,7 +58,7 @@ class : keyword.control.flow.python, meta.function.decorator.python, sou
5858
** : keyword.operator.unpacking.arguments.python, meta.function-call.arguments.python, meta.function.decorator.python, source.python
5959
kwargs : meta.function-call.arguments.python, meta.function.decorator.python, source.python
6060
) : meta.function.decorator.python, punctuation.definition.arguments.end.python, source.python
61-
@ : entity.name.function.decorator.python, meta.function.decorator.python, source.python
61+
@ : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
6262
classmethod : meta.function.decorator.python, source.python, support.type.python
6363
def : meta.function.python, source.python, storage.type.function.python
6464
: meta.function.python, source.python

0 commit comments

Comments
 (0)