Remove duplicated code

This commit is contained in:
tastytea 2022-03-16 21:39:46 +01:00
parent 4d599e877f
commit a7149eaf52
Signed by: tastytea
SSH Key Fingerprint: SHA256:FBkvrOlhq5use1XEttyUGT4bUTDVA1ar9SgIc9P03cM
1 changed files with 15 additions and 10 deletions

View File

@ -53,27 +53,32 @@ int main()
while (std::getline(std::cin, line)) while (std::getline(std::cin, line))
{ {
const auto line_nc{remove_colors(line)}; const auto line_nc{remove_colors(line)};
// Only look at lines starting with + or - // Only look at long enough lines starting with + or -
if (line_nc.length() >= 2 && (line_nc[0] == '+' || line_nc[0] == '-')) if (line_nc.length() >= 2 && (line_nc[0] == '+' || line_nc[0] == '-'))
{ {
// Don't color +++ and --- lines // Don't color +++ and --- lines
if (line_nc.length() < 3 if (line_nc.length() < 3
|| (line_nc[2] != '+' && line_nc[2] != '-')) || (line_nc[2] != '+' && line_nc[2] != '-'))
{ {
if (line_nc[1] == '+') const auto color{[&line_nc]() -> std::string_view
{
if (line_nc[1] == '+')
{
return green;
}
if (line_nc[1] == '-')
{
return red;
}
return {};
}()};
if (!color.empty())
{ {
const auto pos{get_start_pos(line)}; const auto pos{get_start_pos(line)};
std::cout << line.substr(0, pos) << green std::cout << line.substr(0, pos) << color
<< line.substr(pos) << reset << '\n'; << line.substr(pos) << reset << '\n';
continue; continue;
} }
if (line_nc[1] == '-')
{
const auto pos{get_start_pos(line)};
std::cout << line.substr(0, pos) << red << line.substr(pos)
<< reset << '\n';
continue;
}
} }
} }
std::cout << line << '\n'; std::cout << line << '\n';