diff options
| author | Alexander Kornienko <alexfh@google.com> | 2016-10-24 16:31:26 +0000 |
|---|---|---|
| committer | Alexander Kornienko <alexfh@google.com> | 2016-10-24 16:31:26 +0000 |
| commit | f51bf969772df47f7f8c0ed34f07ae6a80d6dda7 (patch) | |
| tree | 74b4d7a6277d3569d332ae6ed0c1271ee3dcfb32 /clang/tools/clang-format | |
| parent | b0f359e61022d559eeb4f7184488123e638fe5e0 (diff) | |
| download | bcm5719-llvm-f51bf969772df47f7f8c0ed34f07ae6a80d6dda7.tar.gz bcm5719-llvm-f51bf969772df47f7f8c0ed34f07ae6a80d6dda7.zip | |
Fix clang-format vim integration issue with non-ascii characters
clang-format.py currently seems to treat vim.current.buf as ascii-encoded data,
which leads to an UnicodeDecodeError when trying to format any text containing
non-ascii characters:
Traceback (most recent call last):
File "<string>", line 1, in <module>
File ".../tools/clang/tools/clang-format/clang-format.py", line 110, in <module>
main()
File ".../tools/clang/tools/clang-format/clang-format.py", line 87, in main
stdout, stderr = p.communicate(input=text.encode(encoding))
UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 3996: ordinal not in range(128)
llvm-svn: 284988
Diffstat (limited to 'clang/tools/clang-format')
| -rw-r--r-- | clang/tools/clang-format/clang-format.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/tools/clang-format/clang-format.py b/clang/tools/clang-format/clang-format.py index 37d970b477c..6a5740679b5 100644 --- a/clang/tools/clang-format/clang-format.py +++ b/clang/tools/clang-format/clang-format.py @@ -52,7 +52,7 @@ def main(): # Get the current text. encoding = vim.eval("&encoding") buf = vim.current.buffer - text = '\n'.join(buf) + text = unicode('\n'.join(buf), encoding) # Determine range to format. if vim.eval('exists("l:lines")') == '1': |
