From 8c622f1ee1c94726c23a7e391029174679dbacf5 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 7 Oct 2015 17:00:20 +0000 Subject: [PATCH] clang-format: Add include sorting capabilities to sublime, emacs and clang-format-diff.py. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@249567 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/clang-format/clang-format-diff.py | 4 ++++ tools/clang-format/clang-format-sublime.py | 2 +- tools/clang-format/clang-format.el | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/clang-format/clang-format-diff.py b/tools/clang-format/clang-format-diff.py index 64efb83a8c..9e02bb0938 100755 --- a/tools/clang-format/clang-format-diff.py +++ b/tools/clang-format/clang-format-diff.py @@ -52,6 +52,8 @@ def main(): r'|protodevel|java)', help='custom pattern selecting file paths to reformat ' '(case insensitive, overridden by -regex)') + parser.add_argument('-sort-includes', action='store_true', default=False, + help='let clang-format sort include blocks') parser.add_argument('-v', '--verbose', action='store_true', help='be more verbose, ineffective without -i') parser.add_argument( @@ -96,6 +98,8 @@ def main(): command = [binary, filename] if args.i: command.append('-i') + if args.sort_includes: + command.append('-sort-includes') command.extend(lines) if args.style: command.extend(['-style', args.style]) diff --git a/tools/clang-format/clang-format-sublime.py b/tools/clang-format/clang-format-sublime.py index 16ff56e502..1cffcecc39 100644 --- a/tools/clang-format/clang-format-sublime.py +++ b/tools/clang-format/clang-format-sublime.py @@ -32,7 +32,7 @@ class ClangFormatCommand(sublime_plugin.TextCommand): if encoding == 'Undefined': encoding = 'utf-8' regions = [] - command = [binary, '-style', style] + command = [binary, '-sort-includes', '-style', style] for region in self.view.sel(): regions.append(region) region_offset = min(region.a, region.b) diff --git a/tools/clang-format/clang-format.el b/tools/clang-format/clang-format.el index ca461444e2..6de45de70a 100644 --- a/tools/clang-format/clang-format.el +++ b/tools/clang-format/clang-format.el @@ -126,6 +126,7 @@ is no active region. If no style is given uses `clang-format-style'." nil `(,temp-buffer ,temp-file) nil "-output-replacements-xml" + "-sort-includes" "-assume-filename" (or (buffer-file-name) "") "-style" style "-offset" (number-to-string start) -- 2.40.0