mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

vdoc: HTML highlight generic function as function, not name (#13923)

Browse Source
This commit is contained in:
Nick Treleaven 2022-04-03 21:41:02 +01:00 committed by GitHub
parent 44603f8e59
commit d10135e2c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/tools/vdoc/html.v
View File

@ -326,7 +326,8 @@ fn html_highlight(code string, tb &ast.Table) string {
tok_typ = .builtin tok_typ = .builtin
} else if next_tok.kind == .lcbr { } else if next_tok.kind == .lcbr {
tok_typ = .symbol tok_typ = .symbol
} else if next_tok.kind == .lpar { } else if next_tok.kind == .lpar
|| (!tok.lit[0].is_capital() && next_tok.kind == .lt) {
tok_typ = .function tok_typ = .function
} else { } else {
tok_typ = .name tok_typ = .name

4
cmd/tools/vdoc/utils.v
View File

@ -206,7 +206,7 @@ fn color_highlight(code string, tb &ast.Table) string {
} else if } else if
next_tok.kind in [.lcbr, .rpar, .eof, .comma, .pipe, .name, .rcbr, .assign, .key_pub, .key_mut, .pipe, .comma] next_tok.kind in [.lcbr, .rpar, .eof, .comma, .pipe, .name, .rcbr, .assign, .key_pub, .key_mut, .pipe, .comma]
&& prev.kind in [.name, .amp, .rsbr, .key_type, .assign, .dot, .question, .rpar, .key_struct, .key_enum, .pipe, .key_interface] && prev.kind in [.name, .amp, .rsbr, .key_type, .assign, .dot, .question, .rpar, .key_struct, .key_enum, .pipe, .key_interface]
&& (tok.lit[0].ascii_str().is_upper() || prev_prev.lit in ['C', 'JS']) { && (tok.lit[0].is_capital() || prev_prev.lit in ['C', 'JS']) {
tok_typ = .symbol tok_typ = .symbol
} else if next_tok.kind in [.lpar, .lt] { } else if next_tok.kind in [.lpar, .lt] {
tok_typ = .function tok_typ = .function
@ -214,7 +214,7 @@ fn color_highlight(code string, tb &ast.Table) string {
if tok.lit in ['C', 'JS'] { if tok.lit in ['C', 'JS'] {
tok_typ = .prefix tok_typ = .prefix
} else { } else {
if tok.lit[0].ascii_str().is_upper() { if tok.lit[0].is_capital() {
tok_typ = .symbol tok_typ = .symbol
} else { } else {
tok_typ = .module_ tok_typ = .module_

1
vlib/builtin/int.v
View File

@ -449,6 +449,7 @@ pub fn (nn u64) hex_full() string {
} }
// str returns the contents of `byte` as a zero terminated `string`. // str returns the contents of `byte` as a zero terminated `string`.
// See also: [`byte.ascii_str`](#byte.ascii_str)
// Example: assert byte(111).str() == '111' // Example: assert byte(111).str() == '111'
pub fn (b byte) str() string { pub fn (b byte) str() string {
return int(b).str_l(7) return int(b).str_l(7)

1
vlib/builtin/string.v
View File

@ -1208,6 +1208,7 @@ pub fn (s string) to_upper() string {
} }
// is_upper returns `true` if all characters in the string is uppercase. // is_upper returns `true` if all characters in the string is uppercase.
// See also: [`byte.is_capital`](#byte.is_capital)
// Example: assert 'HELLO V'.is_upper() == true // Example: assert 'HELLO V'.is_upper() == true
[direct_array_access] [direct_array_access]
pub fn (s string) is_upper() bool { pub fn (s string) is_upper() bool {