Skip to content

Make style lookup consistent with clang-format #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make style lookup consistent with clang-format #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a10a7
Make style lookup consistent with clang-format
arntanguy Oct 9, 2015
284f6ef
Merge remote-tracking branch 'upstream/master' into fix-style-file
arntanguy Aug 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions autoload/clang_format.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,16 @@ let g:clang_format#auto_formatexpr = s:getg('clang_format#auto_formatexpr', 0)
function! s:detect_style_file()
let dirname = fnameescape(expand('%:p:h'))
let style_file_name = has('win32') || has('win64') ? '_clang-format' : '.clang-format'
return findfile(style_file_name, dirname.';') != ''
return findfile(style_file_name, dirname.';')
endfunction

function! clang_format#format(line1, line2)
let args = printf(" -lines=%d:%d", a:line1, a:line2)
if ! (g:clang_format#detect_style_file && s:detect_style_file())
let style_file = s:detect_style_file()
if ! (g:clang_format#detect_style_file && style_file != '')
let args .= printf(" -style=%s ", s:make_style_options())
else
let args .= " -style=file "
let args .= " -style=file --assume-filename=".style_file
endif
let args .= printf("-assume-filename=%s ", shellescape(escape(expand('%'), " \t")))
let args .= g:clang_format#extra_args
Expand Down