From 21bdbb80f37c6a065339ef039282f4b03422565c Mon Sep 17 00:00:00 2001
From: rubenporras <43636626+rubenporras@users.noreply.github.com>
Date: Wed, 15 Nov 2023 10:05:14 +0100
Subject: [PATCH] Collect outgoing siblings for UnorderedGroup

CollectOutgoingByContainer will stop collecting the next siblings if the next to it is mandatory, because it is expected to appear in that order. Handle unordered groups as well to collect all of the outgoing siblings.
---
 .../eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java
index a2fb7520544..3eba2945b87 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java
@@ -170,7 +170,7 @@ protected void collectOutgoingByContainer(AbstractElement element, Set<AbstractE
 					} else {
 						AbstractElement next = siblings.get(i + 1);
 						addOutgoing(next, visited, isRuleCall, loopCenter);
-						if (GrammarUtil.isOptionalCardinality(next))
+						if (GrammarUtil.isOptionalCardinality(next) || container instanceof UnorderedGroup)
 							collectOutgoingByContainer(next, visited, isRuleCall, loopCenter);
 					}
 					break;
@@ -182,7 +182,7 @@ protected void collectOutgoingByContainer(AbstractElement element, Set<AbstractE
 					} else {
 						AbstractElement next = siblings.get(i - 1);
 						addOutgoing(next, visited, isRuleCall, loopCenter);
-						if (GrammarUtil.isOptionalCardinality(next))
+						if (GrammarUtil.isOptionalCardinality(next) || container instanceof UnorderedGroup)
 							collectOutgoingByContainer(next, visited, isRuleCall, loopCenter);
 					}
 					break;