Skip to content

fix(core): enhance empty string expression validation error context (#8762) #8765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
subbareddypalagiri wants to merge 6 commits into
base: master
Choose a base branch
from
+20 −5
Open

fix(core): enhance empty string expression validation error context (#8762) #8765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f814b92
fix(core): enhance empty string expression validation error context (…
subbareddypalagiri Jun 25, 2026
8eade80
test: update assertions to match the new error context
subbareddypalagiri Jun 25, 2026
8f0a5e3
Revert "fix(core): enhance empty string expression validation error c…
subbareddypalagiri Jun 26, 2026
80b04db
Revert "test: update assertions to match the new error context"
subbareddypalagiri Jun 26, 2026
e807f9e
Merge remote-tracking branch 'upstream/master' into fix-issue-8762-em…
subbareddypalagiri Jun 26, 2026
0a11545
fix(core): dynamically pass context to expression validation errors (…
subbareddypalagiri Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Core/GDCore/Events/Builtin/RepeatEvent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ vector<pair<gd::Expression*, gd::ParameterMetadata> >
RepeatEvent::GetAllExpressionsWithMetadata() {
vector<pair<gd::Expression*, gd::ParameterMetadata> >
allExpressionsWithMetadata;
auto metadata = gd::ParameterMetadata().SetType("number");
auto metadata = gd::ParameterMetadata().SetType("number").SetDescription(_("Number of repeats"));
allExpressionsWithMetadata.push_back(
std::make_pair(&repeatNumberExpression, metadata));

Expand All @@ -75,7 +75,7 @@ vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
RepeatEvent::GetAllExpressionsWithMetadata() const {
vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
allExpressionsWithMetadata;
auto metadata = gd::ParameterMetadata().SetType("number");
auto metadata = gd::ParameterMetadata().SetType("number").SetDescription(_("Number of repeats"));
allExpressionsWithMetadata.push_back(
std::make_pair(&repeatNumberExpression, metadata));

Expand Down
6 changes: 6 additions & 0 deletions Core/GDCore/IDE/Events/ExpressionValidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,13 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
parentType = StringToType(parameterMetadata.GetType());
auto parentParameterExtraInfo = currentParameterExtraInfo;
currentParameterExtraInfo = &parameterMetadata.GetExtraInfo();

auto parentParameterName = currentParameterName;
currentParameterName = parameterMetadata.GetDescription();

parameter->Visit(*this);

currentParameterName = parentParameterName;
currentParameterExtraInfo = parentParameterExtraInfo;
parentType = currentParentType;

Expand Down
12 changes: 10 additions & 2 deletions Core/GDCore/IDE/Events/ExpressionValidator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,17 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
ExpressionValidator(const gd::Platform &platform_,
const gd::ProjectScopedContainers & projectScopedContainers_,
const gd::String &rootType_,
const gd::String &extraInfo_ = emptyParameterExtraInfo)
const gd::String &extraInfo_ = emptyParameterExtraInfo,
const gd::String &contextDescription_ = "")
: platform(platform_),
projectScopedContainers(projectScopedContainers_),
parentType(StringToType(gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(rootType_))),
childType(Type::Unknown),
forbidsUsageOfBracketsBecauseParentIsObject(false),
currentParameterExtraInfo(&extraInfo_),
variableObjectName(),
variableObjectNameLocation() {};
variableObjectNameLocation(),
currentParameterName(contextDescription_) {};
virtual ~ExpressionValidator(){};

/**
Expand Down Expand Up @@ -384,6 +386,11 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
// It can't happen.
message = _("You must enter a valid expression.");
}

if (!currentParameterName.empty()) {
message += " " + _("Parameter:") + " " + currentParameterName;
}

RaiseTypeError(message, node.location);
childType = Type::Empty;
}
Expand Down Expand Up @@ -570,6 +577,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
gd::String variableObjectName;
gd::ExpressionParserLocation variableObjectNameLocation;
const gd::String *currentParameterExtraInfo;
gd::String currentParameterName;
const gd::Platform &platform;
const gd::ProjectScopedContainers &projectScopedContainers;
};
Expand Down
3 changes: 2 additions & 1 deletion Core/GDCore/IDE/InstructionValidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ ParameterValidationResult InstructionValidator::ValidateParameter(
*instruction.GetParameter(parameterIndex).GetRootNode();
ExpressionValidator expressionValidator(platform, projectScopedContainers,
parameterType,
parameterMetadata.GetExtraInfo());
parameterMetadata.GetExtraInfo(),
parameterMetadata.GetDescription());
expressionNode.Visit(expressionValidator);

if (!expressionValidator.GetAllErrors().empty()) {
Expand Down