From a850ebf352e9601d46ac116b5112e752a4717953 Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Tue, 27 Feb 2018 16:08:10 +0100 Subject: [PATCH] Revert "fix spurious error messages during autocomplete and validate" This reverts commit b7faa76485be1cfe368d24e4fe30adf252beedbe. This causes a regression in 3.0.1. We haven't found a proper fix yet so we're removing this from 3.0.2 --- modules/gdscript/gdscript_parser.cpp | 29 ++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 532b72ce6b8..861a35b5f4d 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -458,9 +458,9 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s if (!validating) { //this can be too slow for just validating code - if (for_completion && ScriptCodeCompletionCache::get_singleton() && FileAccess::exists(path)) { + if (for_completion && ScriptCodeCompletionCache::get_singleton()) { res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path); - } else if (!for_completion || FileAccess::exists(path)) { + } else { // essential; see issue 15902 res = ResourceLoader::load(path); } if (!res.is_valid()) { @@ -4358,6 +4358,8 @@ Error GDScriptParser::_parse(const String &p_base_path) { base_path = p_base_path; + clear(); + //assume class ClassNode *main_class = alloc_node(); main_class->initializer = alloc_node(); @@ -4382,7 +4384,17 @@ Error GDScriptParser::_parse(const String &p_base_path) { Error GDScriptParser::parse_bytecode(const Vector &p_bytecode, const String &p_base_path, const String &p_self_path) { - clear(); + for_completion = false; + validating = false; + completion_type = COMPLETION_NONE; + completion_node = NULL; + completion_class = NULL; + completion_function = NULL; + completion_block = NULL; + completion_found = false; + current_block = NULL; + current_class = NULL; + current_function = NULL; self_path = p_self_path; GDScriptTokenizerBuffer *tb = memnew(GDScriptTokenizerBuffer); @@ -4396,7 +4408,16 @@ Error GDScriptParser::parse_bytecode(const Vector &p_bytecode, const St Error GDScriptParser::parse(const String &p_code, const String &p_base_path, bool p_just_validate, const String &p_self_path, bool p_for_completion) { - clear(); + completion_type = COMPLETION_NONE; + completion_node = NULL; + completion_class = NULL; + completion_function = NULL; + completion_block = NULL; + completion_found = false; + current_block = NULL; + current_class = NULL; + + current_function = NULL; self_path = p_self_path; GDScriptTokenizerText *tt = memnew(GDScriptTokenizerText);