maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-format][NFC] Fix braces in ClangFormat.cpp 

Differential Revision: https://reviews.llvm.org/D127827
This commit is contained in:
owenca 2022-06-15 12:16:28 -07:00
parent b10579d0b5
commit 2d82c9ccf3
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clang/tools/clang-format/ClangFormat.cpp
View File

@ -358,9 +358,10 @@ static void outputXML(const Replacements &Replaces,
if (!Status.FormatComplete)
outs() << " line='" << Status.Line << "'";
outs() << ">\n";
if (Cursor.getNumOccurrences() != 0)
if (Cursor.getNumOccurrences() != 0) {
outs() << "<cursor>" << FormatChanges.getShiftedCodePosition(CursorPosition)
<< "</cursor>\n";
}
outputReplacementsXML(Replaces);
outs() << "</replacements>\n";
@ -436,11 +437,11 @@ static bool format(StringRef FileName) {
.Case("left", FormatStyle::QAS_Left)
.Default(FormatStyle->QualifierAlignment);
if (FormatStyle->QualifierAlignment == FormatStyle::QAS_Left)
if (FormatStyle->QualifierAlignment == FormatStyle::QAS_Left) {
FormatStyle->QualifierOrder = {"const", "volatile", "type"};
else if (FormatStyle->QualifierAlignment == FormatStyle::QAS_Right)
} else if (FormatStyle->QualifierAlignment == FormatStyle::QAS_Right) {
FormatStyle->QualifierOrder = {"type", "const", "volatile"};
else if (QualifierAlignmentOrder.contains("type")) {
} else if (QualifierAlignmentOrder.contains("type")) {
FormatStyle->QualifierAlignment = FormatStyle::QAS_Custom;
SmallVector<StringRef> Qualifiers;
QualifierAlignmentOrder.split(Qualifiers, " ", /*MaxSplit=*/-1,
@ -463,9 +464,8 @@ static bool format(StringRef FileName) {
if (FormatStyle->isJson() && !FormatStyle->DisableFormat) {
auto Err = Replaces.add(tooling::Replacement(
tooling::Replacement(AssumedFileName, 0, 0, "x = ")));
if (Err) {
if (Err)
llvm::errs() << "Bad Json variable insertion\n";
}
}
auto ChangedCode = tooling::applyAllReplacements(Code->getBuffer(), Replaces);
@ -480,11 +480,10 @@ static bool format(StringRef FileName) {
reformat(*FormatStyle, *ChangedCode, Ranges, AssumedFileName, &Status);
Replaces = Replaces.merge(FormatChanges);
if (OutputXML || DryRun) {
if (DryRun) {
if (DryRun)
return emitReplacementWarnings(Replaces, AssumedFileName, Code);
} else {
else
outputXML(Replaces, FormatChanges, Status, Cursor, CursorPosition);
}
} else {
IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
new llvm::vfs::InMemoryFileSystem);
@ -579,9 +578,8 @@ int main(int argc, const char **argv) {
return 0;
}
if (DumpConfig) {
if (DumpConfig)
return dumpConfig();
}
if (!Files.empty()) {
std::ifstream ExternalFileOfFiles{std::string(Files)};
@ -608,9 +606,10 @@ int main(int argc, const char **argv) {
unsigned FileNo = 1;
for (const auto &FileName : FileNames) {
if (Verbose)
if (Verbose) {
errs() << "Formatting [" << FileNo++ << "/" << FileNames.size() << "] "
<< FileName << "\n";
}
Error |= clang::format::format(FileName);
}
return Error ? 1 : 0;