dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#477 fixed wrong highlight, when word nested api or keyword

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2017-12-21 08:44:50 +03:00
parent 71c7144aa5
commit 63c0c77ea5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/code.c
View File

@@ -324,12 +324,13 @@ static void parse(const char* start, u8* color, const SyntaxConfig* config)
{
while(!islineend(*ptr) && isalnum_(*ptr)) ptr++;
s32 len = ptr - wordStart;
bool keyword = false;
{
for(s32 i = 0; i < config->keywordsCount; i++)
if(memcmp(wordStart, config->keywords[i], strlen(config->keywords[i])) == 0)
if(len == strlen(config->keywords[i]) && memcmp(wordStart, config->keywords[i], len) == 0)
{
memset(color + (wordStart - start), getConfig()->theme.code.keyword, ptr - wordStart);
memset(color + (wordStart - start), getConfig()->theme.code.keyword, len);
keyword = true;
break;
}
@@ -340,9 +341,9 @@ static void parse(const char* start, u8* color, const SyntaxConfig* config)
static const char* const Api[] = API_KEYWORDS;
for(s32 i = 0; i < COUNT_OF(Api); i++)
if(memcmp(wordStart, Api[i], strlen(Api[i])) == 0)
if(len == strlen(Api[i]) && memcmp(wordStart, Api[i], len) == 0)
{
memset(color + (wordStart - start), getConfig()->theme.code.api, ptr - wordStart);
memset(color + (wordStart - start), getConfig()->theme.code.api, len);
break;
}
}