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

Rename highlight_shell_magic to highlight_shell_new_parser

Browse source
This commit is contained in:
ridiculousfish 2014-01-13 00:31:25 -08:00
parent 51c18e3f9a
commit 746cc4c10b
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fish_tests.cpp
View file

@ -59,7 +59,6 @@
#include "iothread.h" #include "iothread.h"
#include "postfork.h" #include "postfork.h"
#include "signal.h" #include "signal.h"
#include "highlight.h"
#include "parse_tree.h" #include "parse_tree.h"
#include "parse_util.h" #include "parse_util.h"

4
highlight.cpp
View file

@ -1245,7 +1245,7 @@ void highlight_shell(const wcstring &buff, std::vector<int> &color, size_t pos,
{ {
if (1) if (1)
{ {
highlight_shell_magic(buff, color, pos, error, vars); highlight_shell_new_parser(buff, color, pos, error, vars);
} }
else else
{ {
@ -2186,7 +2186,7 @@ const highlighter_t::color_array_t & highlighter_t::highlight()
return color_array; return color_array;
} }
void highlight_shell_magic(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars) void highlight_shell_new_parser(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars)
{ {
/* Do something sucky and get the current working directory on this background thread. This should really be passed in. */ /* Do something sucky and get the current working directory on this background thread. This should really be passed in. */
const wcstring working_directory = env_get_pwd_slash(); const wcstring working_directory = env_get_pwd_slash();

4
highlight.h
View file

@ -84,7 +84,7 @@ struct file_detection_context_t;
\param error a list in which a description of each error will be inserted. May be 0, in whcich case no error descriptions will be generated. \param error a list in which a description of each error will be inserted. May be 0, in whcich case no error descriptions will be generated.
*/ */
void highlight_shell(const wcstring &buffstr, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars); void highlight_shell(const wcstring &buffstr, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
void highlight_shell_magic(const wcstring &buffstr, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars); void highlight_shell_new_parser(const wcstring &buffstr, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
/** /**
Perform syntax highlighting for the text in buff. Matching quotes and paranthesis are highlighted. The result is Perform syntax highlighting for the text in buff. Matching quotes and paranthesis are highlighted. The result is
@ -136,7 +136,7 @@ bool is_potential_path(const wcstring &const_path, const wcstring_list_t &direct
/* For testing */ /* For testing */
void highlight_shell_classic(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars); void highlight_shell_classic(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
void highlight_shell_magic(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars); void highlight_shell_new_parser(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
#endif #endif