wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-11-26 10:33:53 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #516 from wader/go1.18-quote-0x7f-workaround

Browse Source 
interp,display: Add workaround for go 1.18 when escaping 0x7f
This commit is contained in:
Mattias Wadman 2022-12-10 11:50:52 +01:00 committed by GitHub
commit 9bad968911
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/interp/preview.go
View File

@ -1,9 +1,10 @@
package interp
import (
"fmt"
"bytes"
"math/big"
"strconv"
"strings"
"github.com/wader/fq/internal/mathex"
"github.com/wader/fq/internal/stringsex"
@ -30,7 +31,14 @@ func previewValue(v any, df scalar.DisplayFormat) string {
// TODO: float32? better truncated to significant digits?
return strconv.FormatFloat(vv, 'g', -1, 64)
case string:
return fmt.Sprintf("%q", stringsex.TrimN(vv, 50, "..."))
s := strconv.Quote(stringsex.TrimN(vv, 50, "..."))
// TODO: hack for https://github.com/golang/go/issues/52062
// 0x7f used to be escaped as \u007f in 1.18 and lower, was changed to \x7f
// remove once 1.18 is not supported
if !bytes.Contains([]byte(s), []byte{0x7f}) {
return s
}
return strings.ReplaceAll(s, `\u007f`, `\x7f`)
case nil:
return "null"
case bitio.Reader: