Skip to content

Commit

Permalink
fmt: simplify const name formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
ttytm committed Mar 29, 2024
1 parent 143f0cc commit bfd4f05
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions vlib/v/fmt/fmt.v
Original file line number Diff line number Diff line change
Expand Up @@ -2255,20 +2255,16 @@ pub fn (mut f Fmt) ident(node ast.Ident) {
// This makes it clear that a module const is being used
// (since V's consts are no longer ALL_CAP).
// ^^^ except for `main`, where consts are allowed to not have a `main.` prefix.
mod := f.cur_mod
full_name := mod + '.' + node.name
if obj := f.file.global_scope.find(full_name) {
if obj := f.file.global_scope.find('${f.cur_mod}.${node.name}') {
if obj is ast.ConstField {
// "v.fmt.foo" => "fmt.foo"
vals := full_name.split('.')
mod_prefix := vals[vals.len - 2]
const_name := vals.last()
if mod_prefix == 'main' {
const_name := node.name.all_after_last('.')
if f.cur_mod == 'main' {
f.write(const_name)
} else {
short := mod_prefix + '.' + const_name
f.write(short)
f.mark_import_as_used(short)
name := '${f.cur_mod.all_after_last('.')}.${const_name}'
f.write(name)
f.mark_import_as_used(name)
}
if node.or_expr.kind == .block {
f.or_expr(node.or_expr)
Expand Down

0 comments on commit bfd4f05

Please sign in to comment.