Fix POT generation failing on some scripts with class_name. #91963
+7
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, it would fail with the error "Class "<class>" hides a global script class"
|
Could you please provide an MRP to reproduce the bug? |
akien-mga
changed the title
| @@ -52,10 +52,16 @@ Error GDScriptEditorTranslationParserPlugin::parse_file(const String &p_path, Ve | |||
| ids = r_ids; | |||
| ids_ctx_plural = r_ids_ctx_plural; | |||
| Ref<GDScript> gdscript = loaded_res; | |||
| ERR_FAIL_COND_V_MSG(!gdscript->is_valid(), ERR_FILE_CANT_OPEN, "Failed to load GDScript."); | |||
There was a problem hiding this comment.
Should this not be:
Suggested change
| ERR_FAIL_COND_V_MSG(!gdscript->is_valid(), ERR_FILE_CANT_OPEN, "Failed to load GDScript."); | |
| ERR_FAIL_COND_V_MSG(!gdscript.is_valid(), ERR_FILE_CANT_OPEN, "Failed to load GDScript."); |
I.e.
Suggested change
| ERR_FAIL_COND_V_MSG(!gdscript->is_valid(), ERR_FILE_CANT_OPEN, "Failed to load GDScript."); | |
| ERR_FAIL_COND_V_MSG(gdscript.is_null(), ERR_FILE_CANT_OPEN, "Failed to load GDScript."); |
Or:
Suggested change
| ERR_FAIL_COND_V_MSG(!gdscript->is_valid(), ERR_FILE_CANT_OPEN, "Failed to load GDScript."); | |
| ERR_FAIL_COND_V_MSG(gdscript.is_null() || !gdscript->is_valid(), ERR_FILE_CANT_OPEN, "Failed to load GDScript."); |
Is this check for the script or the resource?
|
I gotta admit I rushed this PR a bit too much, i'll try to make a proper MRP |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, it would fail with the error "Class "" hides a global script class"
Original error at line:
https://github.com/godotengine/godot/blob/master/modules/gdscript/gdscript_analyzer.cpp#L364