Include conversion in FComponent.__repr__

NEWS.rst

@@ -42,7 +42,7 @@ Bug Fixes
 ------------------------------
 * REPL now properly displays SyntaxErrors.
 * Fixed a bug in `pprint` in which `width` was ignored.
-* Corrected `hy-repr` for f-strings.
+* Corrected `repr` and `hy-repr` for f-strings.
 
 .. _Toolz: https://toolz.readthedocs.io
 .. _CyToolz: https://github.com/pytoolz/cytoolz

hy/models.py

@@ -342,6 +342,11 @@ def replace(self, other, recursive=True):
             self.conversion = other.conversion
         return self
 
+    def __repr__(self):
+        return 'hy.models.FComponent({})'.format(
+            super(Object, self).__repr__() +
+            ', conversion=' + repr(self.conversion))
+
 class FString(Sequence):
     """
     Generic Hy F-String object, for smarter f-string handling.

tests/native_tests/language.hy

@@ -1319,6 +1319,19 @@ cee\"} dee" "ey bee\ncee dee"))
     f"{pi =:{fill =}^{width =}.2f}"))
 
 
+(defn test-format-string-repr-roundtrip []
+  (for [orig [
+       'f"hello {(+ 1 1)} world"
+       'f"a{p !r:9}"
+       'f"{ foo = !s}"]]
+    (setv new (eval (repr orig)))
+    (assert (= (len new) (len orig)))
+    (for [[n o] (zip new orig)]
+      (when (hasattr o "conversion")
+        (assert (= n.conversion o.conversion)))
+      (assert (= n o)))))
+
+
 (defn test-import-syntax []
   "NATIVE: test the import syntax."