m/fzf
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.git synced 2025-11-14 22:33:47 -05:00
Code Packages Releases Wiki Activity

Fix ghost text with inline info

Browse Source 
Fix #4312
This commit is contained in:
Junegunn Choi
2025-03-15 18:42:08 +09:00
parent 4298c0b1eb
commit 87f7f436e8
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/terminal.go
View File

@@ -2485,6 +2485,10 @@ func (t *Terminal) printInfoImpl() {
outputPrinter, outputLen = t.ansiLabelPrinter(output, &tui.ColInfo, false) outputPrinter, outputLen = t.ansiLabelPrinter(output, &tui.ColInfo, false)
} }
shiftLen := t.queryLen[0] + t.queryLen[1] + 1
if shiftLen == 1 && len(t.ghost) > 0 {
shiftLen = util.StringWidth(t.ghost)
}
switch t.infoStyle { switch t.infoStyle {
case infoDefault: case infoDefault:
if !move(line+1, 0, t.separatorLen == 0) { if !move(line+1, 0, t.separatorLen == 0) {
@@ -2498,9 +2502,9 @@ func (t *Terminal) printInfoImpl() {
return return
} }
case infoInlineRight: case infoInlineRight:
pos = t.promptLen + t.queryLen[0] + t.queryLen[1] + 1 pos = t.promptLen + shiftLen
case infoInline: case infoInline:
pos = t.promptLen + t.queryLen[0] + t.queryLen[1] + 1 pos = t.promptLen + shiftLen
printInfoPrefix() printInfoPrefix()
} }

15
test/test_core.rb
View File

@@ -1831,4 +1831,19 @@ class TestCore < TestInteractive
assert_includes lines, 'X Type in query ...' assert_includes lines, 'X Type in query ...'
end end
end end
def test_ghost_inline
tmux.send_keys %(seq 100 | #{FZF} --info 'inline: Y' --no-separator --prompt 'X ' --ghost 'Type in query ...'), :Enter
tmux.until do |lines|
assert_includes lines, 'X Type in query ... Y100/100'
end
tmux.send_keys '100'
tmux.until do |lines|
assert_includes lines, 'X 100 Y1/100'
end
tmux.send_keys 'C-u'
tmux.until do |lines|
assert_includes lines, 'X Type in query ... Y100/100'
end
end
end end