contains keyword not correctly parsed in composite statements

[james-whiteside]

Description

The following query is not correctly parsed, throwing TQL03:

match
$n isa name, contains "hello";
get;

The following is:

match
$n isa name;
$n contains "hello";
get;

Environment

1. TypeDB distribution: Core
2. TypeDB version: 2.25.7
3. Environment: MacOS
4. Client and version: Studio 2.25.0

[dmitrii-ubskii]

Currently the expected syntax is this:

match
$n contains "hello" isa name;
get;

Which follows the structure of <variable> [<predicate>] [isa <type>];, e.g. $n "Jimbob" isa name; or $a >= 18 isa age;

[james-whiteside]

I don't think this is consistent or intutitive. Currently, all of our constraint forming predicates can be chained into composite statements in the style <type>|<variable> <predicate> <type>|<variable> [, <predicate> <type>|<variable> ...]. This one is the exception to the rule.