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 | d818d497fdf2f361d5ea4160061440b6329d6ee4 (patch) | |
| tree | f94a6de88a56109b2b52fd18a5773895bb2baa2c /tools | |
| parent | 8a06ec91e0b732e3237adaf80fed4eccd3292466 (diff) | |
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)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@284988 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/clang-format/clang-format.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/clang-format/clang-format.py b/tools/clang-format/clang-format.py index 37d970b477..6a5740679b 100644 --- a/tools/clang-format/clang-format.py +++ b/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': |