From d47a8401794af0a9c481bbd550c45c825182f1bb Mon Sep 17 00:00:00 2001 From: mrT23 Date: Mon, 19 Feb 2024 19:43:31 +0200 Subject: [PATCH] bitbucket code suggestions --- pr_agent/algo/utils.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pr_agent/algo/utils.py b/pr_agent/algo/utils.py index 34d791c4..4a64c4c5 100644 --- a/pr_agent/algo/utils.py +++ b/pr_agent/algo/utils.py @@ -75,9 +75,9 @@ def convert_to_markdown(output_data: dict, gfm_supported: bool=True) -> str: if gfm_supported: markdown_text += f"\n\n" markdown_text += f"
Code feedback:\n\n" + markdown_text += "
" else: markdown_text += f"\n\n** Code feedback:**\n\n" - markdown_text += "
" for i, value in enumerate(output_data['code_feedback']): if value is None or value == '' or value == {} or value == []: continue @@ -131,6 +131,8 @@ def parse_code_suggestion(code_suggestion: dict, i: int = 0, gfm_supported: bool markdown_text += "
" else: for sub_key, sub_value in code_suggestion.items(): + sub_key = sub_key.rstrip() + sub_value = sub_value.rstrip() if isinstance(sub_value, dict): # "code example" markdown_text += f" - **{sub_key}:**\n" for code_key, code_value in sub_value.items(): # 'before' and 'after' code @@ -142,10 +144,9 @@ def parse_code_suggestion(code_suggestion: dict, i: int = 0, gfm_supported: bool markdown_text += f"\n - **{sub_key}:** {sub_value} \n" else: markdown_text += f" **{sub_key}:** {sub_value} \n" - if not gfm_supported: - if "relevant_line" not in sub_key.lower(): # nicer presentation - # markdown_text = markdown_text.rstrip('\n') + "\\\n" # works for gitlab - markdown_text = markdown_text.rstrip('\n') + " \n" # works for gitlab and bitbucker + if "relevant_line" not in sub_key.lower(): # nicer presentation + # markdown_text = markdown_text.rstrip('\n') + "\\\n" # works for gitlab + markdown_text = markdown_text.rstrip('\n') + " \n" # works for gitlab and bitbucker markdown_text += "\n" return markdown_text