tweak formatting + move note

Author: Zac-HD

hypothesis-python/RELEASE.rst

@@ -1,4 +1,7 @@
 RELEASE_TYPE: patch
 
-This patch causes a [note to be included](https://peps.python.org/pep-0678/) when :func:`~hypothesis.strategies.sampled_from` is given a nonempty collection of all strategy values _and_ the `given`-decorated test fails with a `TypeError` (:issue:`3819``).
-This is because such a call is suggestive of intent to instead use :func:`~hypothesis.strategies.one_of`.
+If a test uses :func:`~hypothesis.strategies.sampled_from` on a sequence of
+strategies, and raises a ``TypeError``, we now :pep:`add a note <678>` asking
+whether you meant to use :func:`~hypothesis.strategies.one_of`.
+
+Thanks to Vince Reuter for suggesting and implementing this hint!

hypothesis-python/src/hypothesis/core.py

@@ -917,7 +917,18 @@ def run(data):
                     **dict(enumerate(map(to_jsonable, args))),
                     **{k: to_jsonable(v) for k, v in kwargs.items()},
                 }
-            return test(*args, **kwargs)
+
+            try:
+                return test(*args, **kwargs)
+            except TypeError as e:
+                # If we sampled from a sequence of strategies, AND failed with a
+                # TypeError, *AND that exception mentions SearchStrategy*, add a note:
+                if "SearchStrategy" in str(e):
+                    try:
+                        add_note(e, data._sampled_from_all_strategies_elements_message)  # type: ignore
+                    except AttributeError:
+                        pass
+                raise
 
         # self.test_runner can include the execute_example method, or setup/teardown
         # _example, so it's important to get the PRNG and build context in place first.
@@ -1024,13 +1035,6 @@ def _execute_once_for_engine(self, data: ConjectureData) -> None:
                 # The test failed by raising an exception, so we inform the
                 # engine that this test run was interesting. This is the normal
                 # path for test runs that fail.
-                if isinstance(e, TypeError) and "SearchStrategy" in str(e):
-                    try:
-                        suggestion = data._sampled_from_all_strategies_elements_message  # type: ignore[attr-defined]
-                    except AttributeError:
-                        pass
-                    else:
-                        add_note(e, suggestion)
                 tb = get_trimmed_traceback()
                 info = data.extra_information
                 info._expected_traceback = format_exception(e, tb)  # type: ignore
@@ -1161,12 +1165,6 @@ def run_engine(self):
                 err.__cause__ = err.__context__ = e
                 errors_to_report.append((fragments, err))
             except BaseException as e:
-                try:
-                    notes = info._expected_exception.__notes__
-                except AttributeError:
-                    pass
-                else:
-                    e.__notes__ = notes
                 # If we have anything for explain-mode, this is the time to report.
                 fragments.extend(explanations[falsifying_example.interesting_origin])
                 errors_to_report.append(
@@ -1240,7 +1238,6 @@ def _raise_to_user(errors_to_report, settings, target_lines, trailer=""):
     if settings.verbosity >= Verbosity.normal:
         for line in target_lines:
             add_note(the_error_hypothesis_found, line)
-
     raise the_error_hypothesis_found