Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for incorrectly highlighted parameters

Browse source
This commit is contained in:
ridiculousfish 2012-03-31 14:05:14 -07:00
parent c10b3017d6
commit ab536e5199
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
highlight.cpp
View file

@ -919,12 +919,14 @@ static void tokenize( const wchar_t * const buff, std::vector<int> &color, const
/* Highlight the parameter. highlight_param wants to write one more color than we have characters (hysterical raisins) so allocate one more in the vector. But don't copy it back. */ /* Highlight the parameter. highlight_param wants to write one more color than we have characters (hysterical raisins) so allocate one more in the vector. But don't copy it back. */
const wcstring param_str = param; const wcstring param_str = param;
std::vector<int> subcolors;
subcolors.resize(1 + param_str.size(), -1);
int tok_pos = tok_get_pos(&tok); int tok_pos = tok_get_pos(&tok);
std::vector<int>::const_iterator where = color.begin() + tok_pos;
std::vector<int> subcolors(where, where + param_str.size());
subcolors.push_back(-1);
highlight_param(param_str, subcolors, pos-tok_pos, error); highlight_param(param_str, subcolors, pos-tok_pos, error);
/* Copy the subcolors into our colors array */ /* Copy the subcolors back into our colors array */
std::copy(subcolors.begin(), subcolors.begin() + param_str.size(), color.begin() + tok_pos); std::copy(subcolors.begin(), subcolors.begin() + param_str.size(), color.begin() + tok_pos);
} }
else else