JonasToth created this revision.
JonasToth added reviewers: arphaman, klimek.
Herald added a subscriber: cfe-commits.
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.
Repository:
rC Clang
https://reviews.llvm.org/D50307
Files:
tools/clang-rename/clang-rename.py
Index: tools/clang-rename/clang-rename.py
===================================================================
--- tools/clang-rename/clang-rename.py
+++ tools/clang-rename/clang-rename.py
@@ -7,17 +7,23 @@
* `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
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 +36,8 @@
# 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 +57,7 @@
stdout, stderr = p.communicate()
if stderr:
- print stderr
+ print(stderr)
# Reload all buffers in Vim.
vim.command("checktime")
Index: tools/clang-rename/clang-rename.py
===================================================================
--- tools/clang-rename/clang-rename.py
+++ tools/clang-rename/clang-rename.py
@@ -7,17 +7,23 @@
* `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
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 +36,8 @@
# 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 +57,7 @@
stdout, stderr = p.communicate()
if stderr:
- print stderr
+ print(stderr)
# Reload all buffers in Vim.
vim.command("checktime")
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
