Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions internal/jsonview/staticdisplay.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,27 @@ func formatJSON(json gjson.Result, width int) string {
return formatResult(json, 0, width)
}

func truncateStringToWidth(str string, width int) string {
if width <= 0 {
return ""
}
if lipgloss.Width(str) <= width {
return str
}
if width == 1 {
return "…"
}
return truncate.String(str, uint(width-1)) + "…"
}

func formatResult(result gjson.Result, indent, width int) string {
switch result.Type {
case gjson.String:
str := SanitizeTerminalString(result.Str)
if str == "" {
return nullValueStyle.Render("(empty)")
}
if lipgloss.Width(str) > width {
str = truncate.String(str, uint(width-1)) + "…"
}
str = truncateStringToWidth(str, width)
return stringValueStyle.Render(str)
case gjson.Number:
return numberValueStyle.Render(result.Raw)
Expand Down
23 changes: 23 additions & 0 deletions internal/jsonview/staticdisplay_width_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package jsonview

import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/tidwall/gjson"
)

func TestFormatResultHandlesNonPositiveStringWidth(t *testing.T) {
t.Parallel()

result := gjson.Parse(`"abcdef"`)
formatted := formatResult(result, 0, 0)

assert.NotContains(t, formatted, "abcdef")
}

func TestTruncateStringToWidthOneUsesEllipsis(t *testing.T) {
t.Parallel()

assert.Equal(t, "…", truncateStringToWidth("abcdef", 1))
}