wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 17:51:15 +02:00
Code Activity

editorFor: take a pos object instead

Browse source
This commit is contained in:
zimbatm 2019-10-28 21:36:34 +01:00
parent ec448f8bb6
commit 3774fe55fd
No known key found for this signature in database
GPG key ID: 71BAF6D40C1D63D7
4 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libutil/args.cc
View file

@ -178,16 +178,16 @@ Strings argvToStrings(int argc, char * * argv)
return args;
}
Strings editorFor(std::string filename, int lineno)
Strings editorFor(Pos pos)
{
auto editor = getEnv("EDITOR", "cat");
auto args = tokenizeString<Strings>(editor);
if (lineno > 0 && (
if (pos.line > 0 && (
editor.find("emacs") != std::string::npos ||
editor.find("nano") != std::string::npos ||
editor.find("vim") != std::string::npos))
args.push_back(fmt("+%d", lineno));
args.push_back(filename);
args.push_back(fmt("+%d", pos.line));
args.push_back(pos.file);
return args;
}