Skip to content

Commit

Permalink
Add wrapping tree key
Browse files Browse the repository at this point in the history
  • Loading branch information
markruler committed Dec 27, 2020
1 parent 3430221 commit aadcbcb
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PWD := ${CURDIR}
PRODUCTION_REGISTRY = docker.io
TEST_IMAGE = busybox:latest

all: clean build
all: gofmt clean build

## For CI

Expand Down Expand Up @@ -119,13 +119,13 @@ run-podman-large: build
run-ci: build
CI=true $(BUILD_PATH) dive-example:latest --ci-config .data/.dive-ci

build:
build: gofmt
go build -o $(BUILD_PATH)

generate-test-data:
docker build -t dive-test:latest -f .data/Dockerfile.test-image . && docker image save -o .data/test-docker-image.tar dive-test:latest && echo 'Exported test data!'

test:
test: gofmt
./.scripts/test-coverage.sh

dev:
Expand All @@ -135,4 +135,5 @@ clean:
rm -rf dist
go clean


gofmt:
go fmt -x ./...
6 changes: 4 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ package cmd

import (
"fmt"
"github.com/wagoodman/dive/dive"
"github.com/wagoodman/dive/dive/filetree"
"io/ioutil"
"os"
"path"
"strings"

"github.com/wagoodman/dive/dive"
"github.com/wagoodman/dive/dive/filetree"

"github.com/mitchellh/go-homedir"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -90,6 +91,7 @@ func initConfig() {
viper.SetDefault("keybinding.toggle-removed-files", "ctrl+r")
viper.SetDefault("keybinding.toggle-modified-files", "ctrl+m")
viper.SetDefault("keybinding.toggle-unmodified-files", "ctrl+u")
viper.SetDefault("keybinding.toggle-wrap-tree", "ctrl+p")
viper.SetDefault("keybinding.page-up", "pgup")
viper.SetDefault("keybinding.page-down", "pgdn")

Expand Down
14 changes: 13 additions & 1 deletion runtime/ui/view/filetree.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package view

import (
"fmt"
"regexp"

"github.com/jroimartin/gocui"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"
Expand All @@ -10,7 +12,6 @@ import (
"github.com/wagoodman/dive/runtime/ui/key"
"github.com/wagoodman/dive/runtime/ui/viewmodel"
"github.com/wagoodman/dive/utils"
"regexp"
)

type ViewOptionChangeListener func() error
Expand Down Expand Up @@ -126,6 +127,12 @@ func (v *FileTree) Setup(view *gocui.View, header *gocui.View) error {
IsSelected: func() bool { return v.vm.ShowAttributes },
Display: "Attributes",
},
{
ConfigKeys: []string{"keybinding.toggle-wrap-tree"},
OnAction: v.toggleWrapTree,
IsSelected: func() bool { return v.view.Wrap },
Display: "Wrap",
},
{
ConfigKeys: []string{"keybinding.page-up"},
OnAction: v.PageUp,
Expand Down Expand Up @@ -280,6 +287,11 @@ func (v *FileTree) toggleCollapseAll() error {
return v.Render()
}

func (v *FileTree) toggleWrapTree() error {
v.view.Wrap = !v.view.Wrap
return nil
}

func (v *FileTree) notifyOnViewOptionChangeListeners() error {
for _, listener := range v.listeners {
err := listener()
Expand Down

0 comments on commit aadcbcb

Please # to comment.