From 8d9d4c98439bdfbfccaba28357944b6d866867bf Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Mon, 19 Feb 2024 14:46:33 -0700 Subject: textui: Fix Metric() and IEC(), add tests, accept math/big values --- lib/fmtutil/fmt.go | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'lib/fmtutil') diff --git a/lib/fmtutil/fmt.go b/lib/fmtutil/fmt.go index bad4a30..3d5fcb5 100644 --- a/lib/fmtutil/fmt.go +++ b/lib/fmtutil/fmt.go @@ -1,4 +1,4 @@ -// Copyright (C) 2022-2023 Luke Shumaker +// Copyright (C) 2022-2024 Luke Shumaker // // SPDX-License-Identifier: GPL-2.0-or-later @@ -35,6 +35,28 @@ func FmtStateString(st fmt.State, verb rune) string { return ret.String() } +// FmtStateStringWidth is like [FmtStateString], but overrides +// st.Width(). +func FmtStateStringWidth(st fmt.State, verb rune, width int) string { + var ret strings.Builder + ret.WriteByte('%') + for _, flag := range []int{'-', '+', '#', ' ', '0'} { + if st.Flag(flag) { + ret.WriteByte(byte(flag)) + } + } + fmt.Fprintf(&ret, "%v", width) + if prec, ok := st.Precision(); ok { + if prec == 0 { + ret.WriteByte('.') + } else { + fmt.Fprintf(&ret, ".%v", prec) + } + } + ret.WriteRune(verb) + return ret.String() +} + // FormatByteArrayStringer is function for helping to implement // fmt.Formatter for []byte or [n]byte types that have a custom string // representation. Use it like: -- cgit v1.2.3-2-g168b