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

vlib/cli/command.v

@@ -39,29 +39,29 @@ pub mut:
 pub fn (cmd Command) str() string {
 	mut res := []string{}
 	res << 'Command{'
-	res << '	name: "$cmd.name"'
-	res << '	usage: "$cmd.usage"'
-	res << '	version: "$cmd.version"'
-	res << '	description: "$cmd.description"'
-	res << '	man_description: "$cmd.man_description"'
-	res << '	disable_help: $cmd.disable_help'
-	res << '	disable_man: $cmd.disable_man'
-	res << '	disable_flags: $cmd.disable_flags'
-	res << '	disable_version: $cmd.disable_version'
-	res << '	sort_flags: $cmd.sort_flags'
-	res << '	sort_commands: $cmd.sort_commands'
-	res << '	cb execute: $cmd.execute'
-	res << '	cb pre_execute: $cmd.pre_execute'
-	res << '	cb post_execute: $cmd.post_execute'
+	res << '	name: "${cmd.name}"'
+	res << '	usage: "${cmd.usage}"'
+	res << '	version: "${cmd.version}"'
+	res << '	description: "${cmd.description}"'
+	res << '	man_description: "${cmd.man_description}"'
+	res << '	disable_help: ${cmd.disable_help}'
+	res << '	disable_man: ${cmd.disable_man}'
+	res << '	disable_flags: ${cmd.disable_flags}'
+	res << '	disable_version: ${cmd.disable_version}'
+	res << '	sort_flags: ${cmd.sort_flags}'
+	res << '	sort_commands: ${cmd.sort_commands}'
+	res << '	cb execute: ${cmd.execute}'
+	res << '	cb pre_execute: ${cmd.pre_execute}'
+	res << '	cb post_execute: ${cmd.post_execute}'
 	if unsafe { cmd.parent == 0 } {
 		res << '	parent: &Command(0)'
 	} else {
-		res << '	parent: &Command{$cmd.parent.name ...}'
+		res << '	parent: &Command{${cmd.parent.name} ...}'
 	}
-	res << '	commands: $cmd.commands'
-	res << '	flags: $cmd.flags'
-	res << '	required_args: $cmd.required_args'
-	res << '	args: $cmd.args'
+	res << '	commands: ${cmd.commands}'
+	res << '	flags: ${cmd.flags}'
+	res << '	required_args: ${cmd.required_args}'
+	res << '	args: ${cmd.args}'
 	res << '}'
 	return res.join('\n')
 }
@@ -84,7 +84,7 @@ pub fn (cmd Command) full_name() string {
 	if cmd.is_root() {
 		return cmd.name
 	}
-	return cmd.parent.full_name() + ' $cmd.name'
+	return cmd.parent.full_name() + ' ${cmd.name}'
 }
 
 // add_commands adds the `commands` array of `Command`s as sub-commands.
@@ -98,7 +98,7 @@ pub fn (mut cmd Command) add_commands(commands []Command) {
 pub fn (mut cmd Command) add_command(command Command) {
 	mut subcmd := command
 	if cmd.commands.contains(subcmd.name) {
-		eprintln_exit('Command with the name `$subcmd.name` already exists')
+		eprintln_exit('Command with the name `${subcmd.name}` already exists')
 	}
 	subcmd.parent = unsafe { cmd }
 	cmd.commands << subcmd
@@ -124,7 +124,7 @@ pub fn (mut cmd Command) add_flags(flags []Flag) {
 // add_flag adds `flag` to this `Command`.
 pub fn (mut cmd Command) add_flag(flag Flag) {
 	if cmd.flags.contains(flag.name) {
-		eprintln_exit('Flag with the name `$flag.name` already exists')
+		eprintln_exit('Flag with the name `${flag.name}` already exists')
 	}
 	cmd.flags << flag
 }
@@ -191,14 +191,14 @@ fn (mut cmd Command) parse_flags() {
 					found = true
 					flag.found = true
 					cmd.args = flag.parse(cmd.args, cmd.posix_mode) or {
-						eprintln_exit('Failed to parse flag `${cmd.args[0]}`: $err')
+						eprintln_exit('Failed to parse flag `${cmd.args[0]}`: ${err}')
 					}
 					break
 				}
 			}
 		}
 		if !found {
-			eprintln_exit('Command `$cmd.name` has no flag `${cmd.args[0]}`')
+			eprintln_exit('Command `${cmd.name}` has no flag `${cmd.args[0]}`')
 		}
 	}
 }
@@ -230,7 +230,7 @@ fn (mut cmd Command) parse_commands() {
 	// if no further command was found, execute current command
 	if cmd.required_args > 0 {
 		if cmd.required_args > cmd.args.len {
-			eprintln_exit('Command `$cmd.name` needs at least $cmd.required_args arguments')
+			eprintln_exit('Command `${cmd.name}` needs at least ${cmd.required_args} arguments')
 		}
 	}
 	cmd.check_required_flags()
@@ -243,8 +243,8 @@ fn (mut cmd Command) parse_commands() {
 fn (mut cmd Command) handle_cb(cb FnCommandCallback, label string) {
 	if !isnil(cb) {
 		cb(*cmd) or {
-			label_message := term.ecolorize(term.bright_red, 'cli $label error:')
-			eprintln_exit('$label_message $err')
+			label_message := term.ecolorize(term.bright_red, 'cli ${label} error:')
+			eprintln_exit('${label_message} ${err}')
 		}
 	}
 }
@@ -284,7 +284,7 @@ fn (cmd Command) check_required_flags() {
 	for flag in cmd.flags {
 		if flag.required && flag.value.len == 0 {
 			full_name := cmd.full_name()
-			eprintln_exit('Flag `$flag.name` is required by `$full_name`')
+			eprintln_exit('Flag `${flag.name}` is required by `${full_name}`')
 		}
 	}
 }
@@ -317,7 +317,7 @@ fn (cmds []Command) get(name string) !Command {
 			return cmd
 		}
 	}
-	return error('Command `$name` not found in $cmds')
+	return error('Command `${name}` not found in ${cmds}')
 }
 
 fn (cmds []Command) contains(name string) bool {

vlib/cli/flag.v

@@ -44,7 +44,7 @@ pub fn (flags []Flag) get_all_found() []Flag {
 // get_bool returns an error if the `FlagType` is not boolean.
 pub fn (flag Flag) get_bool() !bool {
 	if flag.flag != .bool {
-		return error('$flag.name: Invalid flag type `$flag.flag`, expected `bool`')
+		return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `bool`')
 	}
 
 	val := flag.get_value_or_default_value()
@@ -63,7 +63,7 @@ pub fn (flags []Flag) get_bool(name string) !bool {
 // get_int returns an error if the `FlagType` is not integer.
 pub fn (flag Flag) get_int() !int {
 	if flag.flag != .int {
-		return error('$flag.name: Invalid flag type `$flag.flag`, expected `int`')
+		return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `int`')
 	}
 
 	val := flag.get_value_or_default_value()
@@ -79,7 +79,7 @@ pub fn (flag Flag) get_int() !int {
 // get_ints returns an error if the `FlagType` is not integer.
 pub fn (flag Flag) get_ints() ![]int {
 	if flag.flag != .int_array {
-		return error('$flag.name: Invalid flag type `$flag.flag`, expected `int_array`')
+		return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `int_array`')
 	}
 
 	val := flag.get_value_or_default_value()
@@ -115,7 +115,7 @@ pub fn (flags []Flag) get_ints(name string) ![]int {
 // get_float returns an error if the `FlagType` is not floating point.
 pub fn (flag Flag) get_float() !f64 {
 	if flag.flag != .float {
-		return error('$flag.name: Invalid flag type `$flag.flag`, expected `float`')
+		return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `float`')
 	}
 
 	val := flag.get_value_or_default_value()
@@ -131,7 +131,7 @@ pub fn (flag Flag) get_float() !f64 {
 // get_floats returns an error if the `FlagType` is not floating point.
 pub fn (flag Flag) get_floats() ![]f64 {
 	if flag.flag != .float_array {
-		return error('$flag.name: Invalid flag type `$flag.flag`, expected `float_array`')
+		return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `float_array`')
 	}
 
 	val := flag.get_value_or_default_value()
@@ -167,7 +167,7 @@ pub fn (flags []Flag) get_floats(name string) ![]f64 {
 // get_string returns an error if the `FlagType` is not string.
 pub fn (flag Flag) get_string() !string {
 	if flag.flag != .string {
-		return error('$flag.name: Invalid flag type `$flag.flag`, expected `string`')
+		return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `string`')
 	}
 
 	val := flag.get_value_or_default_value()
@@ -183,7 +183,7 @@ pub fn (flag Flag) get_string() !string {
 // get_strings returns an error if the `FlagType` is not string.
 pub fn (flag Flag) get_strings() ![]string {
 	if flag.flag != .string_array {
-		return error('$flag.name: Invalid flag type `$flag.flag`, expected `string_array`')
+		return error('${flag.name}: Invalid flag type `${flag.flag}`, expected `string_array`')
 	}
 
 	val := flag.get_value_or_default_value()
@@ -219,7 +219,7 @@ fn (mut flag Flag) parse(args []string, posix_mode bool) ![]string {
 		} else {
 			if flag.value.len > 0 && flag.flag != .int_array && flag.flag != .float_array
 				&& flag.flag != .string_array {
-				return error('The argument `$flag.name` accept only one value!')
+				return error('The argument `${flag.name}` accept only one value!')
 			}
 
 			new_args := flag.parse_raw(args)!
@@ -233,10 +233,10 @@ fn (mut flag Flag) parse(args []string, posix_mode bool) ![]string {
 // matches returns `true` if first arg in `args` matches this flag.
 fn (mut flag Flag) matches(args []string, posix_mode bool) bool {
 	prefix := if posix_mode { '--' } else { '-' }
-	return (flag.name != '' && args[0] == '$prefix$flag.name')
-		|| (flag.name != '' && args[0].starts_with('$prefix$flag.name='))
-		|| (flag.abbrev != '' && args[0] == '-$flag.abbrev')
-		|| (flag.abbrev != '' && args[0].starts_with('-$flag.abbrev='))
+	return (flag.name != '' && args[0] == '${prefix}${flag.name}')
+		|| (flag.name != '' && args[0].starts_with('${prefix}${flag.name}='))
+		|| (flag.abbrev != '' && args[0] == '-${flag.abbrev}')
+		|| (flag.abbrev != '' && args[0].starts_with('-${flag.abbrev}='))
 }
 
 fn (mut flag Flag) parse_raw(args []string) ![]string {
@@ -247,7 +247,7 @@ fn (mut flag Flag) parse_raw(args []string) ![]string {
 		flag.value << args[1]
 		return args[2..]
 	}
-	return error('Missing argument for `$flag.name`')
+	return error('Missing argument for `${flag.name}`')
 }
 
 fn (mut flag Flag) parse_bool(args []string) ![]string {
@@ -273,7 +273,7 @@ fn (flags []Flag) get(name string) !Flag {
 			return flag
 		}
 	}
-	return error('Flag `$name` not found in $flags')
+	return error('Flag `${name}` not found in ${flags}')
 }
 
 fn (flags []Flag) contains(name string) bool {

vlib/cli/help.v

@@ -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

vlib/cli/man.v

@@ -35,7 +35,7 @@ pub fn print_manpage_for_command(man_cmd Command) ! {
 			}
 			if !found {
 				args := man_cmd.args.join(' ')
-				println('Invalid command: $args')
+				println('Invalid command: ${args}')
 				return
 			}
 		}
@@ -52,9 +52,9 @@ pub fn print_manpage_for_command(man_cmd Command) ! {
 pub fn (cmd Command) manpage() string {
 	mut mdoc := '.Dd ${time.now().strftime('%B %d, %Y')}\n'
 	mdoc += '.Dt ${cmd.full_name().replace(' ', '-').to_upper()} 1\n'
-	mdoc += '.Os\n.Sh NAME\n.Nm ${cmd.full_name().replace(' ', '-')}\n.Nd $cmd.description\n'
+	mdoc += '.Os\n.Sh NAME\n.Nm ${cmd.full_name().replace(' ', '-')}\n.Nd ${cmd.description}\n'
 	mdoc += '.Sh SYNOPSIS\n'
-	mdoc += '.Nm $cmd.root().name\n'
+	mdoc += '.Nm ${cmd.root().name}\n'
 	if unsafe { cmd.parent != 0 } {
 		mut parents := []Command{}
 		if !cmd.parent.is_root() {
@@ -68,20 +68,20 @@ pub fn (cmd Command) manpage() string {
 				}
 			}
 			for c in parents {
-				mdoc += '.Ar $c.name\n'
+				mdoc += '.Ar ${c.name}\n'
 			}
 		}
-		mdoc += '.Ar $cmd.name\n'
+		mdoc += '.Ar ${cmd.name}\n'
 	}
 	for flag in cmd.flags {
 		mdoc += '.Op'
 		if flag.abbrev != '' {
-			mdoc += ' Fl $flag.abbrev'
+			mdoc += ' Fl ${flag.abbrev}'
 		} else {
 			if cmd.posix_mode {
-				mdoc += ' Fl -$flag.name'
+				mdoc += ' Fl -${flag.name}'
 			} else {
-				mdoc += ' Fl $flag.name'
+				mdoc += ' Fl ${flag.name}'
 			}
 		}
 		match flag.flag {
@@ -92,10 +92,10 @@ pub fn (cmd Command) manpage() string {
 		mdoc += '\n'
 	}
 	for i in 0 .. cmd.required_args {
-		mdoc += '.Ar arg$i\n'
+		mdoc += '.Ar arg${i}\n'
 	}
 	if cmd.commands.len > 0 {
-		mdoc += '.Nm $cmd.root().name\n'
+		mdoc += '.Nm ${cmd.root().name}\n'
 		if unsafe { cmd.parent != 0 } {
 			mut parents := []Command{}
 			if !cmd.parent.is_root() {
@@ -109,19 +109,19 @@ pub fn (cmd Command) manpage() string {
 					}
 				}
 				for c in parents {
-					mdoc += '.Ar $c.name\n'
+					mdoc += '.Ar ${c.name}\n'
 				}
 			}
-			mdoc += '.Ar $cmd.name\n'
+			mdoc += '.Ar ${cmd.name}\n'
 		}
 		mdoc += '.Ar subcommand\n'
 	}
 
 	mdoc += '.Sh DESCRIPTION\n'
 	if cmd.man_description != '' {
-		mdoc += '$cmd.man_description\n'
+		mdoc += '${cmd.man_description}\n'
 	} else if cmd.description != '' {
-		mdoc += '$cmd.description\n'
+		mdoc += '${cmd.description}\n'
 	}
 	if cmd.flags.len > 0 {
 		mdoc += '.Pp\nThe options are as follows:\n'
@@ -129,16 +129,16 @@ pub fn (cmd Command) manpage() string {
 		for flag in cmd.flags {
 			mdoc += '.It'
 			if flag.abbrev != '' {
-				mdoc += ' Fl $flag.abbrev'
+				mdoc += ' Fl ${flag.abbrev}'
 			}
 			if cmd.posix_mode {
-				mdoc += ' Fl -$flag.name'
+				mdoc += ' Fl -${flag.name}'
 			} else {
-				mdoc += ' Fl $flag.name'
+				mdoc += ' Fl ${flag.name}'
 			}
 			mdoc += '\n'
 			if flag.description != '' {
-				mdoc += '$flag.description\n'
+				mdoc += '${flag.description}\n'
 			}
 		}
 		mdoc += '.El\n'
@@ -147,9 +147,9 @@ pub fn (cmd Command) manpage() string {
 		mdoc += '.Pp\nThe subcommands are as follows:\n'
 		mdoc += '.Bl -tag -width indent\n'
 		for c in cmd.commands {
-			mdoc += '.It Cm $c.name\n'
+			mdoc += '.It Cm ${c.name}\n'
 			if c.description != '' {
-				mdoc += '$c.description\n'
+				mdoc += '${c.description}\n'
 			}
 		}
 		mdoc += '.El\n'
@@ -167,7 +167,7 @@ pub fn (cmd Command) manpage() string {
 		cmds.sort()
 		mut i := 1
 		for c in cmds {
-			mdoc += '.Xr $c 1'
+			mdoc += '.Xr ${c} 1'
 			if i == cmds.len {
 				mdoc += '\n'
 			} else {

vlib/cli/version.v

@@ -20,6 +20,6 @@ fn version_cmd() Command {
 
 fn version_func(version_cmd Command) ! {
 	cmd := version_cmd.parent
-	version := '$cmd.name version $cmd.version'
+	version := '${cmd.name} version ${cmd.version}'
 	println(version)
 }