Skip to content

Commit a632f38

Browse files
nullienullie
committed
Update for loop test MagicStack#211 
1 parent 2ca894f commit a632f38

File tree

2 files changed

+78
-57
lines changed

2 files changed

+78
-57
lines changed

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

Lines changed: 68 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -12192,65 +12192,77 @@ describe("Grammar Tests", function() {
1219212192

1219312193
it("test/statements/for2.py",
1219412194
function() {
12195-
tokens = grammar.tokenizeLines("for a, b, c in [2 in q, 2 in w]:\n pass")
12195+
tokens = grammar.tokenizeLines("forvariable = None\nfor a, b, c, invariable in [2 in q, 2 in w]:\n pass")
1219612196
expect(tokens[0][0].value).toBe("for");
1219712197
expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
12198-
expect(tokens[0][1].value).toBe(" ");
12198+
expect(tokens[0][1].value).toBe("variable = ");
1219912199
expect(tokens[0][1].scopes).toEqual(["source.python"]);
12200-
expect(tokens[0][2].value).toBe("a");
12201-
expect(tokens[0][2].scopes).toEqual(["source.python"]);
12202-
expect(tokens[0][3].value).toBe(",");
12203-
expect(tokens[0][3].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
12204-
expect(tokens[0][4].value).toBe(" ");
12205-
expect(tokens[0][4].scopes).toEqual(["source.python"]);
12206-
expect(tokens[0][5].value).toBe("b");
12207-
expect(tokens[0][5].scopes).toEqual(["source.python"]);
12208-
expect(tokens[0][6].value).toBe(",");
12209-
expect(tokens[0][6].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
12210-
expect(tokens[0][7].value).toBe(" ");
12211-
expect(tokens[0][7].scopes).toEqual(["source.python"]);
12212-
expect(tokens[0][8].value).toBe("c");
12213-
expect(tokens[0][8].scopes).toEqual(["source.python"]);
12214-
expect(tokens[0][9].value).toBe(" ");
12215-
expect(tokens[0][9].scopes).toEqual(["source.python"]);
12216-
expect(tokens[0][10].value).toBe("in");
12217-
expect(tokens[0][10].scopes).toEqual(["source.python","keyword.control.flow.python"]);
12218-
expect(tokens[0][11].value).toBe(" ");
12219-
expect(tokens[0][11].scopes).toEqual(["source.python"]);
12220-
expect(tokens[0][12].value).toBe("[");
12221-
expect(tokens[0][12].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
12222-
expect(tokens[0][13].value).toBe("2");
12223-
expect(tokens[0][13].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
12224-
expect(tokens[0][14].value).toBe(" ");
12225-
expect(tokens[0][14].scopes).toEqual(["source.python"]);
12226-
expect(tokens[0][15].value).toBe("in");
12227-
expect(tokens[0][15].scopes).toEqual(["source.python","keyword.operator.logical.python"]);
12228-
expect(tokens[0][16].value).toBe(" ");
12229-
expect(tokens[0][16].scopes).toEqual(["source.python"]);
12230-
expect(tokens[0][17].value).toBe("q");
12231-
expect(tokens[0][17].scopes).toEqual(["source.python"]);
12232-
expect(tokens[0][18].value).toBe(",");
12233-
expect(tokens[0][18].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
12234-
expect(tokens[0][19].value).toBe(" ");
12235-
expect(tokens[0][19].scopes).toEqual(["source.python"]);
12236-
expect(tokens[0][20].value).toBe("2");
12237-
expect(tokens[0][20].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
12238-
expect(tokens[0][21].value).toBe(" ");
12239-
expect(tokens[0][21].scopes).toEqual(["source.python"]);
12240-
expect(tokens[0][22].value).toBe("in");
12241-
expect(tokens[0][22].scopes).toEqual(["source.python","keyword.operator.logical.python"]);
12242-
expect(tokens[0][23].value).toBe(" ");
12243-
expect(tokens[0][23].scopes).toEqual(["source.python"]);
12244-
expect(tokens[0][24].value).toBe("w");
12245-
expect(tokens[0][24].scopes).toEqual(["source.python"]);
12246-
expect(tokens[0][25].value).toBe("]");
12247-
expect(tokens[0][25].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
12248-
expect(tokens[0][26].value).toBe(":");
12249-
expect(tokens[0][26].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
12250-
expect(tokens[1][0].value).toBe(" ");
12251-
expect(tokens[1][0].scopes).toEqual(["source.python"]);
12252-
expect(tokens[1][1].value).toBe("pass");
12253-
expect(tokens[1][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
12200+
expect(tokens[0][2].value).toBe("None");
12201+
expect(tokens[0][2].scopes).toEqual(["source.python","constant.language.python"]);
12202+
expect(tokens[1][0].value).toBe("for");
12203+
expect(tokens[1][0].scopes).toEqual(["source.python","keyword.control.flow.python"]);
12204+
expect(tokens[1][1].value).toBe(" ");
12205+
expect(tokens[1][1].scopes).toEqual(["source.python"]);
12206+
expect(tokens[1][2].value).toBe("a");
12207+
expect(tokens[1][2].scopes).toEqual(["source.python"]);
12208+
expect(tokens[1][3].value).toBe(",");
12209+
expect(tokens[1][3].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
12210+
expect(tokens[1][4].value).toBe(" ");
12211+
expect(tokens[1][4].scopes).toEqual(["source.python"]);
12212+
expect(tokens[1][5].value).toBe("b");
12213+
expect(tokens[1][5].scopes).toEqual(["source.python"]);
12214+
expect(tokens[1][6].value).toBe(",");
12215+
expect(tokens[1][6].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
12216+
expect(tokens[1][7].value).toBe(" ");
12217+
expect(tokens[1][7].scopes).toEqual(["source.python"]);
12218+
expect(tokens[1][8].value).toBe("c");
12219+
expect(tokens[1][8].scopes).toEqual(["source.python"]);
12220+
expect(tokens[1][9].value).toBe(",");
12221+
expect(tokens[1][9].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
12222+
expect(tokens[1][10].value).toBe(" ");
12223+
expect(tokens[1][10].scopes).toEqual(["source.python"]);
12224+
expect(tokens[1][11].value).toBe("in");
12225+
expect(tokens[1][11].scopes).toEqual(["source.python","keyword.control.flow.python"]);
12226+
expect(tokens[1][12].value).toBe("variable ");
12227+
expect(tokens[1][12].scopes).toEqual(["source.python"]);
12228+
expect(tokens[1][13].value).toBe("in");
12229+
expect(tokens[1][13].scopes).toEqual(["source.python","keyword.control.flow.python"]);
12230+
expect(tokens[1][14].value).toBe(" ");
12231+
expect(tokens[1][14].scopes).toEqual(["source.python"]);
12232+
expect(tokens[1][15].value).toBe("[");
12233+
expect(tokens[1][15].scopes).toEqual(["source.python","punctuation.definition.list.begin.python"]);
12234+
expect(tokens[1][16].value).toBe("2");
12235+
expect(tokens[1][16].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
12236+
expect(tokens[1][17].value).toBe(" ");
12237+
expect(tokens[1][17].scopes).toEqual(["source.python"]);
12238+
expect(tokens[1][18].value).toBe("in");
12239+
expect(tokens[1][18].scopes).toEqual(["source.python","keyword.operator.logical.python"]);
12240+
expect(tokens[1][19].value).toBe(" ");
12241+
expect(tokens[1][19].scopes).toEqual(["source.python"]);
12242+
expect(tokens[1][20].value).toBe("q");
12243+
expect(tokens[1][20].scopes).toEqual(["source.python"]);
12244+
expect(tokens[1][21].value).toBe(",");
12245+
expect(tokens[1][21].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
12246+
expect(tokens[1][22].value).toBe(" ");
12247+
expect(tokens[1][22].scopes).toEqual(["source.python"]);
12248+
expect(tokens[1][23].value).toBe("2");
12249+
expect(tokens[1][23].scopes).toEqual(["source.python","constant.numeric.dec.python"]);
12250+
expect(tokens[1][24].value).toBe(" ");
12251+
expect(tokens[1][24].scopes).toEqual(["source.python"]);
12252+
expect(tokens[1][25].value).toBe("in");
12253+
expect(tokens[1][25].scopes).toEqual(["source.python","keyword.operator.logical.python"]);
12254+
expect(tokens[1][26].value).toBe(" ");
12255+
expect(tokens[1][26].scopes).toEqual(["source.python"]);
12256+
expect(tokens[1][27].value).toBe("w");
12257+
expect(tokens[1][27].scopes).toEqual(["source.python"]);
12258+
expect(tokens[1][28].value).toBe("]");
12259+
expect(tokens[1][28].scopes).toEqual(["source.python","punctuation.definition.list.end.python"]);
12260+
expect(tokens[1][29].value).toBe(":");
12261+
expect(tokens[1][29].scopes).toEqual(["source.python","punctuation.separator.colon.python"]);
12262+
expect(tokens[2][0].value).toBe(" ");
12263+
expect(tokens[2][0].scopes).toEqual(["source.python"]);
12264+
expect(tokens[2][1].value).toBe("pass");
12265+
expect(tokens[2][1].scopes).toEqual(["source.python","keyword.control.flow.python"]);
1225412266
});
1225512267

1225612268
it("test/statements/from1.py",

‎test/statements/for2.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
for a, b, c in [2 in q, 2 in w]:
1+
forvariable = None
2+
for a, b, c, invariable in [2 in q, 2 in w]:
23
pass
34

45

56

67

8+
forvariable : source.python
9+
: source.python
10+
= : keyword.operator.assignment.python, source.python
11+
: source.python
12+
None : constant.language.python, source.python
713
for : keyword.control.flow.python, source.python
814
: source.python
915
a : source.python
@@ -13,6 +19,9 @@
1319
, : punctuation.separator.element.python, source.python
1420
: source.python
1521
c : source.python
22+
, : punctuation.separator.element.python, source.python
23+
: source.python
24+
invariable : source.python
1625
: source.python
1726
in : keyword.control.flow.python, source.python
1827
: source.python

0 commit comments

Comments
 (0)