From 0736cfe8725893339979b489bfadbd282a6a51d4 Mon Sep 17 00:00:00 2001 From: Ned Palacios Date: Mon, 6 Nov 2023 17:06:45 +0800 Subject: [PATCH] vdoc: fmt html.v and utils.v --- cmd/tools/vdoc/html.v | 6 +++--- cmd/tools/vdoc/utils.v | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmd/tools/vdoc/html.v b/cmd/tools/vdoc/html.v index f33a43921a46d6..41574f73b3c74b 100644 --- a/cmd/tools/vdoc/html.v +++ b/cmd/tools/vdoc/html.v @@ -405,8 +405,8 @@ fn html_highlight(code string, tb &ast.Table) string { .key_true, .key_false { tok_typ = .boolean } - .lpar, .lcbr, .rpar, .rcbr, .lsbr, .rsbr, .semicolon, .colon, .comma, .dot, - .dotdot, .ellipsis { + .lpar, .lcbr, .rpar, .rcbr, .lsbr, .rsbr, .semicolon, .colon, .comma, .dot, .dotdot, + .ellipsis { tok_typ = .punctuation } else { @@ -430,7 +430,7 @@ fn html_highlight(code string, tb &ast.Table) string { // expectation: "${a}.${b}${c}" // reality: "${a.${b}${c}" if tok.lit.len != 0 { - write_token(token.Token{kind: .rcbr}, .unone, mut buf) + write_token(token.Token{ kind: .rcbr }, .unone, mut buf) } inside_string_interp = false diff --git a/cmd/tools/vdoc/utils.v b/cmd/tools/vdoc/utils.v index b61ec91ba87734..f4db195e0da99c 100644 --- a/cmd/tools/vdoc/utils.v +++ b/cmd/tools/vdoc/utils.v @@ -137,8 +137,9 @@ fn gen_footer_text(d &doc.Doc, include_timestamp bool) string { return '${footer_text} Generated on: ${time_str}' } -const highlight_builtin_types = ['bool', 'string', 'i8', 'i16', 'int', 'i64', 'i128', 'isize', 'byte', 'u8', 'u16', - 'u32', 'u64', 'usize', 'u128', 'rune', 'f32', 'f64', 'byteptr', 'voidptr', 'any'] +const highlight_builtin_types = ['bool', 'string', 'i8', 'i16', 'int', 'i64', 'i128', 'isize', + 'byte', 'u8', 'u16', 'u32', 'u64', 'usize', 'u128', 'rune', 'f32', 'f64', 'byteptr', 'voidptr', + 'any'] fn color_highlight(code string, tb &ast.Table) string { highlight_code := fn (tok token.Token, typ HighlightTokenTyp) string { @@ -215,7 +216,8 @@ fn color_highlight(code string, tb &ast.Table) string { (next_tok.kind in [.lcbr, .rpar, .eof, .comma, .pipe, .name, .rcbr, .assign, .key_pub, .key_mut, .pipe, .comma, .comment, .lt, .lsbr] && next_tok.lit !in highlight_builtin_types) && (prev.kind in [.name, .amp, .lcbr, .rsbr, .key_type, .assign, .dot, .question, .rpar, .key_struct, .key_enum, .pipe, .key_interface, .comment, .ellipsis] - && prev.lit !in highlight_builtin_types) && ((tok.lit != '' && tok.lit[0].is_capital()) + && prev.lit !in highlight_builtin_types) + && ((tok.lit != '' && tok.lit[0].is_capital()) || prev_prev.lit in ['C', 'JS']) { tok_typ = .symbol } else if next_tok.kind == .lpar