From 4fc14e8e11003a30346fdcf881d11047925de79f Mon Sep 17 00:00:00 2001
From: Thakee Nathees <thakeenathees@gmail.com>
Date: Wed, 2 Sep 2020 20:38:49 +0530
Subject: [PATCH] fixed parser error when indexing a dictionary.

Fix: #41707
---
 modules/gdscript/gdscript_analyzer.cpp | 32 ++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
index 788b3c87abb..3e35af965fc 100644
--- a/modules/gdscript/gdscript_analyzer.cpp
+++ b/modules/gdscript/gdscript_analyzer.cpp
@@ -2073,18 +2073,32 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod
 				push_error(vformat(R"(Cannot find constant "%s" on type "%s".)", name, base.to_string()), p_identifier);
 			}
 		} else {
-			Callable::CallError temp;
-			Variant dummy = Variant::construct(base.builtin_type, nullptr, 0, temp);
-			List<PropertyInfo> properties;
-			dummy.get_property_list(&properties);
-			for (const List<PropertyInfo>::Element *E = properties.front(); E != nullptr; E = E->next()) {
-				const PropertyInfo &prop = E->get();
-				if (prop.name == name) {
-					p_identifier->set_datatype(type_from_property(prop));
+			switch (base.builtin_type) {
+				case Variant::NIL: {
+					push_error(vformat(R"(Invalid get index "%s" on base Nil)", name), p_identifier);
 					return;
 				}
+				case Variant::DICTIONARY: {
+					GDScriptParser::DataType dummy;
+					dummy.kind = GDScriptParser::DataType::VARIANT;
+					p_identifier->set_datatype(dummy);
+					return;
+				}
+				default: {
+					Callable::CallError temp;
+					Variant dummy = Variant::construct(base.builtin_type, nullptr, 0, temp);
+					List<PropertyInfo> properties;
+					dummy.get_property_list(&properties);
+					for (const List<PropertyInfo>::Element *E = properties.front(); E != nullptr; E = E->next()) {
+						const PropertyInfo &prop = E->get();
+						if (prop.name == name) {
+							p_identifier->set_datatype(type_from_property(prop));
+							return;
+						}
+					}
+					push_error(vformat(R"(Cannot find property "%s" on base "%s".)", name, base.to_string()), p_identifier);
+				}
 			}
-			push_error(vformat(R"(Cannot find property "%s" on base "%s".)", name, base.to_string()), p_identifier);
 		}
 		return;
 	}