This revision was automatically updated to reflect the committed changes.
Closed by commit rGb8e03ff50389: [clang-format] update trailing newline
treatment in clang-format.py (authored by MyDeveloperDay).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D70864/new/
https://reviews.llvm.org/D70864
Files:
clang/tools/clang-format/clang-format.py
Index: clang/tools/clang-format/clang-format.py
===================================================================
--- clang/tools/clang-format/clang-format.py
+++ clang/tools/clang-format/clang-format.py
@@ -70,7 +70,8 @@
# Get the current text.
encoding = vim.eval("&encoding")
buf = get_buffer(encoding)
- text = '\n'.join(buf)
+ # Join the buffer into a single string with a terminating newline
+ text = '\n'.join(buf) + '\n'
# Determine range to format.
if vim.eval('exists("l:lines")') == '1':
@@ -129,7 +130,10 @@
else:
lines = stdout.decode(encoding).split('\n')
output = json.loads(lines[0])
- lines = lines[1:]
+ # Strip off the trailing newline (added above).
+ # This maintains trailing empty lines present in the buffer if
+ # the -lines specification requests them to remain unchanged.
+ lines = lines[1:-1]
sequence = difflib.SequenceMatcher(None, buf, lines)
for op in reversed(sequence.get_opcodes()):
if op[0] is not 'equal':
Index: clang/tools/clang-format/clang-format.py
===================================================================
--- clang/tools/clang-format/clang-format.py
+++ clang/tools/clang-format/clang-format.py
@@ -70,7 +70,8 @@
# Get the current text.
encoding = vim.eval("&encoding")
buf = get_buffer(encoding)
- text = '\n'.join(buf)
+ # Join the buffer into a single string with a terminating newline
+ text = '\n'.join(buf) + '\n'
# Determine range to format.
if vim.eval('exists("l:lines")') == '1':
@@ -129,7 +130,10 @@
else:
lines = stdout.decode(encoding).split('\n')
output = json.loads(lines[0])
- lines = lines[1:]
+ # Strip off the trailing newline (added above).
+ # This maintains trailing empty lines present in the buffer if
+ # the -lines specification requests them to remain unchanged.
+ lines = lines[1:-1]
sequence = difflib.SequenceMatcher(None, buf, lines)
for op in reversed(sequence.get_opcodes()):
if op[0] is not 'equal':
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
