From bfbf6e3e96a2ebb95038a58a34b2714fb9da16a9 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <paul@geomagical.com>
Date: Tue, 11 Apr 2023 12:42:55 -0700
Subject: [PATCH] fixed regex

---
 coder.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/coder.py b/coder.py
index f9d7ff3e0..5b32937ea 100755
--- a/coder.py
+++ b/coder.py
@@ -140,6 +140,8 @@ class Coder:
                 ]
                 content = self.send(messages)
 
+            dump(repr(content))
+
             cur_messages += [
                 dict(role = 'assistant', content = content),
             ]
@@ -172,16 +174,16 @@ class Coder:
 
 
 
-    def show_messages(self, messages, title= None):
-        if title:
-            print(title.upper(), '*' * 50)
+    def show_messages(self, messages, title):
+        print(title.upper(), '*' * 50)
 
         for msg in messages:
             print()
             print('-' * 50)
             role = msg['role'].upper()
-            content = msg['content']
-            print(f'{role}: {content.strip()}')
+            content = msg['content'].splitlines()
+            for line in content:
+                print(role, line)
 
     def send(self, messages, show_progress = 0):
         #self.show_messages(messages, "all")
@@ -294,7 +296,7 @@ class Coder:
         return ''.join(resp)
 
 
-    pattern = re.compile(r'^(\S+)\s+<<<<<<< ORIGINAL\n(.*?)\n=======\n(.*?)\n>>>>>>> UPDATED$', re.MULTILINE | re.DOTALL)
+    pattern = re.compile(r'(\S+)\s+<<<<<<< ORIGINAL\n(.*?)\n=======\n(.*\n?)>>>>>>> UPDATED$', re.MULTILINE | re.DOTALL)
 
     def update_files(self, content, inp):
 
@@ -375,5 +377,7 @@ for fname in sys.argv[1:]:
     coder.add_file(fname)
 
 #coder.update_files(Path('tmp.commands').read_text()) ; sys.exit()
+content = 'new.py\n<<<<<<< ORIGINAL\n# Removed the nth_prime endpoint\n=======\n>>>>>>> UPDATED'
+coder.update_files(content, 'remove the prime comment'); sys.exit()
 
 coder.run()