From 0b3c2f7a66502a54bde777fc4fcea4825ccc1f28 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Wed, 18 Nov 2015 23:18:35 +0000 Subject: [PATCH] Update vim clang-format.py --- clang-format.py | 111 ++++++++++++++++++++++++++++++------------------ 1 file changed, 69 insertions(+), 42 deletions(-) diff --git a/clang-format.py b/clang-format.py index f5a5756..5cb41fc 100644 --- a/clang-format.py +++ b/clang-format.py @@ -2,8 +2,8 @@ # - Change 'binary' if clang-format is not on the path (see below). # - Add to your .vimrc: # -# map :pyf /clang-format.py -# imap :pyf /clang-format.pyi +# map :pyf /clang-format.py +# imap :pyf /clang-format.py # # The first line enables clang-format for NORMAL and VISUAL mode, the second # line adds support for INSERT mode. Change "C-I" to another binding if you @@ -14,6 +14,15 @@ # VISUAL mode. The line or region is extended to the next bigger syntactic # entity. # +# You can also pass in the variable "l:lines" to choose the range for +# formatting. This variable can either contain ":" or +# "all" to format the full file. So, to format the full file, write a function +# like: +# :function FormatFile() +# : let l:lines="all" +# : pyf /clang-format.py +# :endfunction +# # It operates on the current, potentially unsaved buffer and does not create # or save any files. To revert a formatting, just undo. @@ -23,57 +32,75 @@ import subprocess import sys import vim +# set g:clang_format_path to the path to clang-format if it is not on the path # Change this to the full path if clang-format is not on the path. binary = 'clang-format' +if vim.eval('exists("g:clang_format_path")') == "1": + binary = vim.eval('g:clang_format_path') # Change this to format according to other formatting styles. See the output of # 'clang-format --help' for a list of supported styles. The default looks for # a '.clang-format' or '_clang-format' file to indicate the style that should be # used. style = 'file' +fallback_style = None +if vim.eval('exists("g:clang_format_fallback_style")') == "1": + fallback_style = vim.eval('g:clang_format_fallback_style') -# Get the current text. -buf = vim.current.buffer -text = '\n'.join(buf) +def main(): + # Get the current text. + buf = vim.current.buffer + text = '\n'.join(buf) -# Determine range to format. -cursor = int(vim.eval('line2byte(line("."))+col(".")')) - 2 -lines = '%s:%s' % (vim.current.range.start + 1, vim.current.range.end + 1) + # Determine range to format. + if vim.eval('exists("l:lines")') == '1': + lines = vim.eval('l:lines') + else: + lines = '%s:%s' % (vim.current.range.start + 1, vim.current.range.end + 1) -# Avoid flashing an ugly, ugly cmd prompt on Windows when invoking clang-format. -startupinfo = None -if sys.platform.startswith('win32'): - startupinfo = subprocess.STARTUPINFO() - startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW - startupinfo.wShowWindow = subprocess.SW_HIDE + # Determine the cursor position. + cursor = int(vim.eval('line2byte(line("."))+col(".")')) - 2 + if cursor < 0: + print 'Couldn\'t determine cursor position. Is your file empty?' + return -# Call formatter. -command = [binary, '-lines', lines, '-style', style, '-cursor', str(cursor)] -if vim.current.buffer.name: - command.extend(['-assume-filename', vim.current.buffer.name]) -p = subprocess.Popen(command, - stdout=subprocess.PIPE, stderr=subprocess.PIPE, - stdin=subprocess.PIPE, startupinfo=startupinfo) -stdout, stderr = p.communicate(input=text) + # Avoid flashing an ugly, ugly cmd prompt on Windows when invoking clang-format. + startupinfo = None + if sys.platform.startswith('win32'): + startupinfo = subprocess.STARTUPINFO() + startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW + startupinfo.wShowWindow = subprocess.SW_HIDE -# If successful, replace buffer contents. -if stderr: - message = stderr.splitlines()[0] - parts = message.split(' ', 2) - if len(parts) > 2: - message = parts[2] - print 'Formatting failed: %s (total %d warnings, %d errors)' % ( - message, stderr.count('warning:'), stderr.count('error:')) + # Call formatter. + command = [binary, '-style', style, '-cursor', str(cursor)] + if lines != 'all': + command.extend(['-lines', lines]) + if fallback_style: + command.extend(['-fallback-style', fallback_style]) + if vim.current.buffer.name: + command.extend(['-assume-filename', vim.current.buffer.name]) + p = subprocess.Popen(command, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, + stdin=subprocess.PIPE, startupinfo=startupinfo) + stdout, stderr = p.communicate(input=text) -if not stdout: - print ('No output from clang-format (crashed?).\n' + - 'Please report to bugs.llvm.org.') -else: - lines = stdout.split('\n') - output = json.loads(lines[0]) - lines = lines[1:] - sequence = difflib.SequenceMatcher(None, vim.current.buffer, lines) - for op in reversed(sequence.get_opcodes()): - if op[0] is not 'equal': - vim.current.buffer[op[1]:op[2]] = lines[op[3]:op[4]] - vim.command('goto %d' % (output['Cursor'] + 1)) + # If successful, replace buffer contents. + if stderr: + print stderr + + if not stdout: + print ('No output from clang-format (crashed?).\n' + + 'Please report to bugs.llvm.org.') + else: + lines = stdout.split('\n') + output = json.loads(lines[0]) + lines = lines[1:] + sequence = difflib.SequenceMatcher(None, vim.current.buffer, lines) + for op in reversed(sequence.get_opcodes()): + if op[0] is not 'equal': + vim.current.buffer[op[1]:op[2]] = lines[op[3]:op[4]] + if output.get('IncompleteFormat'): + print 'clang-format: incomplete (syntax errors)' + vim.command('goto %d' % (output['Cursor'] + 1)) + +main()