forked from asottile/add-trailing-comma
-
Notifications
You must be signed in to change notification settings - Fork 0
/
add_trailing_comma.py
414 lines (332 loc) · 13.3 KB
/
add_trailing_comma.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
from __future__ import absolute_import
from __future__ import unicode_literals
import argparse
import ast
import collections
import io
import sys
from tokenize_rt import ESCAPED_NL
from tokenize_rt import src_to_tokens
from tokenize_rt import Token
from tokenize_rt import tokens_to_src
from tokenize_rt import UNIMPORTANT_WS
Offset = collections.namedtuple('Offset', ('line', 'utf8_byte_offset'))
Call = collections.namedtuple('Call', ('node', 'star_args', 'arg_offsets'))
Func = collections.namedtuple('Func', ('node', 'star_args', 'arg_offsets'))
Literal = collections.namedtuple('Literal', ('node', 'backtrack'))
Literal.__new__.__defaults__ = (False,)
Fix = collections.namedtuple('Fix', ('braces', 'multi_arg', 'initial_indent'))
NEWLINES = frozenset((ESCAPED_NL, 'NEWLINE', 'NL'))
NON_CODING_TOKENS = frozenset(('COMMENT', ESCAPED_NL, 'NL', UNIMPORTANT_WS))
INDENT_TOKENS = frozenset(('INDENT', UNIMPORTANT_WS))
START_BRACES = frozenset(('(', '{', '['))
END_BRACES = frozenset((')', '}', ']'))
def ast_parse(contents_text):
return ast.parse(contents_text.encode('UTF-8'))
def _to_offset(node):
candidates = [node]
while candidates:
candidate = candidates.pop()
if hasattr(candidate, 'lineno'):
return Offset(candidate.lineno, candidate.col_offset)
elif hasattr(candidate, '_fields'): # pragma: no cover (PY35+)
for field in reversed(candidate._fields):
candidates.append(getattr(candidate, field))
else:
raise AssertionError(node)
if sys.version_info < (3, 5): # pragma: no cover (<PY35)
def _is_star_arg(node):
return False
else: # pragma: no cover (PY35+)
def _is_star_arg(node):
return isinstance(node, ast.Starred)
def _is_star_star_kwarg(node):
return isinstance(node, ast.keyword) and node.arg is None
class FindNodes(ast.NodeVisitor):
def __init__(self):
# multiple calls can report their starting position as the same
self.calls = collections.defaultdict(list)
self.funcs = {}
self.literals = {}
self.tuples = {}
def _visit_literal(self, node, key='elts'):
if getattr(node, key):
key = Offset(node.lineno, node.col_offset)
self.literals[key] = Literal(node)
self.generic_visit(node)
visit_Set = visit_List = _visit_literal
def visit_Dict(self, node):
self._visit_literal(node, key='values')
def visit_Tuple(self, node):
if node.elts:
key = Offset(node.lineno, node.col_offset)
# tuples lie about offset -- tell the later machinery to backtrack
self.tuples[key] = Literal(node, backtrack=True)
self.generic_visit(node)
def visit_Call(self, node):
argnodes = node.args + node.keywords
py2_starargs = getattr(node, 'starargs', None)
if py2_starargs: # pragma: no cover (<PY35)
argnodes.append(py2_starargs)
py2_kwargs = getattr(node, 'kwargs', None)
if py2_kwargs: # pragma: no cover (<PY35)
argnodes.append(py2_kwargs)
arg_offsets = set()
has_starargs = bool(py2_starargs or py2_kwargs)
for argnode in argnodes:
if (
_is_star_arg(argnode) or
_is_star_star_kwarg(argnode)
): # pragma: no cover (PY35+)
has_starargs = True
offset = _to_offset(argnode)
# multiline strings have invalid position, ignore them
if offset.utf8_byte_offset != -1: # pragma: no branch (cpy bug)
arg_offsets.add(offset)
# If the sole argument is a generator, don't add a trailing comma as
# this breaks lib2to3 based tools
only_a_generator = (
len(argnodes) == 1 and isinstance(argnodes[0], ast.GeneratorExp)
)
if arg_offsets and not only_a_generator:
key = Offset(node.lineno, node.col_offset)
self.calls[key].append(Call(node, has_starargs, arg_offsets))
self.generic_visit(node)
def visit_FunctionDef(self, node):
has_starargs = False
args = list(node.args.args)
if node.args.vararg:
if isinstance(node.args.vararg, ast.AST): # pragma: no cover (py3)
args.append(node.args.vararg)
has_starargs = True
if node.args.kwarg:
if isinstance(node.args.kwarg, ast.AST): # pragma: no cover (py3)
args.append(node.args.kwarg)
has_starargs = True
py3_kwonlyargs = getattr(node.args, 'kwonlyargs', None)
if py3_kwonlyargs: # pragma: no cover (py3)
args.extend(py3_kwonlyargs)
has_starargs = True
arg_offsets = {_to_offset(arg) for arg in args}
if arg_offsets:
key = Offset(node.lineno, node.col_offset)
self.funcs[key] = Func(node, has_starargs, arg_offsets)
self.generic_visit(node)
def _find_simple(first_brace, tokens):
brace_stack = [first_brace]
multi_arg = False
for i in range(first_brace + 1, len(tokens)):
token = tokens[i]
if token.src in START_BRACES:
brace_stack.append(i)
elif token.src in END_BRACES:
brace_stack.pop()
if len(brace_stack) == 1 and token.src == ',':
multi_arg = True
if not brace_stack:
break
else:
raise AssertionError('Past end?')
last_brace = i
# Check if we're actually multi-line
if tokens[first_brace].line == tokens[last_brace].line:
return
# determine the initial indentation
i = first_brace
while i >= 0 and tokens[i].name not in NEWLINES:
i -= 1
if i >= 0 and tokens[i + 1].name in INDENT_TOKENS:
initial_indent = len(tokens[i + 1].src)
else:
initial_indent = 0
return Fix((first_brace, last_brace), multi_arg, initial_indent)
def _find_call(call, i, tokens):
# When we get a `call` object, the ast refers to it as this:
#
# func_name(arg, arg, arg)
# ^ where ast points
#
# We care about the closing paren, in order to find it, we first walk
# until we find an argument. When we find an argument, we know the outer
# paren we find is the function call paren
#
# func_name(arg, arg, arg)
# ^ outer paren
first_brace = None
paren_stack = []
for i in range(i, len(tokens)):
token = tokens[i]
if token.src == '(':
paren_stack.append(i)
# the ast lies to us about the beginning of parenthesized functions.
# See #3. (why we make sure there's something to pop here)
elif token.src == ')' and paren_stack:
paren_stack.pop()
if (token.line, token.utf8_byte_offset) in call.arg_offsets:
first_brace = paren_stack[0]
break
else:
raise AssertionError('Past end?')
return _find_simple(first_brace, tokens)
def _find_tuple(i, tokens):
# tuples are evil, we need to backtrack to find the opening paren
i -= 1
while tokens[i].name in NON_CODING_TOKENS:
i -= 1
# Sometimes tuples don't even have a paren!
# x = 1, 2, 3
if tokens[i].src != '(':
return
return _find_simple(i, tokens)
def _fix_brace(fix_data, add_comma, tokens):
first_brace, last_brace = fix_data.braces
# Figure out if either of the braces are "hugging"
hug_open = tokens[first_brace + 1].name not in NON_CODING_TOKENS
hug_close = tokens[last_brace - 1].name not in NON_CODING_TOKENS
if (
# Don't unhug single element things with a multi-line component
# inside.
not fix_data.multi_arg and
hug_open and
tokens[last_brace - 1].src in END_BRACES or
# Don't unhug when containing a single token (such as a triple
# quoted string).
first_brace + 2 == last_brace
):
hug_open = hug_close = False
# fix open hugging
if hug_open:
new_indent = fix_data.initial_indent + 4
tokens[first_brace + 1:first_brace + 1] = [
Token('NL', '\n'), Token(UNIMPORTANT_WS, ' ' * new_indent),
]
last_brace += 2
# Adust indentation for the rest of the things
min_indent = None
indents = []
insert_indents = []
for i in range(first_brace + 3, last_brace):
if tokens[i - 1].name == 'NL' and tokens[i].name != 'NL':
if tokens[i].name != UNIMPORTANT_WS:
min_indent = 0
insert_indents.append(i)
else:
if min_indent is None:
min_indent = len(tokens[i].src)
elif len(tokens[i].src) < min_indent:
min_indent = len(tokens[i].src)
indents.append(i)
for i in indents:
oldlen = len(tokens[i].src)
newlen = oldlen - min_indent + new_indent
tokens[i] = tokens[i]._replace(src=' ' * newlen)
for i in reversed(insert_indents):
tokens.insert(i, Token(UNIMPORTANT_WS, ' ' * new_indent))
last_brace += 1
# fix close hugging
if hug_close:
tokens[last_brace:last_brace] = [
Token('NL', '\n'),
Token(UNIMPORTANT_WS, ' ' * fix_data.initial_indent),
]
last_brace += 2
# From there, we can walk backwards and decide whether a comma is needed
i = last_brace - 1
while tokens[i].name in NON_CODING_TOKENS:
i -= 1
# If we're not a hugging paren, we can insert a comma
if add_comma and tokens[i].src != ',' and i + 1 != last_brace:
tokens.insert(i + 1, Token('OP', ','))
# Fix trailing brace to match leading indentation
back_1 = tokens[last_brace - 1]
back_2 = tokens[last_brace - 2]
if (
back_1.name == UNIMPORTANT_WS and
back_2.name == 'NL' and
len(back_1.src) != fix_data.initial_indent
):
new_indent = fix_data.initial_indent * ' '
tokens[last_brace - 1] = back_1._replace(src=new_indent)
def _changing_list(lst):
i = 0
while i < len(lst):
yield i, lst[i]
i += 1
def _fix_src(contents_text, py35_plus, py36_plus):
try:
ast_obj = ast_parse(contents_text)
except SyntaxError:
return contents_text
visitor = FindNodes()
visitor.visit(ast_obj)
tokens = src_to_tokens(contents_text)
for i, token in _changing_list(tokens):
# DEDENT is a zero length token
if not token.src:
continue
key = Offset(token.line, token.utf8_byte_offset)
fixes = []
if key in visitor.calls:
for call in visitor.calls[key]:
# Only fix stararg calls if asked to
add_comma = not call.star_args or py35_plus
fixes.append((add_comma, _find_call(call, i, tokens)))
elif key in visitor.funcs:
func = visitor.funcs[key]
add_comma = not func.star_args or py36_plus
# functions can be treated as calls
fixes.append((add_comma, _find_call(func, i, tokens)))
# Handle parenthesized things
elif token.src == '(':
fixes.append((False, _find_simple(i, tokens)))
elif key in visitor.literals:
fixes.append((True, _find_simple(i, tokens)))
for add_comma, fix_data in fixes:
if fix_data is not None:
_fix_brace(fix_data, add_comma, tokens)
# need to handle tuples afterwards as tuples report their starting
# starting index as the first element, which may be one of the above
# things.
if key in visitor.tuples:
fix_data = _find_tuple(i, tokens)
if fix_data is not None:
_fix_brace(fix_data, True, tokens)
return tokens_to_src(tokens)
def fix_file(filename, args):
with open(filename, 'rb') as f:
contents_bytes = f.read()
try:
contents_text_orig = contents_text = contents_bytes.decode('UTF-8')
except UnicodeDecodeError:
print('{} is non-utf-8 (not supported)'.format(filename))
return 1
contents_text = _fix_src(contents_text, args.py35_plus, args.py36_plus)
if contents_text != contents_text_orig:
print('Rewriting {}'.format(filename))
with io.open(filename, 'w', newline='', encoding='UTF-8') as f:
f.write(contents_text)
return 1
return 0
class StoreTrueImplies(argparse.Action):
def __init__(self, option_strings, dest, implies, **kwargs):
self.implies = implies
kwargs.update(const=True, default=False, nargs=0)
super(StoreTrueImplies, self).__init__(option_strings, dest, **kwargs)
def __call__(self, parser, namespace, values, option_string=None):
assert hasattr(namespace, self.implies), self.implies
setattr(namespace, self.dest, self.const)
setattr(namespace, self.implies, self.const)
def main(argv=None):
parser = argparse.ArgumentParser()
parser.add_argument('filenames', nargs='*')
parser.add_argument('--py35-plus', action='store_true')
parser.add_argument(
'--py36-plus', action=StoreTrueImplies, implies='py35_plus',
)
args = parser.parse_args(argv)
ret = 0
for filename in args.filenames:
ret |= fix_file(filename, args)
return ret
if __name__ == '__main__':
exit(main())