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

Fix LSP completion crashing on sceneless scripts

Browse Source 
(cherry picked from commit 6db17a523e)
This commit is contained in:
Francois Belair 2021-08-06 15:20:47 -04:00 committed by Rémi Verschelde
parent a384ffa2b0
commit 9d0e0fe783
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/gdscript/language_server/gdscript_workspace.cpp
View File

@ -445,22 +445,24 @@ void GDScriptWorkspace::completion(const lsp::CompletionParams &p_params, List<S
Array stack; Array stack;
Node *current = nullptr; Node *current = nullptr;
stack.push_back(owner_scene_node);
while (!stack.empty()) { if (owner_scene_node) {
current = stack.pop_back(); stack.push_back(owner_scene_node);
while (!stack.empty()) {
current = stack.pop_back();
Ref<GDScript> script = current->get_script();
if (script.is_valid() && script->get_path() == path) {
break;
}
for (int i = 0; i < current->get_child_count(); ++i) {
stack.push_back(current->get_child(i));
}
}
Ref<GDScript> script = current->get_script(); Ref<GDScript> script = current->get_script();
if (script.is_valid() && script->get_path() == path) { if (!script.is_valid() || script->get_path() != path) {
break; current = owner_scene_node;
} }
for (int i = 0; i < current->get_child_count(); ++i) {
stack.push_back(current->get_child(i));
}
}
Ref<GDScript> script = current->get_script();
if (!script.is_valid() || script->get_path() != path) {
current = owner_scene_node;
} }
String code = parser->get_text_for_completion(p_params.position); String code = parser->get_text_for_completion(p_params.position);