xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support an optional column param with the +<line>[:<column>] syntax

Browse Source
This commit is contained in:
Maxime Coste 2016-03-15 13:21:28 +00:00
parent b014093c97
commit 6739c5047e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.cc
View File

@ -450,7 +450,7 @@ int run_client(StringView session, StringView init_command, UIType ui_type)
int run_server(StringView session, StringView init_command, int run_server(StringView session, StringView init_command,
bool ignore_kakrc, bool daemon, UIType ui_type, bool ignore_kakrc, bool daemon, UIType ui_type,
ConstArrayView<StringView> files, LineCount target_line) ConstArrayView<StringView> files, ByteCoord target_coord)
{ {
static bool terminate = false; static bool terminate = false;
if (daemon) if (daemon)
@ -551,8 +551,8 @@ int run_server(StringView session, StringView init_command,
{ {
auto& selections = local_client->context().selections_write_only(); auto& selections = local_client->context().selections_write_only();
auto& buffer = selections.buffer(); auto& buffer = selections.buffer();
selections = SelectionList(buffer, buffer.clamp(target_line)); selections = SelectionList(buffer, buffer.clamp(target_coord));
local_client->context().window().center_line(target_line); local_client->context().window().center_line(target_coord.line);
} }
if (startup_error) if (startup_error)
@ -788,15 +788,19 @@ int main(int argc, char* argv[])
} }
else else
{ {
LineCount target_line = 0; ByteCoord target_coord;
Vector<StringView> files; Vector<StringView> files;
for (auto& name : parser) for (auto& name : parser)
{ {
if (not name.empty() and name[0_byte] == '+') if (not name.empty() and name[0_byte] == '+')
{ {
if (auto line = str_to_int_ifp(name.substr(1_byte))) auto colon = find(name, ':');
if (auto line = str_to_int_ifp({name.begin()+1, colon}))
{ {
target_line = *line - 1; target_coord.line = *line - 1;
if (colon != name.end())
target_coord.column = str_to_int_ifp({colon+1, name.end()}).value_or(1) - 1;
continue; continue;
} }
} }
@ -810,7 +814,7 @@ int main(int argc, char* argv[])
return run_server(session, init_command, return run_server(session, init_command,
(bool)parser.get_switch("n"), (bool)parser.get_switch("n"),
(bool)parser.get_switch("d"), (bool)parser.get_switch("d"),
ui_type, files, target_line); ui_type, files, target_coord);
} }
catch (convert_to_client_mode& convert) catch (convert_to_client_mode& convert)
{ {