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

vfmt: change all '$expr' to '${expr}' (#16428)

Browse Source
This commit is contained in:
yuyi
2022-11-15 21:53:13 +08:00
committed by GitHub
parent 56239b4a23
commit 017ace6ea7
859 changed files with 7156 additions and 7135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vlib/cli/help.v
View File

@ -43,7 +43,7 @@ pub fn print_help_for_command(help_cmd Command) ! {
}
if !found {
args := help_cmd.args.join(' ')
println('Invalid command: $args')
println('Invalid command: ${args}')
return
}
}
@ -58,7 +58,7 @@ pub fn print_help_for_command(help_cmd Command) ! {
// help_message returns a generated help message as a `string` for the `Command`.
pub fn (cmd Command) help_message() string {
mut help := ''
help += 'Usage: $cmd.full_name()'
help += 'Usage: ${cmd.full_name()}'
if cmd.flags.len > 0 {
help += ' [flags]'
}
@ -66,15 +66,15 @@ pub fn (cmd Command) help_message() string {
help += ' [commands]'
}
if cmd.usage.len > 0 {
help += ' $cmd.usage'
help += ' ${cmd.usage}'
} else {
for i in 0 .. cmd.required_args {
help += ' <arg$i>'
help += ' <arg${i}>'
}
}
help += '\n'
if cmd.description != '' {
help += '\n$cmd.description\n'
help += '\n${cmd.description}\n'
}
mut abbrev_len := 0
mut name_len := cli.min_description_indent_len
@ -106,10 +106,10 @@ pub fn (cmd Command) help_message() string {
prefix := if cmd.posix_mode { '--' } else { '-' }
if flag.abbrev != '' {
abbrev_indent := ' '.repeat(abbrev_len - flag.abbrev.len - 1) // - 1 for '-' in front
flag_name = '-$flag.abbrev$abbrev_indent$prefix$flag.name'
flag_name = '-${flag.abbrev}${abbrev_indent}${prefix}${flag.name}'
} else {
abbrev_indent := ' '.repeat(abbrev_len)
flag_name = '$abbrev_indent$prefix$flag.name'
flag_name = '${abbrev_indent}${prefix}${flag.name}'
}
mut required := ''
if flag.required {
@ -117,7 +117,7 @@ pub fn (cmd Command) help_message() string {
}
base_indent := ' '.repeat(cli.base_indent_len)
description_indent := ' '.repeat(name_len - flag_name.len)
help += '$base_indent$flag_name$description_indent' +
help += '${base_indent}${flag_name}${description_indent}' +
pretty_description(flag.description + required, cli.base_indent_len + name_len) +
'\n'
}
@ -127,7 +127,7 @@ pub fn (cmd Command) help_message() string {
for command in cmd.commands {
base_indent := ' '.repeat(cli.base_indent_len)
description_indent := ' '.repeat(name_len - command.name.len)
help += '$base_indent$command.name$description_indent' +
help += '${base_indent}${command.name}${description_indent}' +
pretty_description(command.description, name_len) + '\n'
}
}
@ -148,7 +148,7 @@ fn pretty_description(s string, indent_len int) string {
mut acc := strings.new_builder(((s.len / chars_per_line) + 1) * (width + 1))
for k, line in s.split('\n') {
if k != 0 {
acc.write_string('\n$indent')
acc.write_string('\n${indent}')
}
mut i := chars_per_line - 2
mut j := 0