New analyzer: test that class properties are calculated for classes in functions (#7147)

ilevkivskyi · web-flow · commit 6d70615be0ed · 2019-07-04T15:32:49.000+01:00
Fixes #6494 The issue seems to be already fixed because of how `local_definitions()` works, I just add a test case to avoid regressions.
diff --git a/mypy/newsemanal/semanal.py b/mypy/newsemanal/semanal.py
@@ -517,7 +517,7 @@ def visit_func_def(self, defn: FuncDef) -> None:
         self.statement = defn
         defn.is_conditional = self.block_depth[-1] > 0
 
-        # Set full names even for those definitionss that aren't added
+        # Set full names even for those definitions that aren't added
         # to a symbol table. For example, for overload items.
         defn._fullname = self.qualified_name(defn.name())
 
diff --git a/mypy/newsemanal/semanal_main.py b/mypy/newsemanal/semanal_main.py
@@ -367,7 +367,6 @@ def calculate_class_properties(graph: 'Graph', scc: List[str], errors: Errors) -
     for module in scc:
         tree = graph[module].tree
         assert tree
-        # TODO: calculate properties also for classes nested in functions.
         for _, node, _ in tree.local_definitions():
             if isinstance(node.node, TypeInfo):
                 saved = (module, node.node, None)  # module, class, function
diff --git a/test-data/unit/check-newsemanal.test b/test-data/unit/check-newsemanal.test
@@ -2968,3 +2968,27 @@ reveal_type(C) # N: Revealed type is 'Any' \
 from typing import Final
 x: Final = 0
 x = x # E: Cannot assign to final name "x"
+
+[case testNewAnalyzerClassPropertiesInAllScopes]
+from abc import abstractmethod, ABCMeta
+
+class TopLevel(metaclass=ABCMeta):
+    @abstractmethod
+    def f(self) -> None: pass
+
+TopLevel()  # E: Cannot instantiate abstract class 'TopLevel' with abstract attribute 'f'
+
+def func() -> None:
+    class Function(metaclass=ABCMeta):
+        @abstractmethod
+        def f(self) -> None: pass
+
+    Function()  # E: Cannot instantiate abstract class 'Function' with abstract attribute 'f'
+
+class C:
+    def meth(self) -> None:
+        class Method(metaclass=ABCMeta):
+            @abstractmethod
+            def f(self) -> None: pass
+
+        Method()  # E: Cannot instantiate abstract class 'Method' with abstract attribute 'f'
