REF: Remove "ForwardRef" in evaluated annotations

When the stringified object is not available for literal
replacement, `ForwardRef('...')` is used, but by that time
we already need the whole annotation, so just unwrap it.

Longer-term should maybe switch away from
using `inspect.formatannotation()`.

Author: kernc

pdoc/__init__.py

@@ -1261,7 +1261,12 @@ def return_annotation(self, *, link=None) -> str:
         if annot is inspect.Parameter.empty or not annot:
             return ''
 
-        s = annot if isinstance(annot, str) else inspect.formatannotation(annot)
+        if isinstance(annot, str):
+            s = annot
+        else:
+            s = inspect.formatannotation(annot)
+            s = re.sub(r'\b(typing\.)?ForwardRef\((?P<quot>[\"\'])(?P<str>.*?)(?P=quot)\)',
+                       r'\g<str>', s)
         s = s.replace(' ', '\N{NBSP}')  # Better line breaks in html signatures
 
         if link:

pdoc/test/__init__.py

@@ -414,14 +414,19 @@ def test_skip_errors(self):
     @unittest.skipIf(sys.version_info < (3, 6), 'variable annotation unsupported in <Py3.6')
     def test_resolve_typing_forwardrefs(self):
         # GH-245
-        with chdir(os.path.join(TESTS_BASEDIR, EXAMPLE_MODULE, '_resolve_typing_forwardrefs')),\
-                redirect_streams() as (out, err):
-            run('foo')
-        out = out.getvalue()
-        self.assertIn('bar', out)
-        self.assertIn('baz', out)
-        self.assertIn('dt', out)
-        self.assertIn('datetime', out)
+        with chdir(os.path.join(TESTS_BASEDIR, EXAMPLE_MODULE, '_resolve_typing_forwardrefs')):
+            with redirect_streams() as (out, _err):
+                run('postponed')
+            out = out.getvalue()
+            self.assertIn('bar', out)
+            self.assertIn('baz', out)
+            self.assertIn('dt', out)
+            self.assertIn('datetime', out)
+
+            with redirect_streams() as (out, _err):
+                run('evaluated')
+            out = out.getvalue()
+            self.assertIn('Set[Bar]', out)
 
 
 class ApiTest(unittest.TestCase):

pdoc/test/example_pkg/_resolve_typing_forwardrefs/evaluated.py

@@ -0,0 +1,5 @@
+from typing import Set
+
+
+class Foo:
+    bar: Set["Bar"]  # noqa: F821