mirror of
https://github.com/Aider-AI/aider.git
synced 2025-06-01 18:25:00 +00:00
refactor: ensure _get_style always returns a dictionary and simplify calling code
This commit is contained in:
parent
1cd5b11b5c
commit
d2e0d3c06d
1 changed files with 10 additions and 19 deletions
29
aider/io.py
29
aider/io.py
|
@ -252,26 +252,19 @@ class InputOutput:
|
||||||
self.console = Console(force_terminal=False, no_color=True) # non-pretty
|
self.console = Console(force_terminal=False, no_color=True) # non-pretty
|
||||||
|
|
||||||
def _get_style(self, style_dict=None):
|
def _get_style(self, style_dict=None):
|
||||||
|
if style_dict is None:
|
||||||
|
style_dict = {}
|
||||||
if self.pretty and self.user_input_color:
|
if self.pretty and self.user_input_color:
|
||||||
if style_dict is None:
|
style_dict.setdefault("", self.user_input_color)
|
||||||
style_dict = {"": self.user_input_color}
|
style_dict.update({
|
||||||
else:
|
"completion-menu": f"bg:{self.completion_menu_bg_color} {self.completion_menu_color}",
|
||||||
style_dict.setdefault("", self.user_input_color)
|
"completion-menu.completion.current": (
|
||||||
# Add the completion menu styles
|
f"bg:{self.completion_menu_current_bg_color} {self.completion_menu_current_color}"
|
||||||
style_dict.update(
|
),
|
||||||
{
|
})
|
||||||
"completion-menu": (
|
|
||||||
f"bg:{self.completion_menu_bg_color} {self.completion_menu_color}"
|
|
||||||
),
|
|
||||||
"completion-menu.completion.current": (
|
|
||||||
f"bg:{self.completion_menu_current_bg_color} "
|
|
||||||
f"{self.completion_menu_current_color}"
|
|
||||||
),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
return Style.from_dict(style_dict)
|
return Style.from_dict(style_dict)
|
||||||
else:
|
else:
|
||||||
return None
|
return {}
|
||||||
|
|
||||||
def read_image(self, filename):
|
def read_image(self, filename):
|
||||||
try:
|
try:
|
||||||
|
@ -494,8 +487,6 @@ class InputOutput:
|
||||||
self.tool_output(subject, bold=True)
|
self.tool_output(subject, bold=True)
|
||||||
|
|
||||||
style = self._get_style()
|
style = self._get_style()
|
||||||
if style is None:
|
|
||||||
style = {}
|
|
||||||
|
|
||||||
def is_valid_response(text):
|
def is_valid_response(text):
|
||||||
if not text:
|
if not text:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue