Add clearer error messages when using set/get incorrectly. #91506
+47
−0
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
May 3, 2024
modules/gdscript/gdscript_parser.cpp
Outdated
Comment on lines
1101
to
1102
| if (p_allow_property && match(GDScriptTokenizer::Token::IDENTIFIER)) { | ||
| StringName identifier_name = previous.get_identifier(); |
There was a problem hiding this comment.
I think check() and current should be used here instead of match() and previous since match() advances the parser.
modules/gdscript/gdscript_parser.cpp
Outdated
| } else { | ||
| push_error(R"(Expected end of statement after variable declaration, found "Identifier" instead.)"); | ||
| } |
There was a problem hiding this comment.
This should probably be removed then.
modules/gdscript/gdscript_parser.cpp
Outdated
Comment on lines
1113
to
1124
| if (p_allow_property && !malformed_setget_found && match(GDScriptTokenizer::Token::INDENT)) { | ||
| if (match(GDScriptTokenizer::Token::IDENTIFIER)) { | ||
| StringName identifier_name = previous.get_identifier(); | ||
| if (identifier_name == SNAME("set") || identifier_name == SNAME("get")) { | ||
| malformed_setget_found = true; | ||
| } | ||
| } | ||
|
|
||
| if (malformed_setget_found) { | ||
| push_error(vformat(R"(Expected ":" at end of variable declaration when using "set" or "get")"), variable); | ||
| } else { | ||
| push_error(R"(Unexpected "Indent" after variable declaration.)"); | ||
| } | ||
| } |
ArchieVillain
force-pushed
the
setget-colon-error
branch
from
d937f54
to
698a175
Compare
Let me know if this is alright. |
modules/gdscript/tests/scripts/parser/errors/missing_colon_setget_indent.gd
Outdated
Show resolved
Hide resolved
modules/gdscript/tests/scripts/parser/errors/missing_colon_setget_inline.gd
Outdated
Show resolved
Hide resolved
ArchieVillain
force-pushed
the
setget-colon-error
branch
from
698a175
to
568874c
Compare
It's quite easy for users to forget to use the colon before their setters and getters, but in this situation error messages are unclear about the real nature of the problem. This commit adds a check for malformed set/get statements and provides error messages containing more direct guidance to users. Closes godotengine#91216
ArchieVillain
force-pushed
the
setget-colon-error
branch
from
568874c
to
17de35e
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.
It's quite easy for users to forget to use the colon before their setters and getters, but in this situation error messages are unclear about the real nature of the problem.
This commit adds a check for malformed set/get statements and provides error messages containing more direct guidance to users.
Closes #91216