FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix incorrect highlighting of magic method calls. · MagicStack/MagicPython@3f3da35 · GitHub

/ MagicPython Public

Commit 3f3da35

Browse files
vpetrovykh
committed
Fix incorrect highlighting of magic method calls.
1 parent f9aa6f1 commit 3f3da35

4 files changed

Lines changed: 101 additions & 6 deletions

File tree

‎grammars/MagicPython.cson‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,7 @@ repository:
15681568
'''
15691569
match: '''
15701570
(?x)
1571-
(\\.)?\\b(
1571+
\\b(
15721572
__(?:
15731573
abs | add | aenter | aexit | aiter | and | anext | await
15741574
| bool | call | ceil | cmp | coerce | complex | contains
@@ -1592,7 +1592,7 @@ repository:
15921592
15931593
'''
15941594
captures:
1595-
"2":
1595+
"1":
15961596
name: "support.function.magic.python"
15971597
"magic-variable-names":
15981598
comment: "magic variables which a class/module may have."

‎grammars/MagicPython.syntax.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ repository:
10581058
indirectly through syntactic constructs
10591059
match: |
10601060
(?x)
1061-
(\.)?\b(
1061+
\b(
10621062
__(?:
10631063
abs | add | aenter | aexit | aiter | and | anext | await
10641064
| bool | call | ceil | cmp | coerce | complex | contains
@@ -1080,7 +1080,7 @@ repository:
10801080
)__
10811081
)\b
10821082
captures:
1083-
'2': {name: support.function.magic.python}
1083+
'1': {name: support.function.magic.python}
10841084

10851085
magic-variable-names:
10861086
comment: magic variables which a class/module may have.

‎grammars/MagicPython.tmLanguage‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2474,7 +2474,7 @@ indirectly through syntactic constructs
24742474
</string>
24752475
<key>match</key>
24762476
<string>(?x)
2477-
(\.)?\b(
2477+
\b(
24782478
__(?:
24792479
abs | add | aenter | aexit | aiter | and | anext | await
24802480
| bool | call | ceil | cmp | coerce | complex | contains
@@ -2498,7 +2498,7 @@ indirectly through syntactic constructs
24982498
</string>
24992499
<key>captures</key>
25002500
<dict>
2501-
<key>2</key>
2501+
<key>1</key>
25022502
<dict>
25032503
<key>name</key>
25042504
<string>support.function.magic.python</string>

‎test/classes/super1.py‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
class Foo:
2+
def __init__(self):
3+
super().__init__(foo=1)
4+
super(). __init__(foo=1)
5+
super(). \
6+
__init__(foo=1)
7+
__init__(foo=1)
8+
9+
foo.__init__(bar=1)
10+
__init__(bar=1)
11+
if:
12+
__init__(bar=1)
13+
14+
15+
16+
17+
class : meta.class.python, source.python, storage.type.class.python
18+
: meta.class.python, source.python
19+
Foo : entity.name.type.class.python, meta.class.python, source.python
20+
: : meta.class.python, punctuation.section.class.begin.python, source.python
21+
: source.python
22+
def : meta.function.python, source.python, storage.type.function.python
23+
: meta.function.python, source.python
24+
__init__ : meta.function.python, source.python, support.function.magic.python
25+
( : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.begin.python, source.python
26+
self : meta.function.parameters.python, meta.function.python, source.python, variable.parameter.function.language.python, variable.parameter.function.language.special.self.python
27+
) : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
28+
: : meta.function.python, punctuation.section.function.begin.python, source.python
29+
: source.python
30+
super : meta.function-call.python, source.python, support.type.python
31+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
32+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
33+
. : source.python
34+
__init__ : meta.function-call.python, source.python, support.function.magic.python
35+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
36+
foo : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
37+
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
38+
1 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
39+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
40+
: source.python
41+
super : meta.function-call.python, source.python, support.type.python
42+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
43+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
44+
. : source.python
45+
__init__ : meta.function-call.python, source.python, support.function.magic.python
46+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
47+
foo : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
48+
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
49+
1 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
50+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
51+
: source.python
52+
super : meta.function-call.python, source.python, support.type.python
53+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
54+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
55+
. : source.python
56+
\ : separator.continuation.line.python, source.python
57+
: source.python
58+
__init__ : meta.function-call.python, source.python, support.function.magic.python
59+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
60+
foo : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
61+
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
62+
1 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
63+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
64+
: source.python
65+
__init__ : meta.function-call.python, source.python, support.function.magic.python
66+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
67+
foo : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
68+
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
69+
1 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
70+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
71+
: source.python
72+
foo. : source.python
73+
__init__ : meta.function-call.python, source.python, support.function.magic.python
74+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
75+
bar : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
76+
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
77+
1 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
78+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
79+
: source.python
80+
__init__ : meta.function-call.python, source.python, support.function.magic.python
81+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
82+
bar : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
83+
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
84+
1 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
85+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
86+
: source.python
87+
if : keyword.control.flow.python, source.python
88+
: : source.python
89+
: source.python
90+
__init__ : meta.function-call.python, source.python, support.function.magic.python
91+
( : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
92+
bar : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
93+
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
94+
1 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python
95+
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL