enlightenment/enventor
enlightenment
/
enventor
6
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

syntax_color: improve string syntax color logic 

Summary:
If we input the quotation mark("), the code under the mark are changed to gray.
so I changed the limitation from the start of quotation mark to the end of the line.

Test Plan:
1. launch enventor
2. input the quotation mark(") in the middle of the code
3. see the syntax color change range about string syntax color

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3825
This commit is contained in:
taehyub 2016-03-25 13:18:06 +09:00 committed by Hermet Park
parent d0db6015e3
commit 21ed85b72b
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib/syntax_color.c
View File

@ -377,20 +377,32 @@ string_apply(Eina_Strbuf *strbuf, char **cur, char **prev,
const Eina_Stringshare *col, Eina_Bool inside_string)
{
//escape string: " ~ "
if (strncmp(*cur, QUOT, QUOT_LEN)) return 0;
Eina_Bool is_eol = EINA_FALSE;
if (inside_string && !strncmp(*cur, EOL, EOL_LEN)) is_eol = EINA_TRUE;
else if (strncmp(*cur, QUOT, QUOT_LEN)) return 0;
char buf[128];
eina_strbuf_append_length(strbuf, *prev, (*cur - *prev));
if (!inside_string)
snprintf(buf, sizeof(buf), "<color=#%s>%s", col, QUOT);
// these conditions limit string range to end of line
// case 1: this condition checks end of line for string
if (is_eol)
{
snprintf(buf, sizeof(buf), "</color>");
eina_strbuf_append(strbuf, buf);
}
// case 2: this condition checks start and end for string
else
snprintf(buf, sizeof(buf), "%s</color>", QUOT);
{
if (!inside_string)
snprintf(buf, sizeof(buf), "<color=#%s>%s", col, QUOT);
else
snprintf(buf, sizeof(buf), "%s</color>", QUOT);
eina_strbuf_append(strbuf, buf);
*cur += QUOT_LEN;
}
eina_strbuf_append(strbuf, buf);
*cur += QUOT_LEN;
*prev = *cur;
return 1;