RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:47:35 +00:00
Code Issues Activity Actions

LaunchServer: Correctly open file URLs with line numbers

Browse source 
PR #5665 updated TextEditor to open files at a specific line/column
location using the file:line:col argument, rather than the -l flag.

This change updates LaunchServer to use that convention, though note it
does only pass the line number and not a column number, as per all
previous behaviour.
This commit is contained in:
Adam Hodgen 2021-06-19 20:18:57 +01:00 • committed by Andreas Kling
parent fb488e2b27
commit c03a3dc5b7
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Services/LaunchServer/Launcher.cpp
View file

@ -301,16 +301,21 @@ bool Launcher::open_file_url(const URL& url)
// Additional parameters parsing, specific for the file protocol and TextEditor
Vector<String> additional_parameters;
additional_parameters.append(url.path());
String filepath = url.path();
auto parameters = url.query().split('&');
for (auto parameter = parameters.begin(); parameter != parameters.end(); ++parameter) {
auto pair = parameter->split('=');
for (auto const& parameter : parameters) {
auto pair = parameter.split('=');
if (pair.size() == 2 && pair[0] == "line_number") {
auto line = pair[1].to_int();
if (line.has_value())
additional_parameters.prepend(String::formatted("-l {}", line.value()));
// TextEditor uses file:line:col to open a file at a specific line number
filepath = String::formatted("{}:{}", filepath, line.value());
}
}
additional_parameters.append(filepath);
return open_with_user_preferences(m_file_handlers, extension, additional_parameters, "/bin/TextEditor");
}
}