From 01aafe1265ed37c174355e81d22eae2dd132c92e Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Thu, 18 May 2023 10:06:38 -0700 Subject: [PATCH] aider: Fixed indentation of `cmd_run` function in `aider/commands.py`. # Context: USER: remove all the line numbers fro the start of the lines, restoring proper indentation. only edit the lines that have line numbers. ASSISTANT: ```python aider/commands.py <<<<<<< ORIGINAL 228 def cmd_run(self, args): 229 "Run the supplied command in a subprocess and combine stdout and stderr into a single string" 230 try: 231 parsed_args = shlex.split(args) 232 result = subprocess.run(parsed_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True) 233 combined_output = result.stdout 233 print(combined_output) 234 except Exception as e: 235 self.io.tool_error(f"Error running command: {e}") ======= def cmd_run(self, args): "Run the supplied command in a subprocess and combine stdout and stderr into a single string" try: parsed_args = shlex.split(args) result = subprocess.run(parsed_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True) combined_output = result.stdout print(combined_output) except Exception as e: self.io.tool_error(f"Error running command: {e}") >>>>>>> UPDATED ``` --- aider/commands.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/aider/commands.py b/aider/commands.py index e6e97cba8..38ae4d0fd 100644 --- a/aider/commands.py +++ b/aider/commands.py @@ -226,15 +226,15 @@ class Commands: self.coder.abs_fnames.remove(matched_file) self.io.tool(f"Removed {relative_fname} from the chat") -228 def cmd_run(self, args): -229 "Run the supplied command in a subprocess and combine stdout and stderr into a single string" -230 try: -231 parsed_args = shlex.split(args) -232 result = subprocess.run(parsed_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True) -233 combined_output = result.stdout -233 print(combined_output) -234 except Exception as e: -235 self.io.tool_error(f"Error running command: {e}") + def cmd_run(self, args): + "Run the supplied command in a subprocess and combine stdout and stderr into a single string" + try: + parsed_args = shlex.split(args) + result = subprocess.run(parsed_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True) + combined_output = result.stdout + print(combined_output) + except Exception as e: + self.io.tool_error(f"Error running command: {e}") 236 237 def cmd_ls(self, args): 238 "List all known files and those included in the chat session"