summaryrefslogtreecommitdiffstats
path: root/tools/clang-rename
diff options
context:
space:
mode:
authorJonas Toth <jonas.toth@gmail.com>2018-08-06 09:08:06 +0000
committerJonas Toth <jonas.toth@gmail.com>2018-08-06 09:08:06 +0000
commit614dc515cd57fa0130ba90e45180ddbacef1b394 (patch)
tree0b3dac40a674e3e469436c7b509b97bb24c14da2 /tools/clang-rename
parent9dc8f63d49250207a6e41b5b56f4e52ca91e9260 (diff)
[clang-rename] make clang-rename.py vim integration python3 compatible
Summary: This patch makes the clang-rename.py script useable for vim with only python3 support. It uses the print-function and adjust the doc slightly to mention the correct python3 command for the letter mapping in vim. Reviewers: arphaman, klimek, aaron.ballman, hokein Reviewed By: hokein Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D50307 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@338996 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/clang-rename')
-rw-r--r--tools/clang-rename/clang-rename.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/clang-rename/clang-rename.py b/tools/clang-rename/clang-rename.py
index 3cc6644ff8..0cb8a26d27 100644
--- a/tools/clang-rename/clang-rename.py
+++ b/tools/clang-rename/clang-rename.py
@@ -7,10 +7,14 @@ Before installing make sure one of the following is satisfied:
* `g:clang_rename_path` in ~/.vimrc points to valid clang-rename executable
* `binary` in clang-rename.py points to valid to clang-rename executable
-To install, simply put this into your ~/.vimrc
+To install, simply put this into your ~/.vimrc for python2 support
noremap <leader>cr :pyf <path-to>/clang-rename.py<cr>
+For python3 use the following command (note the change from :pyf to :py3f)
+
+ noremap <leader>cr :py3f <path-to>/clang-rename.py<cr>
+
IMPORTANT NOTE: Before running the tool, make sure you saved the file.
All you have to do now is to place a cursor on a variable/function/class which
@@ -18,6 +22,7 @@ you would like to rename and press '<leader>cr'. You will be prompted for a new
name if the cursor points to a valid symbol.
'''
+from __future__ import print_function
import vim
import subprocess
import sys
@@ -30,8 +35,8 @@ def main():
# Get arguments for clang-rename binary.
offset = int(vim.eval('line2byte(line("."))+col(".")')) - 2
if offset < 0:
- print >> sys.stderr, '''Couldn\'t determine cursor position.
- Is your file empty?'''
+ print('Couldn\'t determine cursor position. Is your file empty?',
+ file=sys.stderr)
return
filename = vim.current.buffer.name
@@ -51,7 +56,7 @@ def main():
stdout, stderr = p.communicate()
if stderr:
- print stderr
+ print(stderr)
# Reload all buffers in Vim.
vim.command("checktime")