From 0ff0f64cd4009700f8f95db865320dc154349dff Mon Sep 17 00:00:00 2001
From: Brian Semrau <brian.semrau@gmail.com>
Date: Tue, 12 Oct 2021 10:49:06 -0400
Subject: [PATCH] GDScript: Access outer scope classes

---
 modules/gdscript/gdscript_analyzer.cpp        |  5 +++++
 .../analyzer/features/class_from_parent.gd    | 19 +++++++++++++++++++
 .../analyzer/features/class_from_parent.out   |  4 ++++
 3 files changed, 28 insertions(+)
 create mode 100644 modules/gdscript/tests/scripts/analyzer/features/class_from_parent.gd
 create mode 100644 modules/gdscript/tests/scripts/analyzer/features/class_from_parent.out

diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
index 9e9873d45f5..a025a90b8c9 100644
--- a/modules/gdscript/gdscript_analyzer.cpp
+++ b/modules/gdscript/gdscript_analyzer.cpp
@@ -2682,6 +2682,11 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod
 						p_identifier->is_constant = false;
 						return;
 					} break;
+					case GDScriptParser::ClassNode::Member::CLASS: {
+						resolve_class_interface(member.m_class);
+						p_identifier->set_datatype(member.m_class->get_datatype());
+						return;
+					} break;
 					default:
 						break;
 				}
diff --git a/modules/gdscript/tests/scripts/analyzer/features/class_from_parent.gd b/modules/gdscript/tests/scripts/analyzer/features/class_from_parent.gd
new file mode 100644
index 00000000000..30e7deb05af
--- /dev/null
+++ b/modules/gdscript/tests/scripts/analyzer/features/class_from_parent.gd
@@ -0,0 +1,19 @@
+class A:
+    var x = 3
+
+class B:
+    var x = 4
+
+class C:
+    var x = 5
+
+class Test:
+    var a = A.new()
+    var b: B = B.new()
+    var c := C.new()
+
+func test():
+    var test_instance := Test.new()
+    prints(test_instance.a.x)
+    prints(test_instance.b.x)
+    prints(test_instance.c.x)
diff --git a/modules/gdscript/tests/scripts/analyzer/features/class_from_parent.out b/modules/gdscript/tests/scripts/analyzer/features/class_from_parent.out
new file mode 100644
index 00000000000..a078e62cc78
--- /dev/null
+++ b/modules/gdscript/tests/scripts/analyzer/features/class_from_parent.out
@@ -0,0 +1,4 @@
+GDTEST_OK
+3
+4
+5