vtorri
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

syntax_color: improve logic. 

previous code was strictly only working for edc.
relax the logic to cover more general cases.
This commit is contained in:
ChunEon Park 2015-07-09 19:51:19 +09:00
parent e05fe27848
commit c188b78c06
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/lib/syntax_color.c
View File

@ -510,25 +510,31 @@ color_cancel(color_data *cd, const char *src, int length, int from_pos,
while (cur && (cur <= (src + length)))
{
//Capture start line
if (find_from && (line == from_pos))
{
from_pos = eina_strbuf_length_get(strbuf);
find_from = EINA_FALSE;
}
if (find_to && (line == to_pos))
{
to_pos = eina_strbuf_length_get(strbuf);
find_to = EINA_FALSE;
}
if (*cur == '<')
{
//escape EOL: <br/>
if (!strncmp(cur, EOL, EOL_LEN))
{
eina_strbuf_append_length(strbuf, prev, (cur - prev + EOL_LEN));
//Capture end line
if (find_to && (line == to_pos))
{
to_pos = eina_strbuf_length_get(strbuf);
find_to = EINA_FALSE;
}
eina_strbuf_append_length(strbuf, prev,
(cur - prev + EOL_LEN));
cur += EOL_LEN;
prev = cur;
line++;
continue;
}
//escape TAB: <tab/>
@ -537,13 +543,20 @@ color_cancel(color_data *cd, const char *src, int length, int from_pos,
cur += TAB_LEN;
continue;
}
//escape markups: <..> ~ </..>
if (markup_skip(strbuf, &src, length, &cur, &prev) == 1)
continue;
//escape markups: <..> ~ </..>
if (markup_skip(strbuf, &src, length, &cur, &prev) == 1)
continue;
}
cur++;
}
//Capture end line
if (find_to && (line == to_pos))
{
to_pos = eina_strbuf_length_get(strbuf);
find_to = EINA_FALSE;
}
//Same with origin source.
if (prev == src)
str = src;
@ -601,7 +614,7 @@ static int
color_markup_insert(Eina_Strbuf *strbuf, const char **src, int length, char **cur,
char **prev, color_data *cd)
{
const char *SYMBOLS = " {}[];:.()!<>=&|";
const char *SYMBOLS = " {}[];:.()!<>=&|/";
Eina_Bool symbol = EINA_FALSE;
if (strchr(SYMBOLS, (*cur)[0])) symbol = EINA_TRUE;
@ -874,6 +887,23 @@ color_apply(color_data *cd, const char *src, int length, char *from, char *to)
continue;
}
if (*cur == '<')
{
//escape EOL: <br/>
if (!strncmp(cur, EOL, EOL_LEN))
{
cur += EOL_LEN;
continue;
}
//escape TAB: <tab/>
if (!strncmp(cur, TAB, TAB_LEN))
{
cur += TAB_LEN;
continue;
}
}
//handle comment: /* ~ */
ret = comment_apply(strbuf, &src, length, &cur, &prev, cd->col_comment,
&inside_comment);