Skip to content

Commit 16d3ec8

Browse files
braces
1 parent 136ee9e commit 16d3ec8

File tree

2,866 files changed

+365592
-130398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,866 files changed

+365592
-130398
lines changed

clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ std::error_code collectReplacementsFromDirectory(
5252
continue;
5353
}
5454

55-
if (extension(I->path()) != ".yaml")
55+
if (extension(I->path()) != ".yaml") {
5656
continue;
5757

58+
}
59+
5860
TUFiles.push_back(I->path());
5961

6062
ErrorOr<std::unique_ptr<MemoryBuffer>> Out =
@@ -96,9 +98,11 @@ std::error_code collectReplacementsFromDirectory(
9698
continue;
9799
}
98100

99-
if (extension(I->path()) != ".yaml")
101+
if (extension(I->path()) != ".yaml") {
100102
continue;
101103

104+
}
105+
102106
TUFiles.push_back(I->path());
103107

104108
ErrorOr<std::unique_ptr<MemoryBuffer>> Out =
@@ -154,8 +158,10 @@ groupReplacements(const TUReplacements &TUs, const TUDiagnostics &TUDs,
154158
if (auto Entry = SM.getFileManager().getFile(R.getFilePath())) {
155159
if (FromDiag) {
156160
auto &Replaces = DiagReplacements[*Entry];
157-
if (!Replaces.insert(R).second)
161+
if (!Replaces.insert(R).second) {
158162
return;
163+
164+
}
159165
}
160166
GroupedReplacements[*Entry].push_back(R);
161167
} else if (Warned.insert(R.getFilePath()).second) {
@@ -164,18 +170,30 @@ groupReplacements(const TUReplacements &TUs, const TUDiagnostics &TUDs,
164170
}
165171
};
166172

167-
for (const auto &TU : TUs)
168-
for (const tooling::Replacement &R : TU.Replacements)
173+
for (const auto &TU : TUs) {
174+
for (const tooling::Replacement &R : TU.Replacements) {
169175
AddToGroup(R, false);
170176

171-
for (const auto &TU : TUDs)
172-
for (const auto &D : TU.Diagnostics)
177+
}
178+
179+
}
180+
181+
for (const auto &TU : TUDs) {
182+
for (const auto &D : TU.Diagnostics) {
173183
if (const auto *ChoosenFix = tooling::selectFirstFix(D)) {
174-
for (const auto &Fix : *ChoosenFix)
175-
for (const tooling::Replacement &R : Fix.second)
184+
for (const auto &Fix : *ChoosenFix) {
185+
for (const tooling::Replacement &R : Fix.second) {
176186
AddToGroup(R, true);
187+
188+
}
189+
190+
}
177191
}
178192

193+
}
194+
195+
}
196+
179197
// Sort replacements per file to keep consistent behavior when
180198
// clang-apply-replacements run on differents machine.
181199
for (auto &FileAndReplacements : GroupedReplacements) {
@@ -236,8 +254,10 @@ applyChanges(StringRef File, const std::vector<tooling::AtomicChange> &Changes,
236254

237255
llvm::ErrorOr<std::unique_ptr<MemoryBuffer>> Buffer =
238256
SM.getFileManager().getBufferForFile(File);
239-
if (!Buffer)
257+
if (!Buffer) {
240258
return errorCodeToError(Buffer.getError());
259+
260+
}
241261
return tooling::applyAtomicChanges(File, Buffer.get()->getBuffer(), Changes,
242262
Spec);
243263
}

clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,20 @@ int main(int argc, char **argv) {
124124
// Remove the TUReplacementFiles (triggered by "remove-change-desc-files"
125125
// command line option) when exiting main().
126126
std::unique_ptr<ScopedFileRemover> Remover;
127-
if (RemoveTUReplacementFiles)
127+
if (RemoveTUReplacementFiles) {
128128
Remover.reset(new ScopedFileRemover(TUFiles, Diagnostics));
129129

130+
}
131+
130132
FileManager Files((FileSystemOptions()));
131133
SourceManager SM(Diagnostics, Files);
132134

133135
FileToChangesMap Changes;
134-
if (!mergeAndDeduplicate(TURs, TUDs, Changes, SM))
136+
if (!mergeAndDeduplicate(TURs, TUDs, Changes, SM)) {
135137
return 1;
136138

139+
}
140+
137141
tooling::ApplyChangesSpec Spec;
138142
Spec.Cleanup = true;
139143
Spec.Style = FormatStyle;

0 commit comments

Comments
 (0)