mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-08-02 05:30:23 +02:00
Enhancement - strippedLength
- Added a text method that calculates a string length but does not include color control codes.
This commit is contained in:
parent
ce99cbf2d4
commit
844c980bce
3 changed files with 37 additions and 1 deletions
|
@ -34,7 +34,7 @@ Context context;
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
int main (int argc, char** argv)
|
int main (int argc, char** argv)
|
||||||
{
|
{
|
||||||
UnitTest t (180);
|
UnitTest t (185);
|
||||||
|
|
||||||
// void wrapText (std::vector <std::string>& lines, const std::string& text, const int width)
|
// void wrapText (std::vector <std::string>& lines, const std::string& text, const int width)
|
||||||
std::string text = "This is a test of the line wrapping code.";
|
std::string text = "This is a test of the line wrapping code.";
|
||||||
|
@ -361,6 +361,14 @@ int main (int argc, char** argv)
|
||||||
// Test start offset.
|
// Test start offset.
|
||||||
t.is ((int) find ("one two three", "e", 3, true), (int) 11, "offset obeyed");
|
t.is ((int) find ("one two three", "e", 3, true), (int) 11, "offset obeyed");
|
||||||
t.is ((int) find ("one two three", "e", 11, true), (int) 11, "offset obeyed");
|
t.is ((int) find ("one two three", "e", 11, true), (int) 11, "offset obeyed");
|
||||||
|
|
||||||
|
// int strippedLength (const std::string&);
|
||||||
|
t.is (strippedLength (std::string ("")), 0, "strippedLength -> 0");
|
||||||
|
t.is (strippedLength (std::string ("abc")), 3, "strippedLength abc -> 3");
|
||||||
|
t.is (strippedLength (std::string ("one\033[5;38;255mtwo\033[0mthree")), 11, "strippedLength one^[[5;38;255mtwo^[[0mthree -> 11");
|
||||||
|
t.is (strippedLength (std::string ("\033[0m")), 0, "strippedLength ^[[0m -> 0");
|
||||||
|
t.is (strippedLength (std::string ("\033[1m\033[0m")), 0, "strippedLength ^[[1m^[[0m -> 0");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
27
src/text.cpp
27
src/text.cpp
|
@ -568,3 +568,30 @@ std::string::size_type find (
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Return the length, in characters, of the input, subtracting color control
|
||||||
|
// codes.
|
||||||
|
int strippedLength (const std::string& input)
|
||||||
|
{
|
||||||
|
int length = input.length ();
|
||||||
|
bool inside = false;
|
||||||
|
int count = 0;
|
||||||
|
for (int i = 0; i < length; ++i)
|
||||||
|
{
|
||||||
|
if (inside)
|
||||||
|
{
|
||||||
|
if (input[i] == 'm')
|
||||||
|
inside = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (input[i] == 033)
|
||||||
|
inside = true;
|
||||||
|
else
|
||||||
|
++count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -57,6 +57,7 @@ bool isWordEnd (const std::string&, std::string::size_type);
|
||||||
bool compare (const std::string&, const std::string&, bool sensitive = true);
|
bool compare (const std::string&, const std::string&, bool sensitive = true);
|
||||||
std::string::size_type find (const std::string&, const std::string&, bool sensitive = true);
|
std::string::size_type find (const std::string&, const std::string&, bool sensitive = true);
|
||||||
std::string::size_type find (const std::string&, const std::string&, std::string::size_type, bool sensitive = true);
|
std::string::size_type find (const std::string&, const std::string&, std::string::size_type, bool sensitive = true);
|
||||||
|
int strippedLength (const std::string&);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue