Merge pull request #38649 from Janglee123/ctrl-click-3.2
Improved go-to definition (Ctrl + Click) for 3.2
This commit is contained in:
commit
dc89c1b7e6
6 changed files with 53 additions and 2 deletions
|
@ -1040,6 +1040,7 @@ void EditorHelp::_update_doc() {
|
||||||
class_desc->pop(); // color
|
class_desc->pop(); // color
|
||||||
class_desc->pop(); // font
|
class_desc->pop(); // font
|
||||||
class_desc->pop(); // cell
|
class_desc->pop(); // cell
|
||||||
|
method_line[cd.properties[i].setter] = property_line[cd.properties[i].name];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cd.properties[i].getter != "") {
|
if (cd.properties[i].getter != "") {
|
||||||
|
@ -1057,6 +1058,7 @@ void EditorHelp::_update_doc() {
|
||||||
class_desc->pop(); //color
|
class_desc->pop(); //color
|
||||||
class_desc->pop(); //font
|
class_desc->pop(); //font
|
||||||
class_desc->pop(); //cell
|
class_desc->pop(); //cell
|
||||||
|
method_line[cd.properties[i].getter] = property_line[cd.properties[i].name];
|
||||||
}
|
}
|
||||||
|
|
||||||
class_desc->pop(); // table
|
class_desc->pop(); // table
|
||||||
|
|
|
@ -970,9 +970,35 @@ void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_c
|
||||||
emit_signal("go_to_help", "class_global:" + result.class_name + ":" + result.class_member);
|
emit_signal("go_to_help", "class_global:" + result.class_name + ":" + result.class_member);
|
||||||
} break;
|
} break;
|
||||||
}
|
}
|
||||||
|
} else if (ProjectSettings::get_singleton()->has_setting("autoload/" + p_symbol)) {
|
||||||
|
//check for Autoload scenes
|
||||||
|
String path = ProjectSettings::get_singleton()->get("autoload/" + p_symbol);
|
||||||
|
if (path.begins_with("*")) {
|
||||||
|
path = path.substr(1, path.length());
|
||||||
|
EditorNode::get_singleton()->load_scene(path);
|
||||||
|
}
|
||||||
|
} else if (p_symbol.is_rel_path()) {
|
||||||
|
// Every symbol other than absolute path is relative path so keep this condition at last.
|
||||||
|
String path = _get_absolute_path(p_symbol);
|
||||||
|
if (FileAccess::exists(path)) {
|
||||||
|
List<String> scene_extensions;
|
||||||
|
ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions);
|
||||||
|
|
||||||
|
if (scene_extensions.find(path.get_extension())) {
|
||||||
|
EditorNode::get_singleton()->load_scene(path);
|
||||||
|
} else {
|
||||||
|
EditorNode::get_singleton()->load_resource(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String ScriptTextEditor::_get_absolute_path(const String &rel_path) {
|
||||||
|
String base_path = script->get_path().get_base_dir();
|
||||||
|
String path = base_path.plus_file(rel_path);
|
||||||
|
return path.replace("///", "//").simplify_path();
|
||||||
|
}
|
||||||
|
|
||||||
void ScriptTextEditor::update_toggle_scripts_button() {
|
void ScriptTextEditor::update_toggle_scripts_button() {
|
||||||
if (code_editor != NULL) {
|
if (code_editor != NULL) {
|
||||||
code_editor->update_toggle_scripts_button();
|
code_editor->update_toggle_scripts_button();
|
||||||
|
|
|
@ -186,6 +186,8 @@ protected:
|
||||||
bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
|
bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
|
||||||
void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
|
void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
|
||||||
|
|
||||||
|
String _get_absolute_path(const String &rel_path);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void _update_connected_methods();
|
void _update_connected_methods();
|
||||||
|
|
||||||
|
|
|
@ -3490,6 +3490,17 @@ Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol
|
||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
|
case GDScriptParser::COMPLETION_TYPE_HINT: {
|
||||||
|
|
||||||
|
GDScriptParser::DataType base_type = context._class->base_type;
|
||||||
|
base_type.has_type = true;
|
||||||
|
base_type.kind = GDScriptParser::DataType::CLASS;
|
||||||
|
base_type.class_type = const_cast<GDScriptParser::ClassNode *>(context._class);
|
||||||
|
|
||||||
|
if (_lookup_symbol_from_base(base_type, p_symbol, false, r_result) == OK) {
|
||||||
|
return OK;
|
||||||
|
}
|
||||||
|
} break;
|
||||||
default: {
|
default: {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8551,7 +8551,13 @@ Error GDScriptParser::_parse(const String &p_base_path) {
|
||||||
_set_error("Parse error: " + tokenizer->get_token_error());
|
_set_error("Parse error: " + tokenizer->get_token_error());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (error_set && !for_completion) {
|
bool for_completion_error_set = false;
|
||||||
|
if (error_set && for_completion) {
|
||||||
|
for_completion_error_set = true;
|
||||||
|
error_set = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error_set) {
|
||||||
return ERR_PARSE_ERROR;
|
return ERR_PARSE_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8581,6 +8587,10 @@ Error GDScriptParser::_parse(const String &p_base_path) {
|
||||||
// Resolve the function blocks
|
// Resolve the function blocks
|
||||||
_check_class_blocks_types(main_class);
|
_check_class_blocks_types(main_class);
|
||||||
|
|
||||||
|
if (for_completion_error_set) {
|
||||||
|
error_set = true;
|
||||||
|
}
|
||||||
|
|
||||||
if (error_set) {
|
if (error_set) {
|
||||||
return ERR_PARSE_ERROR;
|
return ERR_PARSE_ERROR;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1150,7 +1150,7 @@ void TextEdit::_notification(int p_what) {
|
||||||
highlighted_text_col = _get_column_pos_of_word(highlighted_text, str, SEARCH_MATCH_CASE | SEARCH_WHOLE_WORDS, 0);
|
highlighted_text_col = _get_column_pos_of_word(highlighted_text, str, SEARCH_MATCH_CASE | SEARCH_WHOLE_WORDS, 0);
|
||||||
|
|
||||||
if (select_identifiers_enabled && highlighted_word.length() != 0) {
|
if (select_identifiers_enabled && highlighted_word.length() != 0) {
|
||||||
if (_is_char(highlighted_word[0])) {
|
if (_is_char(highlighted_word[0]) || highlighted_word[0] == '.') {
|
||||||
highlighted_word_col = _get_column_pos_of_word(highlighted_word, fullstr, SEARCH_MATCH_CASE | SEARCH_WHOLE_WORDS, 0);
|
highlighted_word_col = _get_column_pos_of_word(highlighted_word, fullstr, SEARCH_MATCH_CASE | SEARCH_WHOLE_WORDS, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue