Fix analyzer pushing SHADOWED_VARIABLE warning for members shadowed in subclass #98873
+83
−42
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
dalexeev
reviewed
Nov 6, 2024
modules/gdscript/tests/scripts/analyzer/warnings/local_variable_shadows_base_member.gd
Outdated
Show resolved
Hide resolved
girdenis-p
force-pushed
the
shadowed-variable-warning
branch
from
aae9172
to
d4881bd
Compare
dalexeev
approved these changes
Nov 6, 2024
| @@ -0,0 +1,7 @@ | |||
| class_name ShadowingBase | |||
|
|
|||
| const base_const_member = 1 | |||
There was a problem hiding this comment.
I added a test cast for it in the shadowning.gd script.
| @@ -5809,8 +5809,7 @@ void GDScriptAnalyzer::validate_call_arg(const List<GDScriptParser::DataType> &p | |||
| #ifdef DEBUG_ENABLED | |||
| void GDScriptAnalyzer::is_shadowing(GDScriptParser::IdentifierNode *p_identifier, const String &p_context, const bool p_in_local_scope) { | |||
| const StringName &name = p_identifier->name; | |||
| GDScriptParser::DataType base = parser->current_class->get_datatype(); | |||
| GDScriptParser::ClassNode *base_class = base.class_type; | |||
| const GDScriptParser::DataType current_class_type = parser->current_class->get_datatype(); | |||
There was a problem hiding this comment.
Nitpick: this isn't used until line 5841. It's recommended to declare variables as close to the first use as possible, if it doesn't affect anything.
There was a problem hiding this comment.
I added it above:
if (p_in_local_scope) {
GDScriptParser::ClassNode *base_class = current_class_type.class_type;
this way it is accessible for base_class and native_base_class (defined later).
…n subclasses This fixes a bug in the analyzer where it did not push the SHADOWED_VARIABLE_BASE_CLASS warning for members shadowed by variable in subclass. It does this by comparing the class which contains the shadowed member with the class containing the variable, and pushing SHADOWED_VARIABLE only if the classes are the same. Additionally, SHADOWED_VARIABLE_BASE_CLASS can take an extra symbol which helps to specify the line for non native base class.
girdenis-p
force-pushed
the
shadowed-variable-warning
branch
from
8d0aee7
to
413490c
Compare
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.
This fixes #74395. It does this by comparing the class which contains the shadowed member with the class containing the variable, and pushing the
SHADOWED_VARIABLEwarning only if the classes are the same, otherwise theSHADOWED_VARIABLE_BASE_CLASSwarning is pushed.Additionally,
SHADOWED_VARIABLE_BASE_CLASScan now take an extra symbol which helps to specify the line for non native base class.Comments and docs have been updated to highlight that these warnings are related to shadowed members in the concerning class instead of just shadowed variables.