mike-lischke#136 Remove FollowSet cache dependency on ignoredTokens

Signed-off-by: vityaman <vityaman.dev@yandex.ru>
vityaman · Aug 12, 2024 · 5eaad7b · 5eaad7b
1 parent 5b8a86c
commit 5eaad7b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/ports/cpp/ci/test.sh b/ports/cpp/ci/test.sh
@@ -8,8 +8,6 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-exit 0 # https://github.com/mike-lischke/antlr4-c3/issues/136
-
 set -e
 
 TESTS="

diff --git a/ports/cpp/source/antlr4-c3/CodeCompletionCore.cpp b/ports/cpp/source/antlr4-c3/CodeCompletionCore.cpp
@@ -286,7 +286,7 @@ bool CodeCompletionCore::translateToRuleIndex(
  * @returns A list of toke types.
  */
 std::vector<size_t> CodeCompletionCore::getFollowingTokens(const antlr4::atn::Transition* transition
-) const {
+) {
   std::vector<size_t> result;
   std::vector<antlr4::atn::ATNState*> pipeline = {transition->target};
 
@@ -302,7 +302,7 @@ std::vector<size_t> CodeCompletionCore::getFollowingTokens(const antlr4::atn::Tr
       if (outgoing->getTransitionType() == antlr4::atn::TransitionType::ATOM) {
         if (!outgoing->isEpsilon()) {
           const auto list = outgoing->label();
-          if (list.size() == 1 && !ignoredTokens.contains(list.get(0))) {
+          if (list.size() == 1) {
             result.push_back(list.get(0));
             pipeline.push_back(outgoing->target);
           }
@@ -501,6 +501,7 @@ CodeCompletionCore::RuleEndStatus CodeCompletionCore::processRule(  // NOLINT
     antlr4::atn::RuleStopState* stop = atn->ruleToStopState[startState->ruleIndex];
     setsPerState[startState->stateNumber] = determineFollowSets(startState, stop);
   }
+
   const FollowSetsHolder& followSets = setsPerState[startState->stateNumber];
 
   // Get the token index where our rule starts from our (possibly filtered)

diff --git a/ports/cpp/source/antlr4-c3/CodeCompletionCore.hpp b/ports/cpp/source/antlr4-c3/CodeCompletionCore.hpp
@@ -225,7 +225,7 @@ class CodeCompletionCore {
 
   bool translateToRuleIndex(size_t index, RuleWithStartTokenList const& ruleWithStartTokenList);
 
-  std::vector<size_t> getFollowingTokens(const antlr4::atn::Transition* transition) const;
+  static std::vector<size_t> getFollowingTokens(const antlr4::atn::Transition* transition);
 
   FollowSetsHolder determineFollowSets(antlr4::atn::ATNState* start, antlr4::atn::ATNState* stop);
 

diff --git a/ports/cpp/test/expr/ExprTest.cpp b/ports/cpp/test/expr/ExprTest.cpp
@@ -98,9 +98,8 @@ TEST(SimpleExpressionParser, TypicalSetup) {
     auto candidates = completion.collectCandidates(0);
     EXPECT_THAT(Keys(candidates.tokens), UnorderedElementsAre(ExprLexer::VAR, ExprLexer::LET));
 
-    // NOTE: Behaviour differs from TypeScript version
-    EXPECT_THAT(candidates.tokens[ExprLexer::VAR], UnorderedElementsAre());
-    EXPECT_THAT(candidates.tokens[ExprLexer::LET], UnorderedElementsAre());
+    EXPECT_THAT(candidates.tokens[ExprLexer::VAR], ElementsAre(ExprLexer::ID, ExprLexer::EQUAL));
+    EXPECT_THAT(candidates.tokens[ExprLexer::LET], ElementsAre(ExprLexer::ID, ExprLexer::EQUAL));
   }
   {
     // 2) On the variable name ('c').