[refactor] Refactor directories

Author: vityaman

.clang-tidy

@@ -1,12 +1,13 @@
 ---
-Checks: '*,\
+Checks: |
+  *,
   -llvmlibc-implementation-in-namespace,
   -llvmlibc-restrict-system-libc-headers,
   -llvmlibc-callee-namespace,
   -llvmlibc-restrict-system-libc-headers,
   -fuchsia-trailing-return,
   -misc-no-recursion,
-  -altera-unroll-loops'
+  -altera-unroll-loops
 WarningsAsErrors: '*'
 HeaderFilterRegex: ".*"
 FormatStyle: .clang-format

Makefile

@@ -1,14 +1,14 @@
 configure:
 	CXX=/usr/bin/clang++ cmake -S . -B build
 
-compile: configure
+compile:
 	cmake --build build
 	cp build/compile_commands.json compile_commands.json
 
-test: compile
+test:
 	(cd build; ctest)
 
-run: compile
+run:
 	(./build/repl-sql-autocomplete)
 
 clean:

src/antlr-c3/CodeCompletionCore.cpp src/antlr/c3/CodeCompletionCore.cpp

@@ -42,19 +42,13 @@ auto complete(const std::string& text, int& length) -> Completions {
       | std::ranges::to<std::vector>();
 }
 
-auto hint(const std::string& text, int& length, Color& color) -> Hints {
-  color = Color::BLUE;
-  return candidates(text.substr(text.size() - length));
-}
-
 } // namespace
 
 REPL::REPL() {
   constexpr auto MaxHintRows = 4;
   constexpr auto MaxHistorySize = 32;
 
   replxx.set_completion_callback(complete);
-  replxx.set_hint_callback(hint);
   replxx.set_max_hint_rows(MaxHintRows);
   replxx.set_max_history_size(MaxHistorySize);
 }
@@ -74,4 +68,4 @@ auto REPL::out() -> std::ostream& {
   return std::cout;
 }
 
-} // namespace repl
+} // namespace repl

src/antlr-c3/CodeCompletionCore.hpp src/antlr/c3/CodeCompletionCore.hpp

@@ -17,4 +17,4 @@ class REPL {
   replxx::Replxx replxx;
 };
 
-} // namespace repl
+} // namespace repl

src/repl.cpp

@@ -1,7 +1,7 @@
 #include "suggest.hpp"
 #include "sql.hpp"
 
-#include "antlr-c3/CodeCompletionCore.hpp"
+#include "antlr/c3/CodeCompletionCore.hpp"
 
 #include <cassert>
 #include <cstddef>
@@ -26,14 +26,6 @@ auto Suggest(const std::string& prefix) -> std::vector<std::string> {
   }
 
   size_t caretTokenIndex = pipeline.tokens->size() - 2;
-  {
-    std::cerr << "tokens: " << std::endl;
-    for (std::size_t i = 0; i < pipeline.tokens->size(); ++i) {
-      std::cerr << " " << i << ": " << pipeline.tokens->get(i)->toString()
-                << std::endl;
-    }
-    std::cerr << "caretTokenIndex:" << caretTokenIndex << std::endl;
-  }
 
   antlr4::ParserRuleContext* context = nullptr;
   size_t timeoutMS = 200;
@@ -42,27 +34,7 @@ auto Suggest(const std::string& prefix) -> std::vector<std::string> {
       = engine.collectCandidates(caretTokenIndex, context, timeoutMS, cancel);
   assert(!candidates.cancelled);
 
-  std::vector<std::string> result;
-  for (const auto& [token, following] : candidates.tokens) {
-    const auto& vocabulary = pipeline.lexer->getVocabulary();
-    std::cerr << "token: " << vocabulary.getDisplayName(token) << ""
-              << std::endl;
-    for (const auto next : following) {
-      std::cerr << "  next -> symbolic: '" << vocabulary.getSymbolicName(next) << "'"
-                << ", literal: '" << vocabulary.getLiteralName(next) << "'"
-                << std::endl;
-    }
-  }
-  for (const auto& [index, candidate] : candidates.rules) {
-    for (const auto& rule : candidate.ruleList) {
-      const auto& parser = *pipeline.parser;
-      std::cerr << "index: " << index //
-                << ", startTokenIndex: " << candidate.startTokenIndex //
-                << ", rule: " << parser.getRuleNames()[rule] //
-                << std::endl;
-    }
-  }
-  return result;
+  return {};
 }
 
 } // namespace repl