mirror of
https://github.com/ollama/ollama.git
synced 2026-11-18 09:51:49 -06:00
Merge pull request #19731 from ollama/fix/repl-ctrl-c-multiline
cmd: leave multiline mode when Ctrl+C or Ctrl+G discards input
This commit is contained in:
+6
-2
@@ -149,6 +149,12 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
|
||||
scanner.Prompt.Placeholder = "Enter text to evaluate, then ask yes/no questions (/? for help)"
|
||||
}
|
||||
line, err := scanner.Readline()
|
||||
if err != nil {
|
||||
// Ctrl+C, Ctrl+G and other readline exits abandon any partial
|
||||
// input, including an open """ block.
|
||||
sb.Reset()
|
||||
multiline = MultilineNone
|
||||
}
|
||||
switch {
|
||||
case errors.Is(err, io.EOF):
|
||||
fmt.Println()
|
||||
@@ -159,11 +165,9 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
|
||||
}
|
||||
|
||||
scanner.Prompt.UseAlt = false
|
||||
sb.Reset()
|
||||
|
||||
continue
|
||||
case errors.Is(err, readline.ErrEditPrompt):
|
||||
sb.Reset()
|
||||
content, err := editInExternalEditor(line)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: %v\n", err)
|
||||
|
||||
Reference in New Issue
Block a user