mirror of
https://github.com/RGBCube/serenity
synced 2025-05-14 17:04:59 +00:00

This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
232 lines
8.3 KiB
C++
232 lines
8.3 KiB
C++
/*
|
|
* Copyright (c) 2020, Itamar S. <itamar8910@gmail.com>
|
|
* Copyright (c) 2022, the SerenityOS developers.
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include "DiffViewer.h"
|
|
#include <AK/Debug.h>
|
|
#include <LibDiff/Hunks.h>
|
|
#include <LibGUI/AbstractView.h>
|
|
#include <LibGUI/Painter.h>
|
|
#include <LibGUI/Scrollbar.h>
|
|
#include <LibGfx/Color.h>
|
|
#include <LibGfx/Font/FontDatabase.h>
|
|
#include <LibGfx/Palette.h>
|
|
|
|
namespace HackStudio {
|
|
|
|
void DiffViewer::paint_event(GUI::PaintEvent& event)
|
|
{
|
|
GUI::Painter painter(*this);
|
|
painter.add_clip_rect(widget_inner_rect());
|
|
painter.add_clip_rect(event.rect());
|
|
painter.fill_rect(event.rect(), palette().color(background_role()));
|
|
painter.translate(frame_thickness(), frame_thickness());
|
|
painter.translate(-horizontal_scrollbar().value(), -vertical_scrollbar().value());
|
|
|
|
// Why we need to translate here again? We've already translated the painter.
|
|
// Anyways, it paints correctly so I'll leave it like this.
|
|
painter.fill_rect_with_dither_pattern(
|
|
separator_rect().translated(horizontal_scrollbar().value(), vertical_scrollbar().value()),
|
|
Gfx::Color::LightGray,
|
|
Gfx::Color::White);
|
|
|
|
size_t y_offset = 10;
|
|
size_t current_original_line_index = 0;
|
|
for (auto const& hunk : m_hunks) {
|
|
for (size_t i = current_original_line_index; i < hunk.location.old_range.start_line; ++i) {
|
|
draw_line(painter, m_original_lines[i], y_offset, LinePosition::Both, LineType::Normal);
|
|
y_offset += line_height();
|
|
}
|
|
current_original_line_index = hunk.location.old_range.start_line + hunk.location.old_range.number_of_lines;
|
|
|
|
size_t left_y_offset = y_offset;
|
|
for (auto const& line : hunk.lines) {
|
|
if (line.operation != Diff::Line::Operation::Removal)
|
|
continue;
|
|
draw_line(painter, line.content, left_y_offset, LinePosition::Left, LineType::Diff);
|
|
left_y_offset += line_height();
|
|
}
|
|
for (int i = 0; i < (int)hunk.location.new_range.number_of_lines - (int)hunk.location.old_range.number_of_lines; ++i) {
|
|
draw_line(painter, ""sv, left_y_offset, LinePosition::Left, LineType::Missing);
|
|
left_y_offset += line_height();
|
|
}
|
|
|
|
size_t right_y_offset = y_offset;
|
|
for (auto const& line : hunk.lines) {
|
|
if (line.operation != Diff::Line::Operation::Addition)
|
|
continue;
|
|
draw_line(painter, line.content, right_y_offset, LinePosition::Right, LineType::Diff);
|
|
right_y_offset += line_height();
|
|
}
|
|
for (int i = 0; i < (int)hunk.location.old_range.number_of_lines - (int)hunk.location.new_range.number_of_lines; ++i) {
|
|
draw_line(painter, ""sv, right_y_offset, LinePosition::Right, LineType::Missing);
|
|
right_y_offset += line_height();
|
|
}
|
|
|
|
VERIFY(left_y_offset == right_y_offset);
|
|
y_offset = left_y_offset;
|
|
}
|
|
for (size_t i = current_original_line_index; i < m_original_lines.size(); ++i) {
|
|
draw_line(painter, m_original_lines[i], y_offset, LinePosition::Both, LineType::Normal);
|
|
y_offset += line_height();
|
|
}
|
|
}
|
|
|
|
void DiffViewer::draw_line(GUI::Painter& painter, StringView line, size_t y_offset, LinePosition line_position, LineType line_type)
|
|
{
|
|
size_t line_width = font().width(line);
|
|
|
|
constexpr size_t padding = 10;
|
|
size_t left_side_x_offset = padding;
|
|
size_t right_side_x_offset = separator_rect().x() + padding;
|
|
|
|
// FIXME: Long lines will overflow out of their side of the diff view
|
|
Gfx::IntRect left_line_rect { (int)left_side_x_offset, (int)y_offset, (int)line_width, (int)line_height() };
|
|
Gfx::IntRect right_line_rect { (int)right_side_x_offset, (int)y_offset, (int)line_width, (int)line_height() };
|
|
auto color = palette().color(foreground_role());
|
|
|
|
if (line_position == LinePosition::Left || line_position == LinePosition::Both) {
|
|
painter.draw_text(left_line_rect, line, Gfx::TextAlignment::TopLeft, color);
|
|
if (line_type != LineType::Normal) {
|
|
Gfx::IntRect outline = { (int)left_side_x_offset, ((int)y_offset) - 2, separator_rect().x() - (int)(padding * 2), (int)line_height() };
|
|
if (line_type == LineType::Diff) {
|
|
painter.fill_rect(
|
|
outline,
|
|
red_background());
|
|
}
|
|
if (line_type == LineType::Missing) {
|
|
painter.fill_rect(
|
|
outline,
|
|
gray_background());
|
|
}
|
|
}
|
|
}
|
|
if (line_position == LinePosition::Right || line_position == LinePosition::Both) {
|
|
painter.draw_text(right_line_rect, line, Gfx::TextAlignment::TopLeft, color);
|
|
if (line_type != LineType::Normal) {
|
|
Gfx::IntRect outline = { (int)right_side_x_offset, ((int)y_offset) - 2, frame_inner_rect().width() - separator_rect().x() - (int)(padding * 2) - 10, (int)line_height() };
|
|
if (line_type == LineType::Diff) {
|
|
painter.fill_rect(
|
|
outline,
|
|
green_background());
|
|
}
|
|
if (line_type == LineType::Missing) {
|
|
painter.fill_rect(
|
|
outline,
|
|
gray_background());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
size_t DiffViewer::line_height() const
|
|
{
|
|
return font().pixel_size_rounded_up() + 4;
|
|
}
|
|
|
|
Gfx::IntRect DiffViewer::separator_rect() const
|
|
{
|
|
return Gfx::IntRect { frame_inner_rect().width() / 2 - 2,
|
|
0,
|
|
4,
|
|
frame_inner_rect().height() };
|
|
}
|
|
|
|
void DiffViewer::set_content(ByteString const& original, ByteString const& diff)
|
|
{
|
|
m_original_lines = split_to_lines(original);
|
|
m_hunks = Diff::parse_hunks(diff).release_value_but_fixme_should_propagate_errors();
|
|
|
|
if constexpr (DIFF_DEBUG) {
|
|
for (size_t i = 0; i < m_original_lines.size(); ++i)
|
|
dbgln("{}:{}", i, m_original_lines[i]);
|
|
}
|
|
}
|
|
|
|
DiffViewer::DiffViewer()
|
|
{
|
|
setup_properties();
|
|
}
|
|
|
|
DiffViewer::DiffViewer(ByteString const& original, ByteString const& diff)
|
|
: m_original_lines(split_to_lines(original))
|
|
, m_hunks(Diff::parse_hunks(diff).release_value_but_fixme_should_propagate_errors())
|
|
{
|
|
setup_properties();
|
|
}
|
|
|
|
void DiffViewer::setup_properties()
|
|
{
|
|
set_font(Gfx::FontDatabase::default_fixed_width_font());
|
|
set_background_role(ColorRole::Base);
|
|
set_foreground_role(ColorRole::BaseText);
|
|
}
|
|
|
|
Vector<ByteString> DiffViewer::split_to_lines(ByteString const& text)
|
|
{
|
|
// NOTE: This is slightly different than text.split('\n')
|
|
Vector<ByteString> lines;
|
|
size_t next_line_start_index = 0;
|
|
for (size_t i = 0; i < text.length(); ++i) {
|
|
if (text[i] == '\n') {
|
|
auto line_text = text.substring(next_line_start_index, i - next_line_start_index);
|
|
lines.append(move(line_text));
|
|
next_line_start_index = i + 1;
|
|
}
|
|
}
|
|
lines.append(text.substring(next_line_start_index, text.length() - next_line_start_index));
|
|
return lines;
|
|
}
|
|
|
|
Gfx::Color DiffViewer::red_background()
|
|
{
|
|
static Gfx::Color color = Gfx::Color::from_argb(0x88ff0000);
|
|
return color;
|
|
}
|
|
|
|
Gfx::Color DiffViewer::green_background()
|
|
{
|
|
static Gfx::Color color = Gfx::Color::from_argb(0x8800ff00);
|
|
return color;
|
|
}
|
|
|
|
Gfx::Color DiffViewer::gray_background()
|
|
{
|
|
static Gfx::Color color = Gfx::Color::from_argb(0x88888888);
|
|
return color;
|
|
}
|
|
|
|
void DiffViewer::update_content_size()
|
|
{
|
|
if (m_hunks.is_empty()) {
|
|
set_content_size({ 0, 0 });
|
|
return;
|
|
}
|
|
|
|
size_t num_lines = 0;
|
|
size_t current_original_line_index = 0;
|
|
for (auto const& hunk : m_hunks) {
|
|
num_lines += (hunk.location.old_range.start_line - (int)current_original_line_index);
|
|
|
|
num_lines += hunk.location.old_range.number_of_lines;
|
|
if (hunk.location.new_range.number_of_lines > hunk.location.old_range.number_of_lines) {
|
|
num_lines += ((int)hunk.location.new_range.number_of_lines - (int)hunk.location.old_range.number_of_lines);
|
|
}
|
|
current_original_line_index = hunk.location.old_range.start_line + hunk.location.old_range.number_of_lines;
|
|
}
|
|
num_lines += ((int)m_original_lines.size() - (int)current_original_line_index);
|
|
|
|
// TODO: Support Horizontal scrolling
|
|
set_content_size({ 0, (int)(num_lines * line_height()) });
|
|
}
|
|
|
|
void DiffViewer::resize_event(GUI::ResizeEvent& event)
|
|
{
|
|
AbstractScrollableWidget::resize_event(event);
|
|
update_content_size();
|
|
}
|
|
|
|
}
|