beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-29 08:11:13 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibWebView: Properly handle new lines inside styled view-source elements
Some checks are pending
CI / Lagom (false, FUZZ, ubuntu-22.04, Linux, Clang) (push) Waiting to run
Details
CI / Lagom (false, NO_FUZZ, macos-14, macOS, Clang) (push) Waiting to run
Details
CI / Lagom (false, NO_FUZZ, ubuntu-22.04, Linux, GNU) (push) Waiting to run
Details
CI / Lagom (true, NO_FUZZ, ubuntu-22.04, Linux, Clang) (push) Waiting to run
Details
Package the js repl as a binary artifact / build-and-package (macos-14, macOS, macOS-universal2) (push) Waiting to run
Details
Package the js repl as a binary artifact / build-and-package (ubuntu-22.04, Linux, Linux-x86_64) (push) Waiting to run
Details
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Details
Lint Code / lint (push) Waiting to run
Details
Push notes / build (push) Waiting to run
Details

Browse source 
When we want to inject a CSS counter for a line, we need to be sure to
handle if we had previously opened a styled span for the current source
substring. For example, if we see a new line in the middle of a comment,
we will have previously opened the following tag:

    <span class="comment">

So when injecting a new line and the <span class="line"> element (for
CSS counters), we need to close the previous span and insert a newly
opened tag to continue using the style.
This commit is contained in:
Timothy Flynn 2024-09-03 14:14:06 -04:00 committed by Andreas Kling
parent 79b57ef094
commit f1395a2c38
Notes: github-actions[bot] 2024-09-04 14:00:51 +00:00 
Author: https://github.com/trflynn89
Commit: https://github.com/LadybirdBrowser/ladybird/commit/f1395a2c385
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1270
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Userland/Libraries/LibWebView/SourceHighlighter.cpp
View file

@ -79,27 +79,36 @@ String highlight_source(URL::URL const& url, StringView source)
auto segment = source.substring_view(previous_position, end_position - previous_position); auto segment = source.substring_view(previous_position, end_position - previous_position);
if (class_name.has_value()) auto append_class_start = [&]() {
builder.appendff("<span class=\"{}\">"sv, *class_name); if (class_name.has_value())
builder.appendff("<span class=\"{}\">"sv, *class_name);
};
auto append_class_end = [&]() {
if (class_name.has_value())
builder.append("</span>"sv);
};
append_class_start();
for (auto code_point : Utf8View { segment }) { for (auto code_point : Utf8View { segment }) {
if (code_point == '&') if (code_point == '&') {
builder.append("&amp;"sv); builder.append("&amp;"sv);
else if (code_point == 0xA0) } else if (code_point == 0xA0) {
builder.append("&nbsp;"sv); builder.append("&nbsp;"sv);
else if (code_point == '<') } else if (code_point == '<') {
builder.append("&lt;"sv); builder.append("&lt;"sv);
else if (code_point == '>') } else if (code_point == '>') {
builder.append("&gt;"sv); builder.append("&gt;"sv);
else if (code_point == '\n') } else if (code_point == '\n') {
append_class_end();
builder.append("</span>\n<span class=\"line\">"sv); builder.append("</span>\n<span class=\"line\">"sv);
else append_class_start();
} else {
builder.append_code_point(code_point); builder.append_code_point(code_point);
}
} }
if (class_name.has_value()) append_class_end();
builder.append("</span>"sv);
previous_position = end_position; previous_position = end_position;
}; };