mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
fmt: fix optional formatting
This commit is contained in:
parent
fecf4ddf65
commit
faed178cb1
@ -452,9 +452,9 @@ fn (f &Fmt) type_to_str(t table.Type) string {
|
||||
mut res := f.table.type_to_str(t)
|
||||
// type_ptr => &type
|
||||
if res.ends_with('_ptr') {
|
||||
res = res[0..res.len - 4]
|
||||
res = res[0 .. res.len - 4]
|
||||
start_pos := 2 * res.count('[]')
|
||||
res = res[0..start_pos] + '&' + res[start_pos..res.len]
|
||||
res = res[0 .. start_pos] + '&' + res[start_pos .. res.len]
|
||||
}
|
||||
return res.replace(f.cur_mod + '.', '')
|
||||
}
|
||||
|
5
vlib/v/fmt/tests/optional_keep.vv
Normal file
5
vlib/v/fmt/tests/optional_keep.vv
Normal file
@ -0,0 +1,5 @@
|
||||
pub fn test() ?&SomeType {
|
||||
}
|
||||
|
||||
struct SomeType {
|
||||
}
|
@ -631,13 +631,13 @@ pub fn (table &Table) type_to_str(t Type) string {
|
||||
res = '[]' + res
|
||||
}
|
||||
}
|
||||
if type_is(t, .optional) {
|
||||
res = '?' + res
|
||||
}
|
||||
nr_muls := type_nr_muls(t)
|
||||
if nr_muls > 0 {
|
||||
res = strings.repeat(`&`, nr_muls) + res
|
||||
}
|
||||
if type_is(t, .optional) {
|
||||
res = '?' + res
|
||||
}
|
||||
/*
|
||||
if res.starts_with(cur_mod +'.') {
|
||||
res = res[cur_mod.len+1.. ]
|
||||
|
Loading…
Reference in New Issue
Block a user