Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-18 11:05:16 +00:00
Code Issues Projects Releases Wiki Activity

Revert 1ab4289: Preview window of size 0 is allowed

Browse Source
This commit is contained in:
Junegunn Choi 2020-08-23 17:12:37 +09:00
parent 9dc4b40d7a
commit 43798fc2e8
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/options.go
View File

@ -995,7 +995,7 @@ func parsePreviewWindow(opts *previewOpts, input string) {
opts.wrap = false
tokens := strings.Split(input, ":")
sizeRegex := regexp.MustCompile("^[1-9][0-9]*%?$")
sizeRegex := regexp.MustCompile("^[0-9]+%?$")
offsetRegex := regexp.MustCompile("^\\+([0-9]+|{-?[0-9]+})(-[0-9]+|-/[1-9][0-9]*)?$")
for _, token := range tokens {
switch token {

5
src/terminal.go
View File

@ -1697,10 +1697,11 @@ func (t *Terminal) Loop() {
// We don't display preview window if no match
if items[0] != nil {
command := t.replacePlaceholder(commandTemplate, false, string(t.Input()), items)
height := t.pwindow.Height()
offset := t.evaluateScrollOffset(items, height)
offset := 0
cmd := util.ExecCommand(command, true)
if t.pwindow != nil {
height := t.pwindow.Height()
offset = t.evaluateScrollOffset(items, height)
env := os.Environ()
lines := fmt.Sprintf("LINES=%d", height)
columns := fmt.Sprintf("COLUMNS=%d", t.pwindow.Width())