beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 01:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

TextEditor: Update file argument parser regex pattern

Browse source
This commit is contained in:
Ali Chraghi 2022-03-27 14:16:38 +04:30 committed by Ali Mohammad Pur
parent 5b48912d35
commit 0eaed09517
Notes: sideshowbarker 2024-07-17 14:32:58 +09:00 
Author: https://github.com/alichraghi
Commit: https://github.com/SerenityOS/serenity/commit/0eaed09517
Pull-request: https://github.com/SerenityOS/serenity/pull/13251
Issue: https://github.com/SerenityOS/serenity/issues/13213
Reviewed-by: https://github.com/alimpfard
Reviewed-by: https://github.com/simonmcm1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Userland/Applications/TextEditor/FileArgument.cpp
View file

@ -17,15 +17,14 @@ FileArgument::FileArgument(String file_argument)
m_column = {};
// A file doesn't exist with the full specified name, maybe the user entered line/column coordinates?
Regex<PosixExtended> re("^(.+?)(:([0-9]+):?([0-9]+)?)?$");
Regex<PosixExtended> re("^(.+?)(?::([0-9]+))?(?::([0-9]+))?$");
RegexResult result = match(file_argument, re, PosixFlags::Global | PosixFlags::Multiline | PosixFlags::Ungreedy);
auto& groups = result.capture_group_matches.at(0);
// Match 0 group 0: file name
// Match 0 group 1: line number
// Match 0 group 2: column number
if (groups.size() > 3) {
if (groups.size() > 2) {
// Both a line and column number were specified.
auto filename = groups.at(0).view.to_string();
auto initial_line_number = groups.at(1).view.to_string().to_int();
@ -36,7 +35,7 @@ FileArgument::FileArgument(String file_argument)
m_line = initial_line_number.value();
if (initial_column_number.has_value())
m_column = initial_column_number.value();
} else if (groups.size() == 3) {
} else if (groups.size() == 2) {
// Only a line number was specified.
auto filename = groups.at(0).view.to_string();
auto initial_line_number = groups.at(1).view.to_string().to_int();