Skip to content

Keybinding adjustments and debugging default improvements #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Keybinding adjustments and debugging default improvements #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
001c76e
mod(debug): only provide debugging files when using environment for d…
yves-biener Oct 3, 2024
1d02599
mod(keys): keybinding changes
yves-biener Oct 3, 2024
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
14 changes: 3 additions & 11 deletions diffviewer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,9 @@ func (m diffModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
cmds := make([]tea.Cmd, 0)
switch msg := msg.(type) {
case tea.KeyMsg:
switch msg.String() {
case "down", "j":
break
case "up", "k":
break
default:
vp, vpCmd := m.vp.Update(msg)
cmds = append(cmds, vpCmd)
m.vp = vp
}

vp, vpCmd := m.vp.Update(msg)
cmds = append(cmds, vpCmd)
m.vp = vp
case diffContentMsg:
m.vp.SetContent(msg.text)
case dimensionsMsg:
Expand Down
20 changes: 10 additions & 10 deletions keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@ type KeyMap struct {

var keys = &KeyMap{
Up: key.NewBinding(
key.WithKeys("up", "k"),
key.WithHelp("↑/k", "prev file"),
key.WithKeys("up", "K"),
key.WithHelp("↑/K", "prev file"),
),
Down: key.NewBinding(
key.WithKeys("down", "j"),
key.WithHelp("↓/j", "next file"),
key.WithKeys("down", "J"),
key.WithHelp("↓/J", "next file"),
),
CtrlD: key.NewBinding(
key.WithKeys("ctrl+d"),
key.WithHelp("ctrl+d", "diff down"),
key.WithHelp("j/ctrl+d", "diff down"),
),
CtrlU: key.NewBinding(
key.WithKeys("ctrl+u"),
key.WithHelp("ctrl+u", "diff up"),
key.WithHelp("k/ctrl+u", "diff up"),
),
ToggleFileTree: key.NewBinding(
key.WithKeys("e"),
key.WithHelp("e", "toggle file tree"),
key.WithKeys("t"),
key.WithHelp("t", "toggle file tree"),
),
Search: key.NewBinding(
key.WithKeys("t"),
key.WithHelp("t", "search files"),
key.WithKeys("/"),
key.WithHelp("/", "search files"),
),
Quit: key.NewBinding(
key.WithKeys("q", "ctrl+c"),
Expand Down
59 changes: 23 additions & 36 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func newModel(input string) mainModel {
m.search.KeyMap.AcceptSuggestion = key.NewBinding(key.WithKeys("tab"))
m.search.Prompt = " "
m.search.PromptStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("8"))
m.search.Placeholder = "Filter files 🅃"
m.search.Placeholder = "Filter files"
m.search.PlaceholderStyle = lipgloss.NewStyle().MaxWidth(lipgloss.Width(m.search.Placeholder)).Foreground(lipgloss.Color("8"))
m.search.Width = constants.OpenFileTreeWidth - 5

Expand Down Expand Up @@ -139,24 +139,10 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

switch msg := msg.(type) {
case tea.KeyMsg:
if m.searching {
switch msg.String() {
case "ctrl+n":
if m.searching {
m.resultsCursor = min(len(m.files)-1, m.resultsCursor+1)
m.resultsVp.LineDown(1)
}
case "ctrl+p":
if m.searching {
m.resultsCursor = max(0, m.resultsCursor-1)
m.resultsVp.LineUp(1)
}
}
}
switch msg.String() {
case "ctrl+c", "q":
return m, tea.Quit
case "t":
case "/":
m.searching = true
m.search.Width = m.sidebarWidth() - 5
m.search.SetValue("")
Expand All @@ -170,18 +156,18 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.diffViewer = df
cmds = append(cmds, m.search.Focus())
return m, tea.Batch(cmds...)
case "e":
case "t":
m.isShowingFileTree = !m.isShowingFileTree
df, dfCmd := m.setDiffViewerDimensions()
m.diffViewer = df
return m, dfCmd
case "up", "k", "ctrl+p":
case "up", "K", "ctrl+p":
if m.cursor > 0 {
m.cursor--
m.diffViewer, cmd = m.diffViewer.(diffModel).SetFilePatch(m.files[m.cursor])
cmds = append(cmds, cmd)
}
case "down", "j", "ctrl+n":
case "down", "J", "ctrl+n":
if m.cursor < len(m.files)-1 {
m.cursor++
m.diffViewer, cmd = m.diffViewer.(diffModel).SetFilePatch(m.files[m.cursor])
Expand Down Expand Up @@ -343,20 +329,26 @@ func main() {
}

if stat.Mode()&os.ModeNamedPipe == 0 && stat.Size() == 0 {
fmt.Println("Try piping in some text.")
os.Exit(1)
fmt.Println("No diff")
os.Exit(0)
}

var fileErr error
logFile, fileErr := os.OpenFile("debug.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if fileErr == nil {
log.SetOutput(logFile)
log.SetTimeFormat(time.Kitchen)
log.SetReportCaller(true)
log.SetLevel(log.DebugLevel)
defer logFile.Close()
log.SetOutput(logFile)
log.Debug("Starting diffnav, logging to debug.log")
if os.Getenv("DEBUG") == "true" {
var fileErr error
logFile, fileErr := os.OpenFile("debug.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
defer logFile.Close()

logger, _ := tea.LogToFile("debug.log", "debug")
defer logger.Close()

if fileErr == nil {
log.SetOutput(logFile)
log.SetTimeFormat(time.Kitchen)
log.SetReportCaller(true)
log.SetLevel(log.DebugLevel)
log.SetOutput(logFile)
log.Debug("Starting diffnav, logging to debug.log")
}
}

reader := bufio.NewReader(os.Stdin)
Expand All @@ -374,11 +366,6 @@ func main() {
}
}

if os.Getenv("DEBUG") == "true" {
logger, _ := tea.LogToFile("debug.log", "debug")
defer logger.Close()
}

input := ansi.Strip(b.String())
if strings.TrimSpace(input) == "" {
fmt.Println("No input provided, exiting")
Expand Down