Skip to content

feat: Double Ctrl+C to close pgxcli #95

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

Draft
LeeFred3042U wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −5
Draft

feat: Double Ctrl+C to close pgxcli #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions internal/app/ui/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ type Model struct {
version string
highlighter func(string) string
escSeq int
ctrlcSeq int

keys KeyMap
styles Styles
Expand Down Expand Up @@ -176,13 +177,13 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
return m.handleInput()

case seqTimeoutMsg:
if msg.seq == m.escSeq {
if msg.seq == m.escSeq || msg.seq == m.ctrlcSeq {
m.state = StateInput
}
return m, nil

case tea.KeyMsg:
if m.state == StatePending && !key.Matches(msg, m.keys.Clear) {
if m.state == StatePending && !key.Matches(msg, m.keys.Clear) && !key.Matches(msg, m.keys.Interrupt) {
m.state = StateInput
}

Expand All @@ -202,9 +203,18 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
return nil
}
}

m.input.Reset()
return m, nil
if m.state == StatePending {
m.state = StateInput
return m, func() tea.Msg {
return QuitRequestMsg{}
}
}
m.state = StatePending
m.ctrlcSeq++
n := m.ctrlcSeq
return m, tea.Tick(500*time.Millisecond, func(t time.Time) tea.Msg {
return seqTimeoutMsg{seq: n}
})
}
if key.Matches(msg, m.keys.Clear) {
if m.state == StateExecuting {
Expand Down
Loading