Skip to content

Stop passing -sort-includes to clang-format #65

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

Merged
merged 1 commit into from
Dec 23, 2015
Merged

Stop passing -sort-includes to clang-format #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions autoload/codefmt.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,6 @@ function! codefmt#GetClangFormatFormatter() abort
let l:cmd += ['-cursor', string(l:cursor_pos)]
endif

" Version 3.8 added support for the -sort-includes option.
" http://llvm.org/viewvc/llvm-project?view=revision&revision=248367
if s:ClangFormatHasAtLeastVersion([3, 8])
let l:cmd += ['-sort-includes']
endif

let l:input = join(getline(1, line('$')), "\n")
let l:result = maktaba#syscall#Create(l:cmd).WithStdin(l:input).Call()
let l:formatted = split(l:result.stdout, "\n")
Expand Down
54 changes: 0 additions & 54 deletions vroom/clangformat.vroom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,60 +180,6 @@ that clang-format has a version >= 3.4).



For clang-format versions 3.8 and above, it will sort #include lines (using the
-sort-includes option).

:Glaive codefmt clang_format_executable='clang-format-3.7'
@clear
% #include <stdlib.h><CR>
|#include <stdio.h><CR>
|int f() { int i = 1; return 1234567890; }

:FormatCode clang-format
! clang-format-3.7 --version .*
$ clang-format version 3.7.0 (tags/testing)
! clang-format-3.7 -style file -lines 1:3 -cursor \d+ 2>.*
$ { "Cursor": 0 }
$ #include <stdlib.h>
$ #include <stdio.h>
$ int f() {
$ int i = 1;
$ return 1234567890;
$ }
#include <stdlib.h>
#include <stdio.h>
int f() {
int i = 1;
return 1234567890;
}
@end
:Glaive codefmt clang_format_executable='clang-format'
@clear
% #include <stdlib.h><CR>
|#include <stdio.h><CR>
|int f() { int i = 1; return 1234567890; }

:FormatCode clang-format
! clang-format --version .*
$ clang-format version 3.8.0 (tags/testing)
! clang-format -style file .* -sort-includes .*2>.*
$ { "Cursor": 0 }
$ #include <stdio.h>
$ #include <stdlib.h>
$ int f() {
$ int i = 1;
$ return 1234567890;
$ }
#include <stdio.h>
#include <stdlib.h>
int f() {
int i = 1;
return 1234567890;
}
@end



You might have wondered where the "-style file" above comes from. The
clang-format tool accepts a "style" option to control the formatting style. By
default, "file" is used to indicate that clang-format should respect
Expand Down