New semantic analyzer: fix bogus messages and update tests (#7124)

Various recursive type definitions no longer cause crashes.

Fix bogus messages about cyclic definitions when definition is
acyclic when there are also recursive type definitions in the same
target.

Closes #6445.

Author: JukkaL

mypy/newsemanal/semanal.py

@@ -2398,13 +2398,14 @@ def check_and_set_up_type_alias(self, s: AssignmentStmt) -> bool:
                 # Otherwise just replace existing placeholder with type alias.
                 existing.node = alias_node
                 updated = True
-            if self.final_iteration:
-                self.cannot_resolve_name(lvalue.name, 'name', s)
-                return True
-            elif updated:
-                self.progress = True
-                # We need to defer so that this change can get propagated to base classes.
-                self.defer()
+            if updated:
+                if self.final_iteration:
+                    self.cannot_resolve_name(lvalue.name, 'name', s)
+                    return True
+                else:
+                    self.progress = True
+                    # We need to defer so that this change can get propagated to base classes.
+                    self.defer()
         else:
             self.add_symbol(lvalue.name, alias_node, s)
         if isinstance(rvalue, RefExpr) and isinstance(rvalue.node, TypeAlias):

test-data/unit/check-classes.test

@@ -4355,7 +4355,6 @@ class A(Tuple[int, str]): pass
 -- -----------------------
 
 [case testCrashOnSelfRecursiveNamedTupleVar]
-# FIXME: #6445
 # flags: --new-semantic-analyzer
 from typing import NamedTuple
 
@@ -4364,15 +4363,13 @@ n: N
 reveal_type(n) # N: Revealed type is 'Tuple[Any, fallback=__main__.N]'
 
 [case testCrashOnSelfRecursiveTypedDictVar]
-# FIXME: #6445
 from mypy_extensions import TypedDict
 
 A = TypedDict('A', {'a': 'A'})  # type: ignore
 a: A
 [builtins fixtures/isinstancelist.pyi]
 
 [case testCrashInJoinOfSelfRecursiveNamedTuples]
-# FIXME: #6445
 # flags: --new-semantic-analyzer
 from typing import NamedTuple
 
@@ -4387,7 +4384,6 @@ lst = [n, m]
 [builtins fixtures/isinstancelist.pyi]
 
 [case testCorrectJoinOfSelfRecursiveTypedDicts]
-# FIXME: #6445
 # flags: --new-semantic-analyzer
 from mypy_extensions import TypedDict
 

test-data/unit/check-flags.test

@@ -1053,32 +1053,29 @@ always_false = BLAH, BLAH1
 [builtins fixtures/bool.pyi]
 
 [case testCheckDisallowAnyGenericsNamedTuple]
-# Crashes on new semantic analyzer: https://github.com/python/mypy/issues/6445
-# flags: --disallow-any-generics --no-new-semantic-analyzer
+# flags: --disallow-any-generics --new-semantic-analyzer
 from typing import NamedTuple
 
 N = NamedTuple('N', [('x', N)])  # type: ignore
 n: N
 [out]
 
 [case testCheckDisallowAnyGenericsTypedDict]
-# Crashes on new semantic analyzer: https://github.com/python/mypy/issues/6445
-# flags: --disallow-any-generics --no-new-semantic-analyzer
+# flags: --disallow-any-generics --new-semantic-analyzer
 from typing import Dict, Any, Optional
 from mypy_extensions import TypedDict
 
 VarsDict = Dict[str, Any]
 HostsDict = Dict[str, Optional[VarsDict]]
 
-GroupDataDict = TypedDict(  # type: ignore
-    "GroupDataDict", {"children": "GroupsDict",
+GroupDataDict = TypedDict(
+    "GroupDataDict", {"children": "GroupsDict",  # type: ignore
                       "vars": VarsDict,
                       "hosts": HostsDict}, total=False
 )
 
 GroupsDict = Dict[str, GroupDataDict]  # type: ignore
 [builtins fixtures/dict.pyi]
-[out]
 
 [case testCheckDefaultAllowAnyGeneric]
 from typing import TypeVar, Callable

test-data/unit/check-unions.test

@@ -957,13 +957,10 @@ def takes_int(arg: int) -> None: pass
 takes_int(x)  # E: Argument 1 to "takes_int" has incompatible type <union: 6 items>; expected "int"
 
 [case testRecursiveForwardReferenceInUnion]
-# https://github.com/python/mypy/issues/6445
 # flags: --new-semantic-analyzer
 from typing import List, Union
-MYTYPE = List[Union[str, "MYTYPE"]]
+MYTYPE = List[Union[str, "MYTYPE"]] # E: Cannot resolve name "MYTYPE" (possible cyclic definition)
 [builtins fixtures/list.pyi]
-[out]
-main:4: error: Cannot resolve name "MYTYPE" (possible cyclic definition)
 
 [case testNonStrictOptional]
 from typing import Optional, List