mirror of
https://github.com/Llewellynvdm/fzf.git
synced 2025-01-30 02:28:29 +00:00
Compare commits
3 Commits
c2e1861747
...
fb3bf6c984
Author | SHA1 | Date | |
---|---|---|---|
|
fb3bf6c984 | ||
|
d57e1f8baa | ||
|
15ca9ad8eb |
2
.github/workflows/typos.yml
vendored
2
.github/workflows/typos.yml
vendored
@ -7,4 +7,4 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: crate-ci/typos@v1.28.2
|
- uses: crate-ci/typos@v1.28.4
|
||||||
|
3
Makefile
3
Makefile
@ -1,4 +1,3 @@
|
|||||||
SHELL := bash
|
|
||||||
GO ?= go
|
GO ?= go
|
||||||
GOOS ?= $(shell $(GO) env GOOS)
|
GOOS ?= $(shell $(GO) env GOOS)
|
||||||
|
|
||||||
@ -14,7 +13,7 @@ endif
|
|||||||
ifeq ($(VERSION),)
|
ifeq ($(VERSION),)
|
||||||
$(error Not on git repository; cannot determine $$FZF_VERSION)
|
$(error Not on git repository; cannot determine $$FZF_VERSION)
|
||||||
endif
|
endif
|
||||||
VERSION_TRIM := $(shell sed "s/^v//; s/-.*//" <<< $(VERSION))
|
VERSION_TRIM := $(shell echo $(VERSION) | sed "s/^v//; s/-.*//")
|
||||||
VERSION_REGEX := $(subst .,\.,$(VERSION_TRIM))
|
VERSION_REGEX := $(subst .,\.,$(VERSION_TRIM))
|
||||||
|
|
||||||
ifdef FZF_REVISION
|
ifdef FZF_REVISION
|
||||||
|
@ -3181,17 +3181,28 @@ func (t *Terminal) printAll() {
|
|||||||
func (t *Terminal) flush() {
|
func (t *Terminal) flush() {
|
||||||
t.placeCursor()
|
t.placeCursor()
|
||||||
if !t.suppress {
|
if !t.suppress {
|
||||||
windows := make([]tui.Window, 0, 4)
|
windows := make([]tui.Window, 0, 7)
|
||||||
if t.borderShape.Visible() {
|
if t.border != nil {
|
||||||
windows = append(windows, t.border)
|
windows = append(windows, t.border)
|
||||||
}
|
}
|
||||||
if t.hasPreviewWindow() {
|
if t.pborder != nil {
|
||||||
if t.pborder != nil {
|
windows = append(windows, t.pborder)
|
||||||
windows = append(windows, t.pborder)
|
}
|
||||||
}
|
if t.pwindow != nil {
|
||||||
windows = append(windows, t.pwindow)
|
windows = append(windows, t.pwindow)
|
||||||
}
|
}
|
||||||
windows = append(windows, t.window)
|
if t.wborder != nil {
|
||||||
|
windows = append(windows, t.wborder)
|
||||||
|
}
|
||||||
|
if t.window != nil {
|
||||||
|
windows = append(windows, t.window)
|
||||||
|
}
|
||||||
|
if t.inputBorder != nil {
|
||||||
|
windows = append(windows, t.inputBorder)
|
||||||
|
}
|
||||||
|
if t.inputWindow != nil {
|
||||||
|
windows = append(windows, t.inputWindow)
|
||||||
|
}
|
||||||
t.tui.RefreshWindows(windows)
|
t.tui.RefreshWindows(windows)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user