Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit 22934e6

Browse files
authored
Merge pull request #162 from juanjux/fix/comment_brackets
Remove brackets from comments on the same line + position fix backport
2 parents 6629fad + 289a4f5 commit 22934e6

File tree

189 files changed

+7863
-7809
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+7863
-7809
lines changed

.gitignore

Lines changed: 2 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,2 @@
1-
# Byte-compiled / optimized / DLL files
2-
__pycache__/
3-
*.py[cod]
4-
*$py.class
5-
6-
# C extensions
7-
*.so
8-
9-
# Distribution / packaging
10-
.Python
11-
env/
12-
build/
13-
develop-eggs/
14-
dist/
15-
downloads/
16-
eggs/
17-
.eggs/
18-
lib/
19-
lib64/
20-
parts/
21-
sdist/
22-
var/
23-
*.egg-info/
24-
.installed.cfg
25-
*.egg
26-
27-
# PyInstaller
28-
# Usually these files are written by a python script from a template
29-
# before PyInstaller builds the exe, so as to inject date/other infos into it.
30-
*.manifest
31-
*.spec
32-
33-
# Installer logs
34-
pip-log.txt
35-
pip-delete-this-directory.txt
36-
37-
# Unit test / coverage reports
38-
htmlcov/
39-
.tox/
40-
.coverage
41-
.coverage.*
42-
.cache
43-
nosetests.xml
44-
coverage.xml
45-
*,cover
46-
.hypothesis/
47-
48-
# Translations
49-
*.mo
50-
*.pot
51-
52-
# Django stuff:
53-
*.log
54-
local_settings.py
55-
56-
# Flask stuff:
57-
instance/
58-
.webassets-cache
59-
60-
# Scrapy stuff:
61-
.scrapy
62-
63-
# Sphinx documentation
64-
docs/_build/
65-
66-
# PyBuilder
67-
target/
68-
69-
# IPython Notebook
70-
.ipynb_checkpoints
71-
72-
# pyenv
73-
.python-version
74-
75-
# celery beat schedule file
76-
celerybeat-schedule
77-
78-
# dotenv
79-
.env
80-
81-
# virtualenv
82-
venv/
83-
ENV/
84-
85-
# Spyder project settings
86-
.spyderproject
87-
88-
# Rope project settings
89-
.ropeproject
90-
91-
.idea/*
92-
93-
test/nimcache/*
94-
test/sendmsg
95-
96-
# pycharm
97-
.idea/*
98-
99-
# virtualenv
100-
36env/*
101-
install.sh
102-
mypy/*
103-
104-
Dockerfile
105-
106-
.sdk/*
107-
driver/main
108-
main
109-
.local/*
110-
111-
.mypy_cache
1+
.sdk
2+
build

fixtures/annotations.py.native

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"ast_type": "Name",
1212
"col_offset": 4,
1313
"ctx": "Load",
14-
"end_col_offset": 6,
14+
"end_col_offset": 7,
1515
"end_lineno": 1,
1616
"id": "int",
1717
"lineno": 1
@@ -24,15 +24,15 @@
2424
"ast_type": "Name",
2525
"col_offset": 1,
2626
"ctx": "Store",
27-
"end_col_offset": 1,
27+
"end_col_offset": 2,
2828
"end_lineno": 1,
2929
"id": "a",
3030
"lineno": 1
3131
},
3232
"value": {
3333
"ast_type": "Num",
3434
"col_offset": 10,
35-
"end_col_offset": 10,
35+
"end_col_offset": 11,
3636
"end_lineno": 1,
3737
"lineno": 1,
3838
"n": 1
@@ -43,7 +43,7 @@
4343
"ast_type": "Name",
4444
"col_offset": 4,
4545
"ctx": "Load",
46-
"end_col_offset": 8,
46+
"end_col_offset": 9,
4747
"end_lineno": 2,
4848
"id": "float",
4949
"lineno": 2
@@ -56,7 +56,7 @@
5656
"ast_type": "Name",
5757
"col_offset": 1,
5858
"ctx": "Store",
59-
"end_col_offset": 1,
59+
"end_col_offset": 2,
6060
"end_lineno": 2,
6161
"id": "b",
6262
"lineno": 2
@@ -71,15 +71,15 @@
7171
"ast_type": "Name",
7272
"col_offset": 17,
7373
"ctx": "Load",
74-
"end_col_offset": 19,
74+
"end_col_offset": 20,
7575
"end_lineno": 3,
7676
"id": "int",
7777
"lineno": 3
7878
},
7979
"arg": "a",
8080
"ast_type": "arg",
8181
"col_offset": 14,
82-
"end_col_offset": 14,
82+
"end_col_offset": 15,
8383
"end_lineno": 3,
8484
"lineno": 3
8585
},
@@ -88,15 +88,15 @@
8888
"ast_type": "Name",
8989
"col_offset": 25,
9090
"ctx": "Load",
91-
"end_col_offset": 27,
91+
"end_col_offset": 28,
9292
"end_lineno": 3,
9393
"id": "str",
9494
"lineno": 3
9595
},
9696
"arg": "b",
9797
"ast_type": "arg",
9898
"col_offset": 22,
99-
"end_col_offset": 22,
99+
"end_col_offset": 23,
100100
"end_lineno": 3,
101101
"lineno": 3
102102
}
@@ -113,13 +113,13 @@
113113
{
114114
"ast_type": "Return",
115115
"col_offset": 5,
116-
"end_col_offset": 10,
116+
"end_col_offset": 11,
117117
"end_lineno": 4,
118118
"lineno": 4,
119119
"value": {
120120
"ast_type": "Num",
121121
"col_offset": 12,
122-
"end_col_offset": 14,
122+
"end_col_offset": 15,
123123
"end_lineno": 4,
124124
"lineno": 4,
125125
"n": 0
@@ -128,15 +128,15 @@
128128
],
129129
"col_offset": 5,
130130
"decorator_list": [],
131-
"end_col_offset": 12,
131+
"end_col_offset": 13,
132132
"end_lineno": 3,
133133
"lineno": 3,
134134
"name": "somefunc",
135135
"returns": {
136136
"ast_type": "Name",
137137
"col_offset": 33,
138138
"ctx": "Load",
139-
"end_col_offset": 37,
139+
"end_col_offset": 38,
140140
"end_lineno": 3,
141141
"id": "float",
142142
"lineno": 3

fixtures/annotations.py.uast

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Module {
2626
. . . . . . Col: 4
2727
. . . . . }
2828
. . . . . EndPosition: {
29-
. . . . . . Offset: 5
29+
. . . . . . Offset: 6
3030
. . . . . . Line: 1
31-
. . . . . . Col: 6
31+
. . . . . . Col: 7
3232
. . . . . }
3333
. . . . . Properties: {
3434
. . . . . . ctx: Load
@@ -44,9 +44,9 @@ Module {
4444
. . . . . . Col: 1
4545
. . . . . }
4646
. . . . . EndPosition: {
47-
. . . . . . Offset: 0
47+
. . . . . . Offset: 1
4848
. . . . . . Line: 1
49-
. . . . . . Col: 1
49+
. . . . . . Col: 2
5050
. . . . . }
5151
. . . . . Properties: {
5252
. . . . . . ctx: Store
@@ -62,9 +62,9 @@ Module {
6262
. . . . . . Col: 10
6363
. . . . . }
6464
. . . . . EndPosition: {
65-
. . . . . . Offset: 9
65+
. . . . . . Offset: 10
6666
. . . . . . Line: 1
67-
. . . . . . Col: 10
67+
. . . . . . Col: 11
6868
. . . . . }
6969
. . . . . Properties: {
7070
. . . . . . internalRole: value
@@ -93,9 +93,9 @@ Module {
9393
. . . . . . Col: 4
9494
. . . . . }
9595
. . . . . EndPosition: {
96-
. . . . . . Offset: 18
96+
. . . . . . Offset: 19
9797
. . . . . . Line: 2
98-
. . . . . . Col: 8
98+
. . . . . . Col: 9
9999
. . . . . }
100100
. . . . . Properties: {
101101
. . . . . . ctx: Load
@@ -111,9 +111,9 @@ Module {
111111
. . . . . . Col: 1
112112
. . . . . }
113113
. . . . . EndPosition: {
114-
. . . . . . Offset: 11
114+
. . . . . . Offset: 12
115115
. . . . . . Line: 2
116-
. . . . . . Col: 1
116+
. . . . . . Col: 2
117117
. . . . . }
118118
. . . . . Properties: {
119119
. . . . . . ctx: Store
@@ -131,9 +131,9 @@ Module {
131131
. . . . Col: 5
132132
. . . }
133133
. . . EndPosition: {
134-
. . . . Offset: 31
134+
. . . . Offset: 32
135135
. . . . Line: 3
136-
. . . . Col: 12
136+
. . . . Col: 13
137137
. . . }
138138
. . . Properties: {
139139
. . . . internalRole: body
@@ -154,9 +154,9 @@ Module {
154154
. . . . . . . . Col: 14
155155
. . . . . . . }
156156
. . . . . . . EndPosition: {
157-
. . . . . . . . Offset: 33
157+
. . . . . . . . Offset: 34
158158
. . . . . . . . Line: 3
159-
. . . . . . . . Col: 14
159+
. . . . . . . . Col: 15
160160
. . . . . . . }
161161
. . . . . . . Properties: {
162162
. . . . . . . . internalRole: args
@@ -171,9 +171,9 @@ Module {
171171
. . . . . . . . . . Col: 17
172172
. . . . . . . . . }
173173
. . . . . . . . . EndPosition: {
174-
. . . . . . . . . . Offset: 38
174+
. . . . . . . . . . Offset: 39
175175
. . . . . . . . . . Line: 3
176-
. . . . . . . . . . Col: 19
176+
. . . . . . . . . . Col: 20
177177
. . . . . . . . . }
178178
. . . . . . . . . Properties: {
179179
. . . . . . . . . . ctx: Load
@@ -191,9 +191,9 @@ Module {
191191
. . . . . . . . Col: 22
192192
. . . . . . . }
193193
. . . . . . . EndPosition: {
194-
. . . . . . . . Offset: 41
194+
. . . . . . . . Offset: 42
195195
. . . . . . . . Line: 3
196-
. . . . . . . . Col: 22
196+
. . . . . . . . Col: 23
197197
. . . . . . . }
198198
. . . . . . . Properties: {
199199
. . . . . . . . internalRole: args
@@ -208,9 +208,9 @@ Module {
208208
. . . . . . . . . . Col: 25
209209
. . . . . . . . . }
210210
. . . . . . . . . EndPosition: {
211-
. . . . . . . . . . Offset: 46
211+
. . . . . . . . . . Offset: 47
212212
. . . . . . . . . . Line: 3
213-
. . . . . . . . . . Col: 27
213+
. . . . . . . . . . Col: 28
214214
. . . . . . . . . }
215215
. . . . . . . . . Properties: {
216216
. . . . . . . . . . ctx: Load
@@ -236,9 +236,9 @@ Module {
236236
. . . . . . . . Col: 5
237237
. . . . . . . }
238238
. . . . . . . EndPosition: {
239-
. . . . . . . . Offset: 68
239+
. . . . . . . . Offset: 69
240240
. . . . . . . . Line: 4
241-
. . . . . . . . Col: 10
241+
. . . . . . . . Col: 11
242242
. . . . . . . }
243243
. . . . . . . Children: {
244244
. . . . . . . . 0: Num {
@@ -250,9 +250,9 @@ Module {
250250
. . . . . . . . . . Col: 12
251251
. . . . . . . . . }
252252
. . . . . . . . . EndPosition: {
253-
. . . . . . . . . . Offset: 72
253+
. . . . . . . . . . Offset: 73
254254
. . . . . . . . . . Line: 4
255-
. . . . . . . . . . Col: 14
255+
. . . . . . . . . . Col: 15
256256
. . . . . . . . . }
257257
. . . . . . . . . Properties: {
258258
. . . . . . . . . . internalRole: value
@@ -271,9 +271,9 @@ Module {
271271
. . . . . . Col: 33
272272
. . . . . }
273273
. . . . . EndPosition: {
274-
. . . . . . Offset: 56
274+
. . . . . . Offset: 57
275275
. . . . . . Line: 3
276-
. . . . . . Col: 37
276+
. . . . . . Col: 38
277277
. . . . . }
278278
. . . . . Properties: {
279279
. . . . . . ctx: Load

0 commit comments

Comments
 (0)