This is an archive of the discontinued LLVM Phabricator instance.

[clang-format] Apply multiple children configs on fallback style
AbandonedPublic

Authored by zwliew on Dec 26 2021, 9:37 PM.

Summary

Allow multiple children configs to be applied on top of the fallback style.

	Time	Test
	60 ms	x64 debian > LLVM.Bindings/Go::go.test

zwliew requested review of this revision.Dec 26 2021, 9:37 PM

zwliew created this revision.

Path

Size

clang/

lib/

Format/

19 lines

Show First 20 Lines • Show All 3,384 Lines • ▼ Show 20 Lines	for (StringRef Directory = Path; !Directory.empty();
}		}
}		}
if (!UnsuitableConfigFiles.empty())		if (!UnsuitableConfigFiles.empty())
return make_string_error("Configuration file(s) do(es) not support " +		return make_string_error("Configuration file(s) do(es) not support " +
getLanguageName(Style.Language) + ": " +		getLanguageName(Style.Language) + ": " +
UnsuitableConfigFiles);		UnsuitableConfigFiles);

if (!ChildFormatTextToApply.empty()) {		if (!ChildFormatTextToApply.empty()) {
assert(ChildFormatTextToApply.size() == 1);

LLVM_DEBUG(llvm::dbgs()		LLVM_DEBUG(llvm::dbgs()
<< "Applying child configuration on fallback style\n");		<< "Applying child configurations on fallback style\n");

auto Ec =		for (const auto &MemBuf : llvm::reverse(ChildFormatTextToApply)) {
parseConfiguration(*ChildFormatTextToApply.front(), &FallbackStyle,		auto Ec = parseConfiguration(*MemBuf, &FallbackStyle, AllowUnknownOptions,
AllowUnknownOptions, dropDiagnosticHandler);		dropDiagnosticHandler);
// It was already correctly parsed.		// It was already correctly parsed.
assert(!Ec);		assert(!Ec);
static_cast<void>(Ec);		static_cast<void>(Ec);
}		}
		}

return FallbackStyle;		return FallbackStyle;
}		}

} // namespace format		} // namespace format
} // namespace clang		} // namespace clang