diff options
author | Renato Golin <renato.golin@linaro.org> | 2015-05-08 17:05:24 +0000 |
---|---|---|
committer | Renato Golin <renato.golin@linaro.org> | 2015-05-08 17:05:24 +0000 |
commit | a8ea585c7be49956cf28c1829414192ed43e9eda (patch) | |
tree | 0f9de4038a7c9b6c905e6695f823fca5c2709bd3 /tools | |
parent | b3458674c25e62ac911be7e75eaf9f26fae39051 (diff) |
Revert "clang-format: Only output IncompleteFormat if -cursor is given."
This reverts commit r236867, as it was breaking multiple buildbots. Daniel
will look into it later.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@236882 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/clang-format/ClangFormat.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/clang-format/ClangFormat.cpp b/tools/clang-format/ClangFormat.cpp index 5037e901f3..ae2180c837 100644 --- a/tools/clang-format/ClangFormat.cpp +++ b/tools/clang-format/ClangFormat.cpp @@ -226,8 +226,7 @@ static bool format(StringRef FileName) { FormatStyle FormatStyle = getStyle( Style, (FileName == "-") ? AssumeFilename : FileName, FallbackStyle); bool IncompleteFormat = false; - tooling::Replacements Replaces = - reformat(FormatStyle, Sources, ID, Ranges, &IncompleteFormat); + tooling::Replacements Replaces = reformat(FormatStyle, Sources, ID, Ranges, &IncompleteFormat); if (OutputXML) { llvm::outs() << "<?xml version='1.0'?>\n<replacements " "xml:space='preserve' incomplete_format='" @@ -256,11 +255,12 @@ static bool format(StringRef FileName) { else if (Rewrite.overwriteChangedFiles()) return true; } else { + outs() << "{"; if (Cursor.getNumOccurrences() != 0) - outs() << "{ \"Cursor\": " - << tooling::shiftedCodePosition(Replaces, Cursor) - << ", \"IncompleteFormat\": " - << (IncompleteFormat ? "true" : "false") << " }\n"; + outs() << " \"Cursor\": " + << tooling::shiftedCodePosition(Replaces, Cursor) << ","; + outs() << " \"IncompleteFormat\": " + << (IncompleteFormat ? "true" : "false") << " }\n"; Rewrite.getEditBuffer(ID).write(outs()); } } |