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
13 changes: 13 additions & 0 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ tasks:
interactive: true
desc: Run in debug mode. Run `task logs` to watch the logs.

uninstall:
desc: Uninstall the locally installed application
cmds:
- if [[ -f $GOPATH/bin/diffnav ]]; then rm $GOPATH/bin/diffnav; fi

install:
desc: Install the application
vars:
Expand All @@ -27,6 +32,14 @@ tasks:
- ./**/*.go
- go.mod

install:prod:
desc: Install the latest available version
cmds:
- task: uninstall
- echo "🕐 Installing latest version..."
- brew install diffnav
- diffnav --version

diff:
cmds:
- task: install
Expand Down
6 changes: 3 additions & 3 deletions pkg/ui/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ var keys = &KeyMap{
key.WithKeys("t"),
key.WithHelp("t", "search files"),
),
SearchDiffExact: key.NewBinding(
SearchDiffInsensitive: key.NewBinding(
key.WithKeys("/"),
key.WithHelp("/", "search diff (exact)"),
),
SearchDiffInsensitive: key.NewBinding(
SearchDiffExact: key.NewBinding(
key.WithKeys("ctrl+s"),
key.WithHelp("ctrl+s", "search diff (case insensitive)"),
key.WithHelp("ctrl+s", "search diff (case sensitive)"),
),
SearchDiffRegex: key.NewBinding(
key.WithKeys("ctrl+r"),
Expand Down
10 changes: 5 additions & 5 deletions pkg/ui/panes/diffviewer/diffviewer.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ func New(sideBySide bool, styles *common.Styles) Model {
),
filterableviewport.WithFilterModes[diffLine](
[]filterableviewport.FilterMode{
filterableviewport.ExactFilterMode(
filterableviewport.CaseInsensitiveFilterMode(
key.NewBinding(
key.WithKeys("/"),
key.WithHelp("/", "exact fitler mode"),
key.WithHelp("/", "case insensitive"),
),
), filterableviewport.RegexFilterMode(
key.NewBinding(
Expand All @@ -180,9 +180,9 @@ func New(sideBySide bool, styles *common.Styles) Model {
key.WithHelp("ctrl+f", "fuzzy fitler mode"),
),
),
filterableviewport.CaseInsensitiveFilterMode(key.NewBinding(
filterableviewport.ExactFilterMode(key.NewBinding(
key.WithKeys("ctrl+s"),
key.WithHelp("ctrl+s", "case insensitive filter"),
key.WithHelp("ctrl+s", "exact"),
)),
},
),
Expand All @@ -191,7 +191,7 @@ func New(sideBySide bool, styles *common.Styles) Model {
filterableviewport.WithEmptyText[diffLine](
"Search… "+lipgloss.NewStyle().
Faint(true).
Render("(/ exact ⋅ ⌃+s insensitive ⋅ ⌃+r regex ⋅ ⌃+f fuzzy)"),
Render("(/ insensitive ⋅ ⌃+s exact ⋅ ⌃+r regex ⋅ ⌃+f fuzzy)"),
),
filterableviewport.WithFilterLinePosition[diffLine](filterableviewport.FilterLineTop),
filterableviewport.WithMatchingItemsOnly[diffLine](false),
Expand Down
12 changes: 5 additions & 7 deletions pkg/ui/tui.go
Original file line number Diff line number Diff line change
Expand Up @@ -372,16 +372,12 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
}
case key.Matches(msg, keys.PrevFile):
if m.diffViewer.Filtering() {
m.diffViewer, cmd = m.diffViewer.Update(msg)
} else {
if !m.diffViewer.Searching() && !m.diffViewer.Filtering() {
m, cmd = m.moveToFile(-1)
}
cmds = append(cmds, cmd)
case key.Matches(msg, keys.NextFile):
if m.diffViewer.Filtering() {
m.diffViewer, cmd = m.diffViewer.Update(msg)
} else {
if !m.diffViewer.Searching() && !m.diffViewer.Filtering() {
m, cmd = m.moveToFile(1)
}
cmds = append(cmds, cmd)
Expand Down Expand Up @@ -445,9 +441,11 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if m.activePanel == DiffViewerPanel {
m.diffViewer, cmd = m.diffViewer.Update(msg)
cmds = append(cmds, cmd)
return m, tea.Batch(cmds...)
} else {
m.fileTree.Update(msg)
cmds = append(cmds, cmd)
return m, tea.Batch(cmds...)
}
}

Expand Down Expand Up @@ -585,7 +583,7 @@ func (m mainModel) searchUpdate(msg tea.Msg) (mainModel, []tea.Cmd) {
var cmds []tea.Cmd
if m.filesSearch.Focused() {
switch msg := msg.(type) {
case tea.KeyMsg:
case tea.KeyPressMsg:
switch msg.String() {
case "esc":
m.stopSearch()
Expand Down
Loading