UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/code] Fix syntaxic coloration

Browse Source 
This fixes the coloration of:
"123\n"+1
"\n\n"+1

For strings, lex->vstr.len gave the wrong value because it had already
translated escaped chars, so "\n" would be one char long.
This commit is contained in:
Léa Saviot
2019-09-24 17:12:37 +02:00
parent d14638163a
commit 0f52335183
1 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apps/code/python_text_area.cpp
View File

@@ -1,5 +1,6 @@
#include "python_text_area.h"
#include "app.h"
#include <ion/unicode/utf8_helper.h>
extern "C" {
#include "py/nlr.h"
@@ -39,40 +40,15 @@ static inline KDColor TokenColor(mp_token_kind_t tokenKind) {
return KDColorBlack;
}
static inline size_t TokenLength(mp_lexer_t * lex) {
if (lex->tok_kind == MP_TOKEN_STRING) {
return lex->vstr.len + 2;
}
if (lex->vstr.len > 0) {
return lex->vstr.len;
}
switch (lex->tok_kind) {
case MP_TOKEN_OP_DBL_STAR:
case MP_TOKEN_OP_DBL_SLASH:
case MP_TOKEN_OP_DBL_LESS:
case MP_TOKEN_OP_DBL_MORE:
case MP_TOKEN_OP_LESS_EQUAL:
case MP_TOKEN_OP_MORE_EQUAL:
case MP_TOKEN_OP_DBL_EQUAL:
case MP_TOKEN_OP_NOT_EQUAL:
case MP_TOKEN_DEL_PLUS_EQUAL:
case MP_TOKEN_DEL_MINUS_EQUAL:
case MP_TOKEN_DEL_STAR_EQUAL:
case MP_TOKEN_DEL_SLASH_EQUAL:
case MP_TOKEN_DEL_PERCENT_EQUAL:
case MP_TOKEN_DEL_AMPERSAND_EQUAL:
case MP_TOKEN_DEL_PIPE_EQUAL:
case MP_TOKEN_DEL_CARET_EQUAL:
case MP_TOKEN_DEL_MINUS_MORE:
return 2;
case MP_TOKEN_DEL_DBL_SLASH_EQUAL:
case MP_TOKEN_DEL_DBL_MORE_EQUAL:
case MP_TOKEN_DEL_DBL_LESS_EQUAL:
case MP_TOKEN_DEL_DBL_STAR_EQUAL:
return 3;
default:
return 1;
static inline size_t TokenLength(mp_lexer_t * lex, const char * tokenPosition) {
/* The lexer stores the beginning of the current token and of the next token,
* so we just use that. */
if (lex->line > 1) {
/* The next token is on the next line, so we cannot just make the difference
* of the columns. */
return UTF8Helper::CodePointSearch(tokenPosition, '\n') - tokenPosition;
}
return lex->column - lex->tok_column;
}
void PythonTextArea::ContentView::loadSyntaxHighlighter() {
@@ -133,7 +109,7 @@ void PythonTextArea::ContentView::drawLine(KDContext * ctx, int line, const char
while (lex->tok_kind != MP_TOKEN_NEWLINE && lex->tok_kind != MP_TOKEN_END) {
tokenFrom = firstNonSpace + lex->tok_column - 1;
tokenLength = TokenLength(lex);
tokenLength = TokenLength(lex, tokenFrom);
LOG_DRAW("Draw \"%.*s\" for token %d\n", tokenLength, tokenFrom, lex->tok_kind);
drawStringAt(ctx, line,
UTF8Helper::GlyphOffsetAtCodePoint(text, tokenFrom),