This is an archive of the discontinued LLVM Phabricator instance.

Paths

[clang-format] Fix lines regression in clang-format.py
ClosedPublic

Authored by krasimir on Aug 22 2017, 6:29 AM.

Reviewers

djasper

Commits

Summary

This patch fixes a regression after https://reviews.llvm.org/rL305665,
which updates the structure of the lines variable.

Thank you

This revision is now accepted and ready to land.Aug 22 2017, 7:22 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

cfe/

trunk/

tools/

clang-format/

2 lines

	Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines
	def main():			def main():
	# Get the current text.			# Get the current text.
	encoding = vim.eval("&encoding")			encoding = vim.eval("&encoding")
	buf = get_buffer(encoding)			buf = get_buffer(encoding)
	text = '\n'.join(buf)			text = '\n'.join(buf)

	# Determine range to format.			# Determine range to format.
	if vim.eval('exists("l:lines")') == '1':			if vim.eval('exists("l:lines")') == '1':
	lines = vim.eval('l:lines')			lines = ['-lines', vim.eval('l:lines')]
	elif vim.eval('exists("l:formatdiff")') == '1':			elif vim.eval('exists("l:formatdiff")') == '1':
	with open(vim.current.buffer.name, 'r') as f:			with open(vim.current.buffer.name, 'r') as f:
	ondisk = f.read().splitlines();			ondisk = f.read().splitlines();
	sequence = difflib.SequenceMatcher(None, ondisk, vim.current.buffer)			sequence = difflib.SequenceMatcher(None, ondisk, vim.current.buffer)
	lines = []			lines = []
	for op in reversed(sequence.get_opcodes()):			for op in reversed(sequence.get_opcodes()):
	if op[0] not in ['equal', 'delete']:			if op[0] not in ['equal', 'delete']:
	lines += ['-lines', '%s:%s' % (op[3] + 1, op[4])]			lines += ['-lines', '%s:%s' % (op[3] + 1, op[4])]
	▲ Show 20 Lines • Show All 54 Lines • Show Last 20 Lines