Fix scoping for function annotations, decorators and base classes (#3713)

Fix scoping for function annotations, decorators and base classes

Closes #1082, #3434, #3461

Reduce number of branches in variables checker

Co-authored-by: Andrew Simmons <a.simmons@deakin.edu.au>

2 files changed, 21 insertions, 0 deletions

diff --git a/tests/functional/c/class_scope.py b/tests/functional/c/class_scope.py
index 527e5efa2..4e1561c9a 100644
--- a/tests/functional/c/class_scope.py
+++ b/tests/functional/c/class_scope.py
@@ -21,3 +21,23 @@ class Well(object):
     def func(self):
         """check Sub is not defined here"""
         return Sub(), self # [undefined-variable]
+
+
+class Right:
+    """right"""
+    class Result1:
+        """result one"""
+        OK = 0
+    def work(self) -> Result1:
+        """good type hint"""
+        return self.Result1.OK
+
+
+class Wrong:
+    """wrong"""
+    class Result2:
+        """result two"""
+        OK = 0
+    def work(self) -> self.Result2: # [undefined-variable]
+        """bad type hint"""
+        return self.Result2.OK
diff --git a/tests/functional/c/class_scope.txt b/tests/functional/c/class_scope.txt
index 348c2b510..decd708c2 100644
--- a/tests/functional/c/class_scope.txt
+++ b/tests/functional/c/class_scope.txt
@@ -4,3 +4,4 @@ undefined-variable:13:Well.<lambda>:Undefined variable 'get_attr_bad'
 undefined-variable:14:Well:Undefined variable 'attr'
 undefined-variable:20:Well.Sub:Undefined variable 'Data'
 undefined-variable:23:Well.func:Undefined variable 'Sub'
+undefined-variable:41:Wrong.work:Undefined variable 'self'