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

Terminate running background transform on exit (addendum)

Browse Source 
Close #4422
This commit is contained in:
Junegunn Choi
2025-06-22 01:52:29 +09:00
parent 247d168af6
commit 3a21116307
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/terminal.go
View File

@@ -236,6 +236,11 @@ type versionedCallback struct {
callback func() callback func()
} }
type runningCmd struct {
cmd *exec.Cmd
tempFiles []string
}
// Terminal represents terminal input/output // Terminal represents terminal input/output
type Terminal struct { type Terminal struct {
initDelay time.Duration initDelay time.Duration
@@ -378,7 +383,7 @@ type Terminal struct {
version int64 version int64
revision revision revision revision
bgVersion int64 bgVersion int64
runningCmds *util.ConcurrentSet[*exec.Cmd] runningCmds *util.ConcurrentSet[*runningCmd]
reqBox *util.EventBox reqBox *util.EventBox
initialPreviewOpts previewOpts initialPreviewOpts previewOpts
previewOpts previewOpts previewOpts previewOpts
@@ -1032,7 +1037,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
proxyScript: opts.ProxyScript, proxyScript: opts.ProxyScript,
merger: EmptyMerger(revision{}), merger: EmptyMerger(revision{}),
selected: make(map[int32]selectedItem), selected: make(map[int32]selectedItem),
runningCmds: util.NewConcurrentSet[*exec.Cmd](), runningCmds: util.NewConcurrentSet[*runningCmd](),
reqBox: util.NewEventBox(), reqBox: util.NewEventBox(),
initialPreviewOpts: opts.Preview, initialPreviewOpts: opts.Preview,
previewOpts: opts.Preview, previewOpts: opts.Preview,
@@ -4372,7 +4377,7 @@ func (t *Terminal) captureAsync(a action, firstLineOnly bool, callback func(stri
_, list := t.buildPlusList(a.a, false) _, list := t.buildPlusList(a.a, false)
command, tempFiles := t.replacePlaceholder(a.a, false, string(t.input), list) command, tempFiles := t.replacePlaceholder(a.a, false, string(t.input), list)
version := t.bgVersion version := t.bgVersion
cmd := t.executor.ExecCommand(command, false) cmd := t.executor.ExecCommand(command, true)
cmd.Env = t.environ() cmd.Env = t.environ()
item := func(proceed bool) { item := func(proceed bool) {
if proceed { if proceed {
@@ -4380,7 +4385,8 @@ func (t *Terminal) captureAsync(a action, firstLineOnly bool, callback func(stri
reader := bufio.NewReader(out) reader := bufio.NewReader(out)
var output string var output string
if err := cmd.Start(); err == nil { if err := cmd.Start(); err == nil {
t.runningCmds.Add(cmd) runningCmd := runningCmd{cmd, tempFiles}
t.runningCmds.Add(&runningCmd)
if firstLineOnly { if firstLineOnly {
output, _ = reader.ReadString('\n') output, _ = reader.ReadString('\n')
output = strings.TrimRight(output, "\r\n") output = strings.TrimRight(output, "\r\n")
@@ -4389,7 +4395,7 @@ func (t *Terminal) captureAsync(a action, firstLineOnly bool, callback func(stri
output = string(bytes) output = string(bytes)
} }
cmd.Wait() cmd.Wait()
t.runningCmds.Remove(cmd) t.runningCmds.Remove(&runningCmd)
} }
t.callbackChan <- versionedCallback{version, func() { callback(output) }} t.callbackChan <- versionedCallback{version, func() { callback(output) }}
} }
@@ -5058,8 +5064,9 @@ func (t *Terminal) Loop() error {
if code <= ExitNoMatch && t.history != nil { if code <= ExitNoMatch && t.history != nil {
t.history.append(string(t.input)) t.history.append(string(t.input))
} }
t.runningCmds.ForEach(func(cmd *exec.Cmd) { t.runningCmds.ForEach(func(cmd *runningCmd) {
util.KillCommand(cmd) util.KillCommand(cmd.cmd)
removeFiles(cmd.tempFiles)
}) })
running = false running = false
t.mutex.Unlock() t.mutex.Unlock()
@@ -5721,6 +5728,9 @@ func (t *Terminal) Loop() error {
}) })
case actBgCancel: case actBgCancel:
t.bgVersion++ t.bgVersion++
t.runningCmds.ForEach(func(cmd *runningCmd) {
util.KillCommand(cmd.cmd)
})
case actChangePrompt: case actChangePrompt:
t.promptString = a.a t.promptString = a.a
t.prompt, t.promptLen = t.parsePrompt(a.a) t.prompt, t.promptLen = t.parsePrompt(a.a)