dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-05 12:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: only show All and Skip options if group is not none

Browse source
This commit is contained in:
Paul Gauthier (aider) 2024-08-23 16:20:58 -07:00
parent 9ed83dd467
commit 3055f14d70
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
aider/io.py
View file

@ -380,7 +380,9 @@ class InputOutput:
self.num_user_asks += 1 self.num_user_asks += 1
if explicit_yes_required: if explicit_yes_required:
question += " (Y)es/(N)o/(S)kip all [Y]: " question += " (Y)es/(N)o [Y]: "
elif group is None:
question += " (Y)es/(N)o [Y]: "
else: else:
question += " (Y)es/(N)o/(A)ll/(S)kip all [Y]: " question += " (Y)es/(N)o/(A)ll/(S)kip all [Y]: "
@ -401,14 +403,15 @@ class InputOutput:
style = dict() style = dict()
def is_valid_response(text): def is_valid_response(text):
valid_responses = ( if explicit_yes_required or group is None:
["y", "n", "s", ""] if explicit_yes_required else ["y", "n", "a", "s", ""] valid_responses = ["y", "n", ""]
) else:
valid_responses = ["y", "n", "a", "s", ""]
return text.lower()[0] in valid_responses return text.lower()[0] in valid_responses
error_message = ( error_message = (
"Please answer Yes, No, or Skip all." "Please answer Yes or No."
if explicit_yes_required if explicit_yes_required or group is None
else "Please answer Yes, No, All, or Skip all." else "Please answer Yes, No, All, or Skip all."
) )
validator = Validator.from_callable( validator = Validator.from_callable(
@ -434,8 +437,8 @@ class InputOutput:
res = res.lower()[0] res = res.lower()[0]
is_yes = res in ("y", "a") is_yes = res in ("y", "a")
is_all = res == "a" and not explicit_yes_required is_all = res == "a" and group is not None and not explicit_yes_required
is_skip = res == "s" is_skip = res == "s" and group is not None and not explicit_yes_required
if group and not explicit_yes_required: if group and not explicit_yes_required:
if is_all: if is_all: