godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix spurious error messages during autocomplete and validate" 

This reverts commit b7faa76485.

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
This commit is contained in:
Hein-Pieter van Braam 2018-02-27 16:08:10 +01:00
parent 4e1d19b20c
commit a850ebf352
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/gdscript/gdscript_parser.cpp
View File

@ -458,9 +458,9 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
if (!validating) { if (!validating) {
//this can be too slow for just validating code //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); res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path);
} else if (!for_completion || FileAccess::exists(path)) { } else { // essential; see issue 15902
res = ResourceLoader::load(path); res = ResourceLoader::load(path);
} }
if (!res.is_valid()) { if (!res.is_valid()) {
@ -4358,6 +4358,8 @@ Error GDScriptParser::_parse(const String &p_base_path) {
base_path = p_base_path; base_path = p_base_path;
clear();
//assume class //assume class
ClassNode *main_class = alloc_node<ClassNode>(); ClassNode *main_class = alloc_node<ClassNode>();
main_class->initializer = alloc_node<BlockNode>(); main_class->initializer = alloc_node<BlockNode>();
@ -4382,7 +4384,17 @@ Error GDScriptParser::_parse(const String &p_base_path) {
Error GDScriptParser::parse_bytecode(const Vector<uint8_t> &p_bytecode, const String &p_base_path, const String &p_self_path) { Error GDScriptParser::parse_bytecode(const Vector<uint8_t> &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; self_path = p_self_path;
GDScriptTokenizerBuffer *tb = memnew(GDScriptTokenizerBuffer); GDScriptTokenizerBuffer *tb = memnew(GDScriptTokenizerBuffer);
@ -4396,7 +4408,16 @@ Error GDScriptParser::parse_bytecode(const Vector<uint8_t> &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) { 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; self_path = p_self_path;
GDScriptTokenizerText *tt = memnew(GDScriptTokenizerText); GDScriptTokenizerText *tt = memnew(GDScriptTokenizerText);