Open source AI coding agent. Designed for large projects and real world tasks.
Go aiai-agentsai-developer-toolsai-toolsclicommand-linedeveloper-toolsgitgolanggpt-4llmopenaipolyglot-programmingterminalterminal-basedterminal-ui
file path nav, scroll replacements to center, bit of refactoring, basis for full file view
Dane Schneidere9e5451ef5c4
diff --git a/cli/changes_tui/actions.go b/cli/changes_tui/actions.goindex 3a286d82..3cd74941 100644--- a/cli/changes_tui/actions.go+++ b/cli/changes_tui/actions.go@@ -2,8 +2,10 @@ package changes_tuiimport ("fmt"+ "strings""github.com/atotto/clipboard"+ "github.com/charmbracelet/bubbles/viewport""github.com/muesli/reflow/wrap""github.com/plandex/plandex/shared")@@ -37,33 +39,46 @@ func (m changesUIModel) copyCurrentChange() error {return nil}-func (m *changesUIModel) up() {+func (m *changesUIModel) left() {+ if m.selectedFileIndex > 0 {+ m.selectedFileIndex--+ m.selectedReplacementIndex = 0+ }+ m.setSelectionInfo()+ m.updateMainView(true)+}++func (m *changesUIModel) right() {paths := m.currentPlan.SortedPaths++ if m.selectedFileIndex < len(paths)-1 {+ m.selectedFileIndex+++ m.selectedReplacementIndex = 0+ }++ m.setSelectionInfo()+ m.updateMainView(true)+}++func (m *changesUIModel) up() {if m.selectedReplacementIndex > 0 {m.selectedReplacementIndex--- } else if m.selectedFileIndex > 0 {- m.selectedFileIndex--- m.selectedReplacementIndex = len(m.resultsInfo.ReplacementsByPath[paths[m.selectedFileIndex]]) - 1}m.setSelectionInfo()- m.updateMainView()+ m.updateMainView(true)}func (m *changesUIModel) down() {- paths := m.currentPlan.SortedPathsvar currentReplacements []*shared.Replacementif m.selectionInfo != nil {currentReplacements = m.selectionInfo.currentReplacements}- if m.selectedReplacementIndex < len(currentReplacements)-1 {+ if m.selectedReplacementIndex < len(currentReplacements) {m.selectedReplacementIndex++- } else if m.selectedFileIndex < len(paths)-1 {- m.selectedFileIndex++- m.selectedReplacementIndex = 0}m.setSelectionInfo()- m.updateMainView()+ m.updateMainView(true)}func (m *changesUIModel) scrollUp() {@@ -84,42 +99,87 @@ func (m *changesUIModel) scrollDown() {} else if m.newScrollable() {m.changeNewViewport.LineDown(1)}+}func (m *changesUIModel) pageUp() {-+ if m.selectionInfo.currentRep == nil && m.fileScrollable() {+ m.fileViewport.ViewUp()+ } else if m.selectedViewport == 0 && m.oldScrollable() {+ m.changeOldViewport.ViewUp()+ } else if m.newScrollable() {+ m.changeNewViewport.ViewUp()+ }}func (m *changesUIModel) pageDown() {-+ if m.selectionInfo.currentRep == nil && m.fileScrollable() {+ m.fileViewport.ViewDown()+ } else if m.selectedViewport == 0 && m.oldScrollable() {+ m.changeOldViewport.ViewDown()+ } else if m.newScrollable() {+ m.changeNewViewport.ViewDown()+ }}func (m *changesUIModel) switchView() {m.selectedViewport = 1 - m.selectedViewport- m.updateMainView()+ m.updateMainView(false)}func (m *changesUIModel) windowResized(w, h int) {m.width = wm.height = h+ didInit := falseif !m.ready {m.initViewports()m.ready = true+ didInit = true}- m.updateMainView()+ m.updateMainView(didInit)}-func (m *changesUIModel) updateMainView() {+func (m *changesUIModel) updateMainView(scrollReplacement bool) {updatedFile := m.selectionInfo.currentPlanBeforeReplacement.CurrentPlanFiles.Files[m.selectionInfo.currentPath]- oldContentDisplay, prependContent, appendContent := m.getReplacementOldDisplay()+ oldRes := m.getReplacementOldDisplay()- m.changeOldViewport.SetContent(oldContentDisplay)+ m.changeOldViewport.SetContent(oldRes.oldDisplay)- newContentDisplay := m.getReplacementNewDisplay(prependContent, appendContent)+ newContent, newContentDisplay := m.getReplacementNewDisplay(oldRes.prependContent, oldRes.appendContent)m.changeNewViewport.SetContent(newContentDisplay)m.fileViewport.SetContent(wrap.String(updatedFile, m.fileViewport.Width-2))m.updateViewportSizes()++ if scrollReplacement {+ m.scrollReplacementIntoView(oldRes.old, newContent, oldRes.numLinesPrepended)+ }+}++func (m *changesUIModel) scrollReplacementIntoView(oldContent, newContent string, numLinesPrepended int) {+ if numLinesPrepended <= 3 {+ return+ }++ scrollView := func(content string, view *viewport.Model) {+ visibleLines := view.VisibleLineCount()+ contentLines := len(strings.Split(content, "\n"))++ if contentLines >= (visibleLines - 3) {+ view.LineDown(numLinesPrepended - 3)+ } else {+ diffAround := visibleLines - contentLines+ toScroll := numLinesPrepended - diffAround/2+ view.LineDown(toScroll)+ }+ }++ if m.oldScrollable() {+ scrollView(oldContent, &m.changeOldViewport)+ }+ if m.newScrollable() {+ scrollView(newContent, &m.changeNewViewport)+ }}diff --git a/cli/changes_tui/main_viewport.go b/cli/changes_tui/main_viewport.goindex 7dd70008..a5944bee 100644--- a/cli/changes_tui/main_viewport.go+++ b/cli/changes_tui/main_viewport.go@@ -69,9 +69,6 @@ func (m changesUIModel) renderScrollFooter() string {return ""}- oldScrollable := m.changeOldViewport.TotalLineCount() > m.changeOldViewport.VisibleLineCount()- newScrollable := m.changeNewViewport.TotalLineCount() > m.changeNewViewport.VisibleLineCount()-width, _ := m.getMainViewDims()if m.selectionInfo.currentRes != nil {@@ -80,7 +77,7 @@ func (m changesUIModel) renderScrollFooter() string {footer := ` (j/k) scroll`- if oldScrollable && newScrollable {+ if m.oldScrollable() && m.newScrollable() {footer += ` β’ (tab) switch view`}diff --git a/cli/changes_tui/model.go b/cli/changes_tui/model.goindex 531520c1..2eb89d27 100644--- a/cli/changes_tui/model.go+++ b/cli/changes_tui/model.go@@ -18,7 +18,6 @@ type changesUIModel struct {selectedFileIndex intselectedReplacementIndex intselectedViewport int- resultsInfo *types.PlanResultsInfocurrentPlan *types.CurrentPlanStatechangeOldViewport viewport.ModelchangeNewViewport viewport.Model@@ -84,6 +83,16 @@ func initialModel() *changesUIModel {bubbleKey.WithHelp("k", "scroll up"),),+ pageDown: bubbleKey.NewBinding(+ bubbleKey.WithKeys("enter", "pageDown"),+ bubbleKey.WithHelp("enter", "page down"),+ ),++ pageUp: bubbleKey.NewBinding(+ bubbleKey.WithKeys("shift+enter", "pageUp"),+ bubbleKey.WithHelp("shift+enter", "page up"),+ ),+switchView: bubbleKey.NewBinding(bubbleKey.WithKeys("tab"),bubbleKey.WithHelp("tab", "switch view"),diff --git a/cli/changes_tui/replacement.go b/cli/changes_tui/replacement.goindex c0077570..90d0403e 100644--- a/cli/changes_tui/replacement.go+++ b/cli/changes_tui/replacement.go@@ -7,10 +7,19 @@ import ("github.com/muesli/reflow/wrap")-const prependLines = 10-const appendLines = 10+const replacementPrependLines = 20+const replacementAppendLines = 20++type oldReplacementRes struct {+ old string+ oldDisplay string+ prependContent string+ numLinesPrepended int+ appendContent string+ numLinesAppended int+}-func (m changesUIModel) getReplacementOldDisplay() (string, string, string) {+func (m changesUIModel) getReplacementOldDisplay() oldReplacementRes {oldContent := m.selectionInfo.currentRep.OldoriginalFile := m.selectionInfo.currentPlanBeforeReplacement.CurrentPlanFiles.Files[m.selectionInfo.currentPath]@@ -29,7 +38,7 @@ func (m changesUIModel) getReplacementOldDisplay() (string, string, string) {toPrepend = s + toPrependif originalFile[i] == '\n' {numLinesPrepended++- if numLinesPrepended == prependLines {+ if numLinesPrepended == replacementPrependLines {break}}@@ -47,7 +56,7 @@ func (m changesUIModel) getReplacementOldDisplay() (string, string, string) {toAppend += sif originalFile[i] == '\n' {numLinesAppended++- if numLinesAppended == appendLines {+ if numLinesAppended == replacementAppendLines {break}}@@ -78,15 +87,19 @@ func (m changesUIModel) getReplacementOldDisplay() (string, string, string) {}toAppend = strings.Join(toAppendLines, "\n")- oldDisplayContent :=- toPrepend +- oldContent +- toAppend+ oldDisplayContent := toPrepend + oldContent + toAppend- return oldDisplayContent, toPrepend, toAppend+ return oldReplacementRes{+ oldContent,+ oldDisplayContent,+ toPrepend,+ numLinesPrepended,+ toAppend,+ numLinesAppended,+ }}-func (m changesUIModel) getReplacementNewDisplay(prependContent, appendContent string) string {+func (m changesUIModel) getReplacementNewDisplay(prependContent, appendContent string) (string, string) {newContent := m.selectionInfo.currentRep.NewnewContent = wrap.String(newContent, m.changeNewViewport.Width-6)@@ -96,5 +109,5 @@ func (m changesUIModel) getReplacementNewDisplay(prependContent, appendContent s}newContent = strings.Join(newContentLines, "\n")- return prependContent + newContent + appendContent+ return newContent, prependContent + newContent + appendContent}diff --git a/cli/changes_tui/sidebar.go b/cli/changes_tui/sidebar.goindex 34d44ff9..423cc3b7 100644--- a/cli/changes_tui/sidebar.go+++ b/cli/changes_tui/sidebar.go@@ -14,27 +14,19 @@ func (m changesUIModel) renderSidebar() string {return ""}- currentPath := m.selectionInfo.currentPath- currentRes := m.selectionInfo.currentRescurrentRep := m.selectionInfo.currentRepvar sb strings.Builderfor _, path := range paths {results := m.currentPlan.PlanResByPath[path]- selectedPath := path == currentPath-- selectedFullFile := selectedPath && currentRes == nil-anyFailed := false// Change entriesfor i, result := range results {for j, rep := range result.Replacements {flatIndex := i*len(result.Replacements) + j-- selected := selectedPath && rep.Id == currentRep.Id-+ selected := currentRep != nil && rep.Id == currentRep.Ids := ""labelColor := color.FgHiGreen@@ -65,7 +57,7 @@ func (m changesUIModel) renderSidebar() string {labelColor = color.FgHiRed}- if selectedFullFile {+ if m.selectedFullFile() {sb.WriteString(color.New(color.Bold, labelColor).Sprint(" > π \n "))} else {sb.WriteString(color.New(labelColor).Sprint(" - π \n"))diff --git a/cli/changes_tui/update.go b/cli/changes_tui/update.goindex 7ecbe0d2..06c15e82 100644--- a/cli/changes_tui/update.go+++ b/cli/changes_tui/update.go@@ -23,6 +23,12 @@ func (m changesUIModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {switch {+ case bubbleKey.Matches(msg, m.keymap.left):+ m.left()++ case bubbleKey.Matches(msg, m.keymap.right):+ m.right()+case bubbleKey.Matches(msg, m.keymap.up):m.up()@@ -35,6 +41,12 @@ func (m changesUIModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {case bubbleKey.Matches(msg, m.keymap.scrollUp):m.scrollUp()+ case bubbleKey.Matches(msg, m.keymap.pageDown):+ m.pageDown()++ case bubbleKey.Matches(msg, m.keymap.pageUp):+ m.pageUp()+case bubbleKey.Matches(msg, m.keymap.switchView):m.switchView()diff --git a/cli/changes_tui/view.go b/cli/changes_tui/view.goindex 2a783ebe..54d008f1 100644--- a/cli/changes_tui/view.go+++ b/cli/changes_tui/view.go@@ -55,21 +55,21 @@ func (m *changesUIModel) updateViewportSizes() {oldViewHeight := mainViewHeight- if m.selectedViewport == 0 && m.changeOldViewport.TotalLineCount() > m.changeOldViewport.VisibleLineCount() {+ if m.oldScrollable() && (m.selectedViewport == 0 || !m.newScrollable()) {footerHeight := lipgloss.Height(m.renderScrollFooter())oldViewHeight -= footerHeight}newViewHeight := mainViewHeight- if m.selectedViewport == 1 && m.changeNewViewport.TotalLineCount() > m.changeNewViewport.VisibleLineCount() {+ if m.newScrollable() && (m.selectedViewport == 1 || !m.oldScrollable()) {footerHeight := lipgloss.Height(m.renderScrollFooter())newViewHeight -= footerHeight}fileViewHeight := mainViewHeight- if m.fileViewport.TotalLineCount() > m.fileViewport.VisibleLineCount() {+ if m.fileScrollable() {footerHeight := lipgloss.Height(m.renderScrollFooter())fileViewHeight -= footerHeight}@@ -99,3 +99,7 @@ func (m changesUIModel) newScrollable() bool {func (m changesUIModel) fileScrollable() bool {return m.fileViewport.TotalLineCount() > m.fileViewport.VisibleLineCount()}++func (m changesUIModel) selectedFullFile() bool {+ return m.selectionInfo != nil && m.selectionInfo.currentRep == nil+}