2 files changed, 34 insertions, 29 deletions

diff --git a/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/IdentifierTokenProvider.java b/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/IdentifierTokenProvider.java
index 306a86fc..0e19357f 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/IdentifierTokenProvider.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/IdentifierTokenProvider.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -59,7 +59,7 @@ public class IdentifierTokenProvider {
 
                 private void createValueToTokenIdMap() {
                         var tokenIdToValueMap = tokenDefProvider.getTokenDefMap();
-                        valueToTokenIdMap = new HashMap<>(tokenIdToValueMap.size());
+                        valueToTokenIdMap = HashMap.newHashMap(tokenIdToValueMap.size());
                         for (var entry : tokenIdToValueMap.entrySet()) {
                                 valueToTokenIdMap.put(entry.getValue(), entry.getKey());
                         }
@@ -74,17 +74,16 @@ public class IdentifierTokenProvider {
                 }
 
                 private void collectIdentifierTokensFromElement(AbstractElement element) {
-                        if (element instanceof Alternatives alternatives) {
-                                for (var alternative : alternatives.getElements()) {
-                                        collectIdentifierTokensFromElement(alternative);
-                                }
-                        } else if (element instanceof RuleCall ruleCall) {
-                                collectIdentifierTokensFromRule(ruleCall.getRule());
-                        } else if (element instanceof Keyword keyword) {
-                                collectToken("'" + keyword.getValue() + "'");
-                        } else {
-                                throw new IllegalArgumentException("Unknown Xtext grammar element: " + element);
-                        }
+            switch (element) {
+                case Alternatives alternatives -> {
+                    for (var alternative : alternatives.getElements()) {
+                        collectIdentifierTokensFromElement(alternative);
+                    }
+                }
+                case RuleCall ruleCall -> collectIdentifierTokensFromRule(ruleCall.getRule());
+                case Keyword keyword -> collectToken("'" + keyword.getValue() + "'");
+                default -> throw new IllegalArgumentException("Unknown Xtext grammar element: " + element);
+            }
                 }
 
                 private void collectToken(String value) {
diff --git a/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/ProblemTokenSource.java b/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/ProblemTokenSource.java
index 5b91a6cc..487e4ceb 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/ProblemTokenSource.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/parser/antlr/ProblemTokenSource.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -28,6 +28,8 @@ public class ProblemTokenSource implements TokenSource {
 
         private boolean seenId;
 
+        private boolean lastVisible;
+
         public ProblemTokenSource(TokenSource delegate) {
                 this.delegate = delegate;
         }
@@ -47,18 +49,18 @@ public class ProblemTokenSource implements TokenSource {
 
         @Override
         public Token nextToken() {
-                if (!buffer.isEmpty()) {
-                        return buffer.removeFirst();
-                }
-                var token = delegate.nextToken();
-                if (isIdentifier(token)) {
-                        seenId = true;
-                } else if (seenId && isPlusOrTransitiveClosure(token)) {
-                        if (peekForTransitiveClosure()) {
+                boolean fromStream = buffer.isEmpty();
+                var token = fromStream ? delegate.nextToken() : buffer.removeFirst();
+                if (seenId) {
+                        if (fromStream && isPlusOrTransitiveClosure(token) && peekForTransitiveClosure()) {
                                 token.setType(InternalProblemParser.RULE_TRANSITIVE_CLOSURE);
+                        } else if (lastVisible && isQualifiedNameSeparator(token)) {
+                                token.setType(InternalProblemParser.RULE_QUALIFIED_NAME_SEPARATOR);
                         }
-                } else if (isVisibleToken(token)) {
-                        seenId = false;
+                }
+                lastVisible = isVisibleToken(token);
+                if (lastVisible) {
+                        seenId = isIdentifier(token);
                 }
                 return token;
         }
@@ -76,6 +78,10 @@ public class ProblemTokenSource implements TokenSource {
                 return token.getType() == InternalProblemParser.PlusSign;
         }
 
+        protected boolean isQualifiedNameSeparator(Token token) {
+                return token.getType() == InternalProblemParser.ColonColon;
+        }
+
         protected boolean isVisibleToken(Token token) {
                 int tokenId = token.getType();
                 return tokenId != InternalProblemParser.RULE_WS && tokenId != InternalProblemParser.RULE_SL_COMMENT &&
@@ -87,11 +93,16 @@ public class ProblemTokenSource implements TokenSource {
                 if (token.getType() != InternalProblemParser.LeftParenthesis) {
                         return false;
                 }
+                boolean allowFullyQualifiedName = true;
                 while (true) {
                         token = peekWithSkipWhitespace();
+                        if (allowFullyQualifiedName && token.getType() == InternalProblemParser.ColonColon) {
+                                token = peekWithSkipWhitespace();
+                        }
                         if (!isIdentifier(token)) {
                                 return false;
                         }
+                        allowFullyQualifiedName = false;
                         token = peekWithSkipWhitespace();
                         switch (token.getType()) {
                         case InternalProblemParser.Comma:
@@ -112,11 +123,6 @@ public class ProblemTokenSource implements TokenSource {
 
         protected Token peekToken() {
                 var token = delegate.nextToken();
-                if (isIdentifier(token)) {
-                        seenId = true;
-                } else if (isVisibleToken(token)) {
-                        seenId = false;
-                }
                 buffer.addLast(token);
                 return token;
         }