diff options
| author | Alexander Kornienko <alexfh@google.com> | 2013-09-02 16:39:23 +0000 |
|---|---|---|
| committer | Alexander Kornienko <alexfh@google.com> | 2013-09-02 16:39:23 +0000 |
| commit | 4e65c98f67b80a7f85ecd5b550a5e10a834f702c (patch) | |
| tree | 9b6f68131e3657db8d74c7c450e1f28257dd2e04 /tools/clang-format | |
| parent | 7de13bb716a76cf4c0d6593bd06d53a480a8980e (diff) | |
| download | clang-4e65c98f67b80a7f85ecd5b550a5e10a834f702c.tar.gz clang-4e65c98f67b80a7f85ecd5b550a5e10a834f702c.tar.bz2 clang-4e65c98f67b80a7f85ecd5b550a5e10a834f702c.tar.xz | |
Added WebKit style to the BasedOnStyle handling and to the relevant help messages.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189765 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/clang-format')
| -rw-r--r-- | tools/clang-format/ClangFormat.cpp | 2 | ||||
| -rwxr-xr-x | tools/clang-format/clang-format-diff.py | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/clang-format/ClangFormat.cpp b/tools/clang-format/ClangFormat.cpp index cd28c595fd..2d415b358f 100644 --- a/tools/clang-format/ClangFormat.cpp +++ b/tools/clang-format/ClangFormat.cpp @@ -64,7 +64,7 @@ LineRanges("lines", cl::desc("<start line>:<end line> - format a range of\n" static cl::opt<std::string> Style("style", cl::desc("Coding style, currently supports:\n" - " LLVM, Google, Chromium, Mozilla.\n" + " LLVM, Google, Chromium, Mozilla, WebKit.\n" "Use -style=file to load style configuration from\n" ".clang-format file located in one of the parent\n" "directories of the source file (or current\n" diff --git a/tools/clang-format/clang-format-diff.py b/tools/clang-format/clang-format-diff.py index bb18730b63..89fa0521ee 100755 --- a/tools/clang-format/clang-format-diff.py +++ b/tools/clang-format/clang-format-diff.py @@ -82,11 +82,13 @@ def formatRange(r, style): def main(): parser = argparse.ArgumentParser(description= - 'Reformat changed lines in diff') + 'Reformat changed lines in diff.') parser.add_argument('-p', default=0, help='strip the smallest prefix containing P slashes') - parser.add_argument('-style', - help='formatting style to apply (LLVM, Google, Chromium)') + parser.add_argument( + '-style', + help= + 'formatting style to apply (LLVM, Google, Chromium, Mozilla, WebKit)') args = parser.parse_args() filename = None |