Format multiple prefixes. (#158)

Cal-CS-61A-Staff · Apr 29, 2019 · cd0787f · cd0787f
1 parent 57ee9ef
commit cd0787f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/editor/format_parser.py b/editor/format_parser.py
@@ -19,12 +19,12 @@ def __init__(self, lst):
             self.lst = lst
 
         def __enter__(self):
-            self.prefix = self.lst.prefix
-            self.lst.prefix = ""
+            self.prefix = self.lst.prefix[0]
+            self.lst.prefix = self.lst.prefix[1:]
             return self.prefix
 
         def __exit__(self, *_):
-            self.lst.prefix = self.prefix
+            self.lst.prefix = self.prefix + self.lst.prefix
 
     def hold_prefix(self):
         return self.PrefixManager(self)
@@ -59,15 +59,15 @@ def get_expression(buffer: TokenBuffer) -> Formatted:
             out = get_rest_of_list(buffer, ")" if token == "(" else "]")
         elif token in ("'", "`"):
             out = get_expression(buffer)
-            out.prefix = token.value
+            out.prefix = token.value + out.prefix
         elif token == ",":
             if buffer.get_next_token() == "@":
                 buffer.pop_next_token()
                 out = get_expression(buffer)
-                out.prefix = ",@"
+                out.prefix = ",@" + out.prefix
             else:
                 out = get_expression(buffer)
-                out.prefix = token.value
+                out.prefix = token.value + out.prefix
         elif token == "\"":
             out = FormatAtom('"' + buffer.pop_next_token().value + '"')
             buffer.pop_next_token()