Skip to content

Commit 489a57e

Browse files
committed
Add 'meta.function-call.generic.python' scope to callee names
1 parent e46428f commit 489a57e

18 files changed

+27
-18
lines changed

grammars/MagicPython.cson

+2
Original file line numberDiff line numberDiff line change
@@ -1348,6 +1348,8 @@ repository:
13481348
include: "#builtin-possible-callables"
13491349
}
13501350
{
1351+
comment: "Some color schemas support meta.function-call.generic scope"
1352+
name: "meta.function-call.generic.python"
13511353
match: '''
13521354
(?x)
13531355
\\b ([[:alpha:]_]\\w*) \\b

grammars/MagicPython.syntax.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,9 @@ repository:
900900
function-name:
901901
patterns:
902902
- include: '#builtin-possible-callables'
903-
- match: |
903+
- comment: Some color schemas support meta.function-call.generic scope
904+
name: meta.function-call.generic.python
905+
match: |
904906
(?x)
905907
\b ([[:alpha:]_]\w*) \b
906908

grammars/MagicPython.tmLanguage

+4
Original file line numberDiff line numberDiff line change
@@ -2180,6 +2180,10 @@ it's not tokenized as ellipsis.
21802180
<string>#builtin-possible-callables</string>
21812181
</dict>
21822182
<dict>
2183+
<key>comment</key>
2184+
<string>Some color schemas support meta.function-call.generic scope</string>
2185+
<key>name</key>
2186+
<string>meta.function-call.generic.python</string>
21832187
<key>match</key>
21842188
<string>(?x)
21852189
\b ([[:alpha:]_]\w*) \b

misc/scopes

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ meta.class.inheritance.python
5353
meta.class.python
5454
meta.expression.python
5555
meta.function-call.arguments.python
56+
meta.function-call.generic.python
5657
meta.function-call.python
5758
meta.function.decorator.python
5859
meta.function.parameters.python

test/calls/call1.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
some_call : meta.function-call.python, source.python
5+
some_call : meta.function-call.generic.python, meta.function-call.python, source.python
66
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
77
A : constant.other.caps.python, meta.function-call.arguments.python, meta.function-call.python, source.python
88
, : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python

test/calls/call2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
foo : meta.function-call.python, source.python
5+
foo : meta.function-call.generic.python, meta.function-call.python, source.python
66
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
77
from : keyword.control.flow.python, meta.function-call.arguments.python, meta.function-call.python, source.python
88
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python

test/calls/call4.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
. : source.python
99
1 : source.python
1010
: source.python
11-
foo : meta.function-call.python, source.python
11+
foo : meta.function-call.generic.python, meta.function-call.python, source.python
1212
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
1313
bar : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
1414
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python

test/expressions/const1.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
QQQq QQQq123 : source.python
3333
self : source.python, variable.language.special.self.python
3434
. : source.python
35-
FOOO : meta.function-call.python, source.python
35+
FOOO : meta.function-call.generic.python, meta.function-call.python, source.python
3636
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
3737
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
3838
_ _1 __1 _1A __1A _a __a __ ___ ___a ___1 __aA ___Aa : source.python

test/expressions/expr10.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
= : keyword.operator.assignment.python, source.python
1010
: source.python
1111
... : constant.other.ellipsis.python, source.python
12-
a : meta.function-call.python, source.python
12+
a : meta.function-call.generic.python, meta.function-call.python, source.python
1313
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
1414
... : constant.other.ellipsis.python, meta.function-call.arguments.python, meta.function-call.python, source.python
1515
, : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python

test/expressions/expr6.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
: source.python
88
( : punctuation.parenthesis.begin.python, source.python
99
a, : source.python
10-
b : meta.function-call.python, source.python
10+
b : meta.function-call.generic.python, meta.function-call.python, source.python
1111
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
1212
a : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
1313
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
@@ -16,7 +16,7 @@
1616
, : source.python
1717
{ : punctuation.definition.dict.begin.python, source.python
1818
c: : source.python
19-
d : meta.function-call.python, source.python
19+
d : meta.function-call.generic.python, meta.function-call.python, source.python
2020
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
2121
b : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
2222
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
@@ -25,7 +25,7 @@
2525
, e: : source.python
2626
[ : punctuation.definition.list.begin.python, source.python
2727
a, : source.python
28-
b : meta.function-call.python, source.python
28+
b : meta.function-call.generic.python, meta.function-call.python, source.python
2929
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
3030
z : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
3131
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python

test/functions/async1.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def : meta.function.python, source.python, storage.type.function.pytho
3939
: source.python
4040
await : keyword.operator.python, source.python
4141
: source.python
42-
func : meta.function-call.python, source.python
42+
func : meta.function-call.generic.python, meta.function-call.python, source.python
4343
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
4444
a : meta.function-call.arguments.python, meta.function-call.python, source.python
4545
, : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python

test/functions/decl3.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ def : meta.function.parameters.python, meta.function.python, source.py
4444
: meta.function.parameters.python, meta.function.python, source.python
4545
= : keyword.operator.assignment.python, meta.function.parameters.python, meta.function.python, source.python
4646
: meta.function.parameters.python, meta.function.python, source.python
47-
foo : meta.function-call.python, meta.function.parameters.python, meta.function.python, source.python
47+
foo : meta.function-call.generic.python, meta.function-call.python, meta.function.parameters.python, meta.function.python, source.python
4848
( : meta.function-call.arguments.python, meta.function-call.python, meta.function.parameters.python, meta.function.python, punctuation.definition.arguments.begin.python, source.python
49-
n : meta.function-call.arguments.python, meta.function-call.python, meta.function.parameters.python, meta.function.python, source.python
49+
n : meta.function-call.arguments.python, meta.function-call.generic.python, meta.function-call.python, meta.function.parameters.python, meta.function.python, source.python
5050
( : meta.function-call.arguments.python, meta.function-call.python, meta.function.parameters.python, meta.function.python, punctuation.definition.arguments.begin.python, source.python
5151
m : meta.function-call.arguments.python, meta.function-call.python, meta.function.parameters.python, meta.function.python, source.python, variable.parameter.function-call.python
5252
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, meta.function.parameters.python, meta.function.python, source.python

test/functions/lambda1.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
77
That's how we want it: : comment.line.number-sign.python, source.python
8-
lll : meta.function-call.python, source.python
8+
lll : meta.function-call.generic.python, meta.function-call.python, source.python
99
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
1010
lambda : meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.function.lambda.python
1111
) : meta.function-call.python, punctuation.definition.arguments.end.python, source.python

test/functions/lambda2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
lll(lambda=1)
22

33

4-
lll : meta.function-call.python, source.python
4+
lll : meta.function-call.generic.python, meta.function-call.python, source.python
55
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
66
lambda : keyword.control.flow.python, meta.function-call.arguments.python, meta.function-call.python, source.python
77
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python

test/functions/lambda6.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
: meta.function.lambda.parameters.python, meta.lambda-function.python, source.python
2929
d : meta.function.lambda.parameters.python, meta.lambda-function.python, source.python, variable.parameter.function.language.python
3030
= : keyword.operator.python, meta.function.lambda.parameters.python, meta.lambda-function.python, source.python
31-
toow : meta.function-call.python, meta.function.lambda.parameters.python, meta.lambda-function.python, source.python
31+
toow : meta.function-call.generic.python, meta.function-call.python, meta.function.lambda.parameters.python, meta.lambda-function.python, source.python
3232
( : meta.function-call.arguments.python, meta.function-call.python, meta.function.lambda.parameters.python, meta.lambda-function.python, punctuation.definition.arguments.begin.python, source.python
3333
24 : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, meta.function.lambda.parameters.python, meta.lambda-function.python, source.python
3434
) : meta.function-call.python, meta.function.lambda.parameters.python, meta.lambda-function.python, punctuation.definition.arguments.end.python, source.python

test/illegals/illegal1.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def : meta.function.python, source.python, storage.type.function.pytho
2929
' : punctuation.definition.string.end.python, source.python, string.quoted.single.python
3030
) : punctuation.parenthesis.end.python, source.python
3131
. : source.python
32-
fuuuu : meta.function-call.python, source.python
32+
fuuuu : meta.function-call.generic.python, meta.function-call.python, source.python
3333
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
3434
baz : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
3535
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python

test/regexp/python8.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
CookiePattern : source.python
2929
= : keyword.operator.assignment.python, source.python
3030
re. : source.python
31-
compile : meta.function-call.python, source.python
31+
compile : meta.function-call.generic.python, meta.function-call.python, source.python
3232
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
3333
r : meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.string.python, string.regexp.quoted.multi.python
3434
""" : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.regexp.quoted.multi.python

test/strings/format2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
} : constant.character.format.python, source.python, string.quoted.single.python
2121
" : punctuation.definition.string.end.python, source.python, string.quoted.single.python
2222
. : source.python
23-
format : meta.function-call.python, source.python
23+
format : meta.function-call.generic.python, meta.function-call.python, source.python
2424
( : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
2525
fo : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
2626
= : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python

0 commit comments

Comments
 (0)