Skip to content

Commit 7c43d1c

Browse files
vpetrovykhvpetrovykh
committed
Fix an issue with import highlighting.
Issue MagicStack#133.
1 parent 9c874c6 commit 7c43d1c

File tree

7 files changed

+114
-29
lines changed

7 files changed

+114
-29
lines changed

‎grammars/MagicPython.cson

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ repository:
10061006
{
10071007
match: '''
10081008
(?x)
1009-
\\s* \\b(from)\\b \\s*(\\.+)\\s* (import)?
1009+
\\s* \\b(from) \\s*(\\.+)\\s* (import\\b)?
10101010
10111011
'''
10121012
captures:
@@ -1840,18 +1840,26 @@ repository:
18401840
}
18411841
]
18421842
"illegal-names":
1843-
name: "keyword.control.flow.python"
18441843
match: '''
18451844
(?x)
1846-
\\b(
1847-
and | as | assert | async | await | break | class | continue | def
1848-
| del | elif | else | except | finally | for | from | global
1849-
| if | import | in | is | (?<=\\.)lambda | lambda(?=\\s*[\\.=])
1850-
| nonlocal | not | or | pass | raise | return | try | while | with
1851-
| yield
1845+
\\b(?:
1846+
(
1847+
and | as | assert | async | await | break | class | continue | def
1848+
| del | elif | else | except | finally | for | from | global
1849+
| if | in | is | (?<=\\.)lambda | lambda(?=\\s*[\\.=])
1850+
| nonlocal | not | or | pass | raise | return | try | while | with
1851+
| yield
1852+
) | (
1853+
import
1854+
)
18521855
)\\b
18531856
18541857
'''
1858+
captures:
1859+
"1":
1860+
name: "keyword.control.flow.python"
1861+
"2":
1862+
name: "keyword.control.import.python"
18551863
"special-variables":
18561864
match: '''
18571865
(?x)

‎grammars/MagicPython.tmLanguage

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,7 +1540,7 @@
15401540
<dict>
15411541
<key>match</key>
15421542
<string>(?x)
1543-
\s* \b(from)\b \s*(\.+)\s* (import)?
1543+
\s* \b(from) \s*(\.+)\s* (import\b)?
15441544
</string>
15451545
<key>captures</key>
15461546
<dict>
@@ -2833,18 +2833,33 @@ indirectly through syntactic constructs
28332833
</dict>
28342834
<key>illegal-names</key>
28352835
<dict>
2836-
<key>name</key>
2837-
<string>keyword.control.flow.python</string>
28382836
<key>match</key>
28392837
<string>(?x)
2840-
\b(
2841-
and | as | assert | async | await | break | class | continue | def
2842-
| del | elif | else | except | finally | for | from | global
2843-
| if | import | in | is | (?&lt;=\.)lambda | lambda(?=\s*[\.=])
2844-
| nonlocal | not | or | pass | raise | return | try | while | with
2845-
| yield
2838+
\b(?:
2839+
(
2840+
and | as | assert | async | await | break | class | continue | def
2841+
| del | elif | else | except | finally | for | from | global
2842+
| if | in | is | (?&lt;=\.)lambda | lambda(?=\s*[\.=])
2843+
| nonlocal | not | or | pass | raise | return | try | while | with
2844+
| yield
2845+
) | (
2846+
import
2847+
)
28462848
)\b
28472849
</string>
2850+
<key>captures</key>
2851+
<dict>
2852+
<key>1</key>
2853+
<dict>
2854+
<key>name</key>
2855+
<string>keyword.control.flow.python</string>
2856+
</dict>
2857+
<key>2</key>
2858+
<dict>
2859+
<key>name</key>
2860+
<string>keyword.control.import.python</string>
2861+
</dict>
2862+
</dict>
28482863
</dict>
28492864
<key>special-variables</key>
28502865
<dict>

‎grammars/src/MagicPython.syntax.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ repository:
848848
patterns:
849849
- match: |
850850
(?x)
851-
\s* \b(from)\b \s*(\.+)\s* (import)?
851+
\s* \b(from) \s*(\.+)\s* (import\b)?
852852
captures:
853853
'1': {name: keyword.control.import.python}
854854
'2': {name: punctuation.separator.period.python}
@@ -1388,16 +1388,23 @@ repository:
13881388
- include: '#magic-variable-names'
13891389

13901390
illegal-names:
1391-
name: keyword.control.flow.python
13921391
match: |
13931392
(?x)
1394-
\b(
1395-
and | as | assert | async | await | break | class | continue | def
1396-
| del | elif | else | except | finally | for | from | global
1397-
| if | import | in | is | (?<=\.)lambda | lambda(?=\s*[\.=])
1398-
| nonlocal | not | or | pass | raise | return | try | while | with
1399-
| yield
1393+
\b(?:
1394+
(
1395+
and | as | assert | async | await | break | class | continue | def
1396+
| del | elif | else | except | finally | for | from | global
1397+
| if | in | is | (?<=\.)lambda | lambda(?=\s*[\.=])
1398+
| nonlocal | not | or | pass | raise | return | try | while | with
1399+
| yield
1400+
) | (
1401+
import
1402+
)
14001403
)\b
1404+
captures:
1405+
'1': {name: keyword.control.flow.python}
1406+
'2': {name: keyword.control.import.python}
1407+
14011408

14021409
special-variables:
14031410
match: |

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

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5825,7 +5825,7 @@ describe("Grammar Tests", function() {
58255825
expect(tokens[2][8].value).toBe("{");
58265826
expect(tokens[2][8].scopes).toEqual(["source.python","punctuation.definition.dict.begin.python"]);
58275827
expect(tokens[2][9].value).toBe("import");
5828-
expect(tokens[2][9].scopes).toEqual(["source.python","keyword.control.flow.python"]);
5828+
expect(tokens[2][9].scopes).toEqual(["source.python","keyword.control.import.python"]);
58295829
expect(tokens[2][10].value).toBe(":");
58305830
expect(tokens[2][10].scopes).toEqual(["source.python","punctuation.separator.dict.python"]);
58315831
expect(tokens[2][11].value).toBe(" ");
@@ -12370,7 +12370,7 @@ describe("Grammar Tests", function() {
1237012370
expect(tokens[3][1].value).toBe(".");
1237112371
expect(tokens[3][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
1237212372
expect(tokens[3][2].value).toBe("import");
12373-
expect(tokens[3][2].scopes).toEqual(["source.python","keyword.control.flow.python"]);
12373+
expect(tokens[3][2].scopes).toEqual(["source.python","keyword.control.import.python"]);
1237412374
expect(tokens[4][0].value).toBe("");
1237512375
expect(tokens[4][0].scopes).toEqual(["source.python"]);
1237612376
expect(tokens[5][0].value).toBe("raise");
@@ -12430,6 +12430,41 @@ describe("Grammar Tests", function() {
1243012430
expect(tokens[0][6].scopes).toEqual(["source.python"]);
1243112431
});
1243212432

12433+
it("test/statements/import7.py",
12434+
function() {
12435+
tokens = grammar.tokenizeLines("from .importing import *\nfrom importing import *")
12436+
expect(tokens[0][0].value).toBe("from");
12437+
expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
12438+
expect(tokens[0][1].value).toBe(" ");
12439+
expect(tokens[0][1].scopes).toEqual(["source.python"]);
12440+
expect(tokens[0][2].value).toBe(".");
12441+
expect(tokens[0][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
12442+
expect(tokens[0][3].value).toBe("importing");
12443+
expect(tokens[0][3].scopes).toEqual(["source.python"]);
12444+
expect(tokens[0][4].value).toBe(" ");
12445+
expect(tokens[0][4].scopes).toEqual(["source.python"]);
12446+
expect(tokens[0][5].value).toBe("import");
12447+
expect(tokens[0][5].scopes).toEqual(["source.python","keyword.control.import.python"]);
12448+
expect(tokens[0][6].value).toBe(" ");
12449+
expect(tokens[0][6].scopes).toEqual(["source.python"]);
12450+
expect(tokens[0][7].value).toBe("*");
12451+
expect(tokens[0][7].scopes).toEqual(["source.python","keyword.operator.arithmetic.python"]);
12452+
expect(tokens[1][0].value).toBe("from");
12453+
expect(tokens[1][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
12454+
expect(tokens[1][1].value).toBe(" ");
12455+
expect(tokens[1][1].scopes).toEqual(["source.python"]);
12456+
expect(tokens[1][2].value).toBe("importing");
12457+
expect(tokens[1][2].scopes).toEqual(["source.python"]);
12458+
expect(tokens[1][3].value).toBe(" ");
12459+
expect(tokens[1][3].scopes).toEqual(["source.python"]);
12460+
expect(tokens[1][4].value).toBe("import");
12461+
expect(tokens[1][4].scopes).toEqual(["source.python","keyword.control.import.python"]);
12462+
expect(tokens[1][5].value).toBe(" ");
12463+
expect(tokens[1][5].scopes).toEqual(["source.python"]);
12464+
expect(tokens[1][6].value).toBe("*");
12465+
expect(tokens[1][6].scopes).toEqual(["source.python","keyword.operator.arithmetic.python"]);
12466+
});
12467+
1243312468
it("test/statements/nonlocal1.py",
1243412469
function() {
1243512470
tokens = grammar.tokenizeLines("nonlocal a, b, c")

‎test/expressions/expr5.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
: : punctuation.separator.dict.python, source.python
3434
: source.python
3535
{ : punctuation.definition.dict.begin.python, source.python
36-
import : keyword.control.flow.python, source.python
36+
import : keyword.control.import.python, source.python
3737
: : punctuation.separator.dict.python, source.python
3838
: source.python
3939
a : source.python

‎test/statements/import5.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def bar():
2525
: source.python
2626
foo : source.python
2727
. : punctuation.separator.period.python, source.python
28-
import : keyword.control.flow.python, source.python
28+
import : keyword.control.import.python, source.python
2929
: source.python
3030
raise : keyword.control.flow.python, source.python
3131
: source.python

‎test/statements/import7.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
from .importing import *
2+
from importing import *
3+
4+
5+
6+
from : keyword.control.import.python, source.python
7+
: source.python
8+
. : punctuation.separator.period.python, source.python
9+
importing : source.python
10+
: source.python
11+
import : keyword.control.import.python, source.python
12+
: source.python
13+
* : keyword.operator.arithmetic.python, source.python
14+
from : keyword.control.flow.python, source.python
15+
: source.python
16+
importing : source.python
17+
: source.python
18+
import : keyword.control.import.python, source.python
19+
: source.python
20+
* : keyword.operator.arithmetic.python, source.python

0 commit comments

Comments
 (0)