asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #89861 from dalexeev/editor-help-fix-csharp-crash

Browse source 
Fix regression with C# build editor crash due to `EditorHelpHighlighter`
This commit is contained in:
Rémi Verschelde 2024-04-05 12:15:57 +02:00
commit fe25b18432
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editor/editor_help.cpp
View file

@ -3471,7 +3471,9 @@ EditorHelpHighlighter::HighlightData EditorHelpHighlighter::_get_highlight_data(
} }
text_edits[p_language]->set_text(p_source); text_edits[p_language]->set_text(p_source);
scripts[p_language]->set_source_code(p_source); if (scripts[p_language].is_valid()) { // See GH-89610.
scripts[p_language]->set_source_code(p_source);
}
highlighters[p_language]->_update_cache(); highlighters[p_language]->_update_cache();
HighlightData result; HighlightData result;
@ -3561,16 +3563,18 @@ EditorHelpHighlighter::EditorHelpHighlighter() {
#ifdef MODULE_MONO_ENABLED #ifdef MODULE_MONO_ENABLED
TextEdit *csharp_text_edit = memnew(TextEdit); TextEdit *csharp_text_edit = memnew(TextEdit);
Ref<CSharpScript> csharp; // See GH-89610.
csharp.instantiate(); //Ref<CSharpScript> csharp;
//csharp.instantiate();
Ref<EditorStandardSyntaxHighlighter> csharp_highlighter; Ref<EditorStandardSyntaxHighlighter> csharp_highlighter;
csharp_highlighter.instantiate(); csharp_highlighter.instantiate();
csharp_highlighter->set_text_edit(csharp_text_edit); csharp_highlighter->set_text_edit(csharp_text_edit);
csharp_highlighter->_set_edited_resource(csharp); //csharp_highlighter->_set_edited_resource(csharp);
csharp_highlighter->_set_script_language(CSharpLanguage::get_singleton());
text_edits[LANGUAGE_CSHARP] = csharp_text_edit; text_edits[LANGUAGE_CSHARP] = csharp_text_edit;
scripts[LANGUAGE_CSHARP] = csharp; //scripts[LANGUAGE_CSHARP] = csharp;
highlighters[LANGUAGE_CSHARP] = csharp_highlighter; highlighters[LANGUAGE_CSHARP] = csharp_highlighter;
#endif #endif
} }
@ -3578,14 +3582,10 @@ EditorHelpHighlighter::EditorHelpHighlighter() {
EditorHelpHighlighter::~EditorHelpHighlighter() { EditorHelpHighlighter::~EditorHelpHighlighter() {
#ifdef MODULE_GDSCRIPT_ENABLED #ifdef MODULE_GDSCRIPT_ENABLED
memdelete(text_edits[LANGUAGE_GDSCRIPT]); memdelete(text_edits[LANGUAGE_GDSCRIPT]);
scripts[LANGUAGE_GDSCRIPT].unref();
highlighters[LANGUAGE_GDSCRIPT].unref();
#endif #endif
#ifdef MODULE_MONO_ENABLED #ifdef MODULE_MONO_ENABLED
memdelete(text_edits[LANGUAGE_CSHARP]); memdelete(text_edits[LANGUAGE_CSHARP]);
scripts[LANGUAGE_CSHARP].unref();
highlighters[LANGUAGE_CSHARP].unref();
#endif #endif
} }

27
editor/plugins/script_editor_plugin.cpp
View file

@ -137,12 +137,22 @@ void EditorStandardSyntaxHighlighter::_update_cache() {
} }
} }
const Ref<Script> scr = _get_edited_resource(); const ScriptLanguage *scr_lang = script_language;
if (scr.is_valid()) { StringName instance_base;
if (scr_lang == nullptr) {
const Ref<Script> scr = _get_edited_resource();
if (scr.is_valid()) {
scr_lang = scr->get_language();
instance_base = scr->get_instance_base_type();
}
}
if (scr_lang != nullptr) {
/* Core types. */ /* Core types. */
const Color basetype_color = EDITOR_GET("text_editor/theme/highlighting/base_type_color"); const Color basetype_color = EDITOR_GET("text_editor/theme/highlighting/base_type_color");
List<String> core_types; List<String> core_types;
scr->get_language()->get_core_type_words(&core_types); scr_lang->get_core_type_words(&core_types);
for (const String &E : core_types) { for (const String &E : core_types) {
highlighter->add_keyword_color(E, basetype_color); highlighter->add_keyword_color(E, basetype_color);
} }
@ -151,9 +161,9 @@ void EditorStandardSyntaxHighlighter::_update_cache() {
const Color keyword_color = EDITOR_GET("text_editor/theme/highlighting/keyword_color"); const Color keyword_color = EDITOR_GET("text_editor/theme/highlighting/keyword_color");
const Color control_flow_keyword_color = EDITOR_GET("text_editor/theme/highlighting/control_flow_keyword_color"); const Color control_flow_keyword_color = EDITOR_GET("text_editor/theme/highlighting/control_flow_keyword_color");
List<String> keywords; List<String> keywords;
scr->get_language()->get_reserved_words(&keywords); scr_lang->get_reserved_words(&keywords);
for (const String &E : keywords) { for (const String &E : keywords) {
if (scr->get_language()->is_control_flow_keyword(E)) { if (scr_lang->is_control_flow_keyword(E)) {
highlighter->add_keyword_color(E, control_flow_keyword_color); highlighter->add_keyword_color(E, control_flow_keyword_color);
} else { } else {
highlighter->add_keyword_color(E, keyword_color); highlighter->add_keyword_color(E, keyword_color);
@ -162,7 +172,6 @@ void EditorStandardSyntaxHighlighter::_update_cache() {
/* Member types. */ /* Member types. */
const Color member_variable_color = EDITOR_GET("text_editor/theme/highlighting/member_variable_color"); const Color member_variable_color = EDITOR_GET("text_editor/theme/highlighting/member_variable_color");
StringName instance_base = scr->get_instance_base_type();
if (instance_base != StringName()) { if (instance_base != StringName()) {
List<PropertyInfo> plist; List<PropertyInfo> plist;
ClassDB::get_property_list(instance_base, &plist); ClassDB::get_property_list(instance_base, &plist);
@ -187,7 +196,7 @@ void EditorStandardSyntaxHighlighter::_update_cache() {
/* Comments */ /* Comments */
const Color comment_color = EDITOR_GET("text_editor/theme/highlighting/comment_color"); const Color comment_color = EDITOR_GET("text_editor/theme/highlighting/comment_color");
List<String> comments; List<String> comments;
scr->get_language()->get_comment_delimiters(&comments); scr_lang->get_comment_delimiters(&comments);
for (const String &comment : comments) { for (const String &comment : comments) {
String beg = comment.get_slice(" ", 0); String beg = comment.get_slice(" ", 0);
String end = comment.get_slice_count(" ") > 1 ? comment.get_slice(" ", 1) : String(); String end = comment.get_slice_count(" ") > 1 ? comment.get_slice(" ", 1) : String();
@ -197,7 +206,7 @@ void EditorStandardSyntaxHighlighter::_update_cache() {
/* Doc comments */ /* Doc comments */
const Color doc_comment_color = EDITOR_GET("text_editor/theme/highlighting/doc_comment_color"); const Color doc_comment_color = EDITOR_GET("text_editor/theme/highlighting/doc_comment_color");
List<String> doc_comments; List<String> doc_comments;
scr->get_language()->get_doc_comment_delimiters(&doc_comments); scr_lang->get_doc_comment_delimiters(&doc_comments);
for (const String &doc_comment : doc_comments) { for (const String &doc_comment : doc_comments) {
String beg = doc_comment.get_slice(" ", 0); String beg = doc_comment.get_slice(" ", 0);
String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slice(" ", 1) : String(); String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slice(" ", 1) : String();
@ -207,7 +216,7 @@ void EditorStandardSyntaxHighlighter::_update_cache() {
/* Strings */ /* Strings */
const Color string_color = EDITOR_GET("text_editor/theme/highlighting/string_color"); const Color string_color = EDITOR_GET("text_editor/theme/highlighting/string_color");
List<String> strings; List<String> strings;
scr->get_language()->get_string_delimiters(&strings); scr_lang->get_string_delimiters(&strings);
for (const String &string : strings) { for (const String &string : strings) {
String beg = string.get_slice(" ", 0); String beg = string.get_slice(" ", 0);
String end = string.get_slice_count(" ") > 1 ? string.get_slice(" ", 1) : String(); String end = string.get_slice_count(" ") > 1 ? string.get_slice(" ", 1) : String();

3
editor/plugins/script_editor_plugin.h
View file

@ -78,6 +78,7 @@ class EditorStandardSyntaxHighlighter : public EditorSyntaxHighlighter {
private: private:
Ref<CodeHighlighter> highlighter; Ref<CodeHighlighter> highlighter;
ScriptLanguage *script_language = nullptr; // See GH-89610.
public: public:
virtual void _update_cache() override; virtual void _update_cache() override;
@ -87,6 +88,8 @@ public:
virtual Ref<EditorSyntaxHighlighter> _create() const override; virtual Ref<EditorSyntaxHighlighter> _create() const override;
void _set_script_language(ScriptLanguage *p_script_language) { script_language = p_script_language; }
EditorStandardSyntaxHighlighter() { highlighter.instantiate(); } EditorStandardSyntaxHighlighter() { highlighter.instantiate(); }
}; };