diff --git a/language/cypher/src/main/gen/com/neueda/jetbrains/plugin/graphdb/language/cypher/CypherParser.java b/language/cypher/src/main/gen/com/neueda/jetbrains/plugin/graphdb/language/cypher/CypherParser.java index 3c20013e..d825f9c1 100644 --- a/language/cypher/src/main/gen/com/neueda/jetbrains/plugin/graphdb/language/cypher/CypherParser.java +++ b/language/cypher/src/main/gen/com/neueda/jetbrains/plugin/graphdb/language/cypher/CypherParser.java @@ -2790,16 +2790,15 @@ private static boolean NodeLookup_1(PsiBuilder b, int l) { public static boolean NodePattern(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "NodePattern")) return false; if (!nextTokenIs(b, PARENTHESE_OPEN)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, NODE_PATTERN, null); + boolean r; + Marker m = enter_section_(b); r = consumeToken(b, PARENTHESE_OPEN); - p = r; // pin = 1 - r = r && report_error_(b, NodePattern_1(b, l + 1)); - r = p && report_error_(b, NodePattern_2(b, l + 1)) && r; - r = p && report_error_(b, NodePattern_3(b, l + 1)) && r; - r = p && consumeToken(b, PARENTHESE_CLOSE) && r; - exit_section_(b, l, m, r, p, null); - return r || p; + r = r && NodePattern_1(b, l + 1); + r = r && NodePattern_2(b, l + 1); + r = r && NodePattern_3(b, l + 1); + r = r && consumeToken(b, PARENTHESE_CLOSE); + exit_section_(b, m, NODE_PATTERN, r); + return r; } // Variable? diff --git a/language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/lexer/Cypher.bnf b/language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/lexer/Cypher.bnf index b7d0fcaf..26944609 100644 --- a/language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/lexer/Cypher.bnf +++ b/language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/lexer/Cypher.bnf @@ -340,7 +340,7 @@ RelationshipDetail ::= "[" Variable? "?"? RelationshipTypes? MaybeVariableLength RelationshipTypes ::= ":" RelTypeName ("|" ":"? RelTypeName)* {pin=1} MaybeVariableLength ::= ("*" RangeLiteral?) -NodePattern ::= "(" Variable? NodeLabels? Properties? ")" {pin=1} +NodePattern ::= "(" Variable? NodeLabels? Properties? ")" RelationshipsPattern ::= NodePattern PatternElementChain+ { implements="com.neueda.jetbrains.plugin.graphdb.language.cypher.references.types.CypherPathYielding"