night0721/vip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Highlight ; and escape sequence and .

Browse source
This commit is contained in:
Night Kaly 2024-11-12 11:09:00 +00:00
parent a00669be81
commit 233bbcea37
Signed by: night0721
SSH key fingerprint: SHA256:B/hgVwUoBpx5vdNsXl9w8XwZljA9766uk6T4ubZp5HM
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config.h
View file

@ -26,6 +26,8 @@
#define RED_BG "\033[38;2;243;139;168m" #define RED_BG "\033[38;2;243;139;168m"
#define TEAL_FG "\033[48;2;148;226;213m" #define TEAL_FG "\033[48;2;148;226;213m"
#define TEAL_BG "\033[38;2;148;226;213m" #define TEAL_BG "\033[38;2;148;226;213m"
#define PINK_FG "\033[48;2;245;194;231m"
#define PINK_BG "\033[38;2;245;194;231m"
/* ERROR is red with bold and italic */ /* ERROR is red with bold and italic */
#define ERROR "\033[38;2;243;139;168m\033[1m\033[3m" #define ERROR "\033[38;2;243;139;168m\033[1m\033[3m"
@ -54,6 +56,7 @@ enum highlight {
DEFAULT = 0, DEFAULT = 0,
SYMBOL, SYMBOL,
COMMENT, COMMENT,
TERMINATOR,
MLCOMMENT, MLCOMMENT,
KW, KW,
KW_TYPE, KW_TYPE,
@ -61,6 +64,7 @@ enum highlight {
KW_BRACKET, KW_BRACKET,
STRING, STRING,
CHAR, CHAR,
ESCAPE,
NUMBER, NUMBER,
MATCH, MATCH,
RESET RESET
@ -108,7 +112,7 @@ language_t langs[] = {
"//", "//",
"/*", "/*",
"*/", "*/",
{ "switch", "if", "while", "for", "break", "continue", "return", "else", "struct", "union", "typedef", "static", "enum", "case", "sizeof", "#include", "#define", "#if", "#elseif", "#endif", "int|", "long|", "double|", "float|", "char|", "unsigned|", "void|", "size_t|", "uint8_t|", NULL }, { "const", "switch", "if", "while", "for", "break", "continue", "return", "else", "struct", "union", "typedef", "static", "enum", "case", "sizeof", "#include", "#define", "#if", "#elseif", "#endif", "int|", "long|", "double|", "float|", "char|", "unsigned|", "void|", "size_t|", "uint8_t|", NULL },
{ ".c", ".h", ".cpp", NULL }, { ".c", ".h", ".cpp", NULL },
}, },
}; };

40
vip.c
View file

@ -599,10 +599,18 @@ void draw_rows(void)
bprintf(TEAL_BG); bprintf(TEAL_BG);
break; break;
case ESCAPE:
bprintf(PINK_BG);
break;
case SYMBOL: case SYMBOL:
bprintf(SKY_BG); bprintf(SKY_BG);
break; break;
case TERMINATOR:
bprintf(OVERLAY_2_BG);
break;
case COMMENT: case COMMENT:
case MLCOMMENT: case MLCOMMENT:
bprintf("\033[3m"); bprintf("\033[3m");
@ -754,7 +762,7 @@ int is_separator(int c)
int is_symbol(int c) int is_symbol(int c)
{ {
return strchr("+-/*=~%><:?&", c) != NULL; return strchr("+-/*=~%><:?&|.", c) != NULL;
} }
void update_highlight(row_t *row) void update_highlight(row_t *row)
@ -778,6 +786,7 @@ void update_highlight(row_t *row)
int in_string = 0; int in_string = 0;
int in_char = 0; int in_char = 0;
int in_include = 0; int in_include = 0;
int in_escape = 0;
int in_comment = row->idx > 0 && cur_editor->row[row->idx - 1].opened_comment; int in_comment = row->idx > 0 && cur_editor->row[row->idx - 1].opened_comment;
int i = 0; int i = 0;
@ -813,6 +822,24 @@ void update_highlight(row_t *row)
} }
} }
if (in_escape) {
if (!(c > 47 && c < 58)) {
in_escape = 0;
} else {
row->hl[i] = ESCAPE;
i++;
prev_sep = 0;
continue;
}
} else {
if (c == '\\') {
in_escape = 1;
row->hl[i] = ESCAPE;
i++;
continue;
}
}
if (in_string) { if (in_string) {
row->hl[i] = STRING; row->hl[i] = STRING;
if (c == '\\' && i + 1 < row->render_size) { if (c == '\\' && i + 1 < row->render_size) {
@ -867,13 +894,13 @@ void update_highlight(row_t *row)
i++; i++;
continue; continue;
} }
} }
if ((isdigit(c) && (prev_sep || prev_hl == NUMBER)) || if ((isdigit(c) && (prev_sep || prev_hl == NUMBER)) ||
(c == '.' && prev_hl == NUMBER) || (c == '.' && prev_hl == NUMBER) ||
(c >= 'A' && c <= 'Z') || (c >= 'A' && c <= 'Z') ||
(c == '_' && prev_hl == NUMBER) (c == '_' && prev_hl == NUMBER)
) { ) {
row->hl[i] = NUMBER; row->hl[i] = NUMBER;
i++; i++;
prev_sep = 0; prev_sep = 0;
@ -894,6 +921,13 @@ void update_highlight(row_t *row)
continue; continue;
} }
if (c == ';') {
row->hl[i] = TERMINATOR;
prev_sep = 1;
i++;
continue;
}
if (prev_sep) { if (prev_sep) {
int j; int j;
for (j = 0; keywords[j]; j++) { for (j = 0; keywords[j]; j++) {