mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-08-20 13:23:08 +02:00
Bug
- Colons are evil, fixed ZSH completion commands.
This commit is contained in:
parent
26dbd8e790
commit
55813b6a09
3 changed files with 15 additions and 2 deletions
|
@ -38,6 +38,8 @@
|
||||||
|
|
||||||
extern Context context;
|
extern Context context;
|
||||||
|
|
||||||
|
std::string zshColonReplacement = ",";
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
CmdIDs::CmdIDs ()
|
CmdIDs::CmdIDs ()
|
||||||
{
|
{
|
||||||
|
@ -131,7 +133,7 @@ int CmdZshCompletionIds::execute (std::string& output)
|
||||||
task->getStatus () != Task::completed)
|
task->getStatus () != Task::completed)
|
||||||
out << task->id
|
out << task->id
|
||||||
<< ":"
|
<< ":"
|
||||||
<< task->get ("description")
|
<< str_replace(task->get ("description"), ":", zshColonReplacement)
|
||||||
<< "\n";
|
<< "\n";
|
||||||
|
|
||||||
output = out.str ();
|
output = out.str ();
|
||||||
|
@ -228,7 +230,7 @@ int CmdZshCompletionUuids::execute (std::string& output)
|
||||||
for (task = filtered.begin (); task != filtered.end (); ++task)
|
for (task = filtered.begin (); task != filtered.end (); ++task)
|
||||||
out << task->get ("uuid")
|
out << task->get ("uuid")
|
||||||
<< ":"
|
<< ":"
|
||||||
<< task->get ("description")
|
<< str_replace (task->get ("description"), ":", zshColonReplacement)
|
||||||
<< "\n";
|
<< "\n";
|
||||||
|
|
||||||
output = out.str ();
|
output = out.str ();
|
||||||
|
|
10
src/text.cpp
10
src/text.cpp
|
@ -527,6 +527,16 @@ const std::string str_replace (
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
const std::string str_replace (
|
||||||
|
const std::string& str,
|
||||||
|
const std::string& search,
|
||||||
|
const std::string& replacement)
|
||||||
|
{
|
||||||
|
std::string modified = str;
|
||||||
|
return str_replace (modified, search, replacement);
|
||||||
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
const char* optionalBlankLine ()
|
const char* optionalBlankLine ()
|
||||||
{
|
{
|
||||||
|
|
|
@ -53,6 +53,7 @@ std::string lowerCase (const std::string&);
|
||||||
std::string upperCase (const std::string&);
|
std::string upperCase (const std::string&);
|
||||||
std::string ucFirst (const std::string&);
|
std::string ucFirst (const std::string&);
|
||||||
const std::string str_replace (std::string&, const std::string&, const std::string&);
|
const std::string str_replace (std::string&, const std::string&, const std::string&);
|
||||||
|
const std::string str_replace (const std::string&, const std::string&, const std::string&);
|
||||||
const char* optionalBlankLine ();
|
const char* optionalBlankLine ();
|
||||||
void guess (const std::string&, std::vector<std::string>&, std::string&);
|
void guess (const std::string&, std::vector<std::string>&, std::string&);
|
||||||
bool nontrivial (const std::string&);
|
bool nontrivial (const std::string&);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue