Skip to content

Fix relative paths for getGitFiles #2862

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

Closed
calirvine wants to merge 2 commits into from
Closed

Fix relative paths for getGitFiles #2862

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddd2595
Fix relative paths for getGitFiles
calirvine Sep 29, 2025
f4bb35a
Update packages/tui/internal/completions/files.go
calirvine Sep 29, 2025
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: 15 additions & 2 deletions packages/tui/internal/completions/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package completions
import (
"context"
"log/slog"
"os"
"path/filepath"
"sort"
"strconv"
"strings"
Expand Down Expand Up @@ -36,12 +38,23 @@ func (cg *filesContextGroup) getGitFiles() []CompletionSuggestion {
return files[i].Added+files[i].Removed > files[j].Added+files[j].Removed
})

cwd, err := os.Getwd()
for _, file := range files {
// Convert path from relative to git repo root to relative to current working directory
relativePath := file.Path
if err == nil {
if absPath := filepath.Join(cg.app.Project.Worktree, file.Path); absPath != "" {
if relPath, err := filepath.Rel(cwd, absPath); err == nil {
relativePath = relPath
}
}
}

displayFunc := func(s styles.Style) string {
t := theme.CurrentTheme()
green := s.Foreground(t.Success()).Render
red := s.Foreground(t.Error()).Render
display := file.Path
display := relativePath
if file.Added > 0 {
display += green(" +" + strconv.Itoa(int(file.Added)))
}
Expand All @@ -52,7 +65,7 @@ func (cg *filesContextGroup) getGitFiles() []CompletionSuggestion {
}
item := CompletionSuggestion{
Display: displayFunc,
Value: file.Path,
Value: relativePath,
ProviderID: cg.GetId(),
RawData: file,
}
Expand Down