LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 01:37:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibDiff: Add Diff::write_normal for outputting normal hunks

Browse Source 
In order to extract duplicated code between browser and the diff
utility.
This commit is contained in:
Shannon Booth 2023-06-21 18:48:17 +12:00 committed by Andreas Kling
parent 312de21498
commit 7afff80e71
Notes: sideshowbarker 2024-07-16 18:06:41 +09:00 
Author: https://github.com/shannonbooth
Commit: https://github.com/SerenityOS/serenity/commit/7afff80e71
Pull-request: https://github.com/SerenityOS/serenity/pull/19530
Reviewed-by: https://github.com/caoimhebyrne
Reviewed-by: https://github.com/kennethmyhra ✅
2 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Userland/Libraries/LibDiff/Format.cpp
View File

@ -1,11 +1,14 @@
/*
* Copyright (c) 2020, Itamar S. <itamar8910@gmail.com>
* Copyright (c) 2021, Mustafa Quraish <mustafa@serenityos.org>
* Copyright (c) 2023, Shannon Booth <shannon.ml.booth@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "Format.h"
#include <AK/DeprecatedString.h>
#include <AK/Stream.h>
#include <AK/StringBuilder.h>
#include <AK/Vector.h>
@ -20,4 +23,53 @@ DeprecatedString generate_only_additions(StringView text)
}
return builder.to_deprecated_string();
}
};
ErrorOr<void> write_normal(Hunk const& hunk, Stream& stream, ColorOutput color_output)
{
auto original_start = hunk.original_start_line;
auto target_start = hunk.target_start_line;
auto num_added = hunk.added_lines.size();
auto num_removed = hunk.removed_lines.size();
// Source line(s)
TRY(stream.write_formatted("{}", original_start));
if (num_removed > 1)
TRY(stream.write_formatted(",{}", original_start + num_removed - 1));
// Action
if (num_added > 0 && num_removed > 0)
TRY(stream.write_formatted("c"));
else if (num_added > 0)
TRY(stream.write_formatted("a"));
else
TRY(stream.write_formatted("d"));
// Target line(s)
TRY(stream.write_formatted("{}", target_start));
if (num_added > 1)
TRY(stream.write_formatted(",{}", target_start + num_added - 1));
TRY(stream.write_formatted("\n"));
for (auto const& line : hunk.removed_lines) {
if (color_output == ColorOutput::Yes)
TRY(stream.write_formatted("\033[31;1m< {}\033[0m\n", line));
else
TRY(stream.write_formatted("< {}\n", line));
}
if (num_added > 0 && num_removed > 0)
TRY(stream.write_formatted("---\n"));
for (auto const& line : hunk.added_lines) {
if (color_output == ColorOutput::Yes)
TRY(stream.write_formatted("\033[32;1m> {}\033[0m\n", line));
else
TRY(stream.write_formatted("> {}\n", line));
}
return {};
}
}

14
Userland/Libraries/LibDiff/Format.h
View File

@ -1,13 +1,25 @@
/*
* Copyright (c) 2020, Itamar S. <itamar8910@gmail.com>
* Copyright (c) 2023, Shannon Booth <shannon.ml.booth@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/Error.h>
#include <AK/Forward.h>
#include <LibDiff/Hunks.h>
namespace Diff {
DeprecatedString generate_only_additions(StringView);
enum class ColorOutput {
Yes,
No,
};
ErrorOr<void> write_normal(Hunk const& hunk, Stream& stream, ColorOutput color_output = ColorOutput::No);
}