diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-20 13:10:08 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-20 13:10:08 +0200 |
| commit | f2baba6ddbb92edba1634acf40bf001571f08644 (patch) | |
| tree | fe1d187cdad2517df61a32de111abb5a9837ec1e /editor/plugins/script_text_editor.cpp | |
| parent | b7c524d35870d07e7327f58375378723de7768e3 (diff) | |
| parent | 3f43044a40d8acd59f6aba9b8de348846b0a63e5 (diff) | |
| download | redot-engine-f2baba6ddbb92edba1634acf40bf001571f08644.tar.gz | |
Merge pull request #81927 from KoBeWi/uid﹕﹕∕∕c1ick
Make UIDs clickable in the script editor
Diffstat (limited to 'editor/plugins/script_text_editor.cpp')
| -rw-r--r-- | editor/plugins/script_text_editor.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index ca80c2e087..d5ad21e346 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -890,14 +890,19 @@ void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_c Error lc_error = script->get_language()->lookup_code(code_text, p_symbol, script->get_path(), base, result); if (ScriptServer::is_global_class(p_symbol)) { EditorNode::get_singleton()->load_resource(ScriptServer::get_global_class_path(p_symbol)); - } else if (p_symbol.is_resource_file()) { + } else if (p_symbol.is_resource_file() || p_symbol.begins_with("uid://")) { + String symbol = p_symbol; + if (symbol.begins_with("uid://")) { + symbol = ResourceUID::get_singleton()->get_id_path(ResourceUID::get_singleton()->text_to_id(symbol)); + } + List<String> scene_extensions; ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions); - if (scene_extensions.find(p_symbol.get_extension())) { - EditorNode::get_singleton()->load_scene(p_symbol); + if (scene_extensions.find(symbol.get_extension())) { + EditorNode::get_singleton()->load_scene(symbol); } else { - EditorNode::get_singleton()->load_resource(p_symbol); + EditorNode::get_singleton()->load_resource(symbol); } } else if (lc_error == OK) { @@ -1024,7 +1029,7 @@ void ScriptTextEditor::_validate_symbol(const String &p_symbol) { String lc_text = code_editor->get_text_editor()->get_text_for_symbol_lookup(); Error lc_error = script->get_language()->lookup_code(lc_text, p_symbol, script->get_path(), base, result); bool is_singleton = ProjectSettings::get_singleton()->has_autoload(p_symbol) && ProjectSettings::get_singleton()->get_autoload(p_symbol).is_singleton; - if (ScriptServer::is_global_class(p_symbol) || p_symbol.is_resource_file() || lc_error == OK || is_singleton) { + if (lc_error == OK || is_singleton || ScriptServer::is_global_class(p_symbol) || p_symbol.is_resource_file() || p_symbol.begins_with("uid://")) { text_edit->set_symbol_lookup_word_as_valid(true); } else if (p_symbol.is_relative_path()) { String path = _get_absolute_path(p_symbol); |