## Summary - **Extract `Indexer` class** — owns all index state (ProjectIndex, MergedIndex shards, OpenFileIndex) and query methods (definition, references, call/type hierarchy, workspace symbol search) - **Extract `Compiler` class** — owns document state, PCH/PCM cache, compile argument resolution, header context, `ensure_compiled`, and worker forwarding - **MasterServer is now a pure LSP handler registration layer** (~700 lines, down from ~3200) - **`MergedIndexShard`** wraps `index::MergedIndex` with a lazily-cached PositionMapper; `OpenFileIndex` gains matching `find_occurrence()`/`find_relations()` APIs — callers get pre-converted LSP ranges directly - **Indexer returns typed values** (`vector<Location>`, `vector<CallHierarchyIncomingCall>`, etc.) instead of pre-serialized JSON, fixing the references handler from JSON string surgery to simple vector concatenation - **Fix**: duplicate `workspace/symbol` loop in the original code ## Test plan - [x] 465 unit tests pass - [x] 113 integration tests pass - [x] 2/2 smoke tests pass - [x] `clang-format` applied 🤖 Generated with [Claude Code](https://claude.com/claude-code) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Server-side C++ compilation orchestration (module & precompiled header builds) with LSP-integrated document handling. * **Improvements** * Deterministic, persistent, dependency-aware caching to avoid redundant rebuilds and speed up incremental work. * Better cross-file indexing and navigation, improved diagnostics and more reliable include/import-aware completions. * **Tests** * Unit tests updated to the unified worker query/build request shapes. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
288 lines
8.2 KiB
C++
288 lines
8.2 KiB
C++
#include <string>
|
|
#include <vector>
|
|
|
|
#include "test/test.h"
|
|
#include "eventide/serde/bincode/bincode.h"
|
|
#include "eventide/serde/serde/raw_value.h"
|
|
#include "server/protocol.h"
|
|
#include "server/worker_test_helpers.h"
|
|
|
|
namespace clice::testing {
|
|
|
|
namespace {
|
|
|
|
namespace et = eventide;
|
|
|
|
// ============================================================================
|
|
// Bincode Serialization Tests
|
|
// ============================================================================
|
|
|
|
TEST_SUITE(BincodeRoundTrip) {
|
|
|
|
TEST_CASE(CompileParamsRoundTrip) {
|
|
namespace bincode = eventide::serde::bincode;
|
|
|
|
worker::CompileParams params;
|
|
params.path = "/tmp/test.cpp";
|
|
params.version = 1;
|
|
params.text = "int main() { return 0; }";
|
|
params.directory = "/tmp";
|
|
params.arguments = {"clang++", "-c", "test.cpp"};
|
|
params.pch = {"", 0};
|
|
params.pcms = {};
|
|
|
|
auto bytes = bincode::to_bytes(params);
|
|
ASSERT_TRUE(bytes.has_value());
|
|
|
|
worker::CompileParams result;
|
|
auto status =
|
|
bincode::from_bytes(std::span<const std::byte>(bytes->data(), bytes->size()), result);
|
|
ASSERT_TRUE(status.has_value());
|
|
|
|
EXPECT_EQ(result.path, params.path);
|
|
EXPECT_EQ(result.version, params.version);
|
|
EXPECT_EQ(result.text, params.text);
|
|
EXPECT_EQ(result.directory, params.directory);
|
|
EXPECT_EQ(result.arguments.size(), params.arguments.size());
|
|
}
|
|
|
|
TEST_CASE(CompileResultRoundTrip) {
|
|
namespace bincode = eventide::serde::bincode;
|
|
|
|
worker::CompileResult result;
|
|
result.version = 1;
|
|
result.diagnostics = {}; // empty
|
|
result.memory_usage = 0;
|
|
|
|
auto bytes = bincode::to_bytes(result);
|
|
ASSERT_TRUE(bytes.has_value());
|
|
|
|
worker::CompileResult decoded;
|
|
auto status =
|
|
bincode::from_bytes(std::span<const std::byte>(bytes->data(), bytes->size()), decoded);
|
|
ASSERT_TRUE(status.has_value());
|
|
EXPECT_EQ(decoded.version, result.version);
|
|
}
|
|
|
|
}; // TEST_SUITE(BincodeRoundTrip)
|
|
|
|
// ============================================================================
|
|
// StatelessWorker Tests
|
|
// ============================================================================
|
|
|
|
TEST_SUITE(StatelessWorker) {
|
|
|
|
TEST_CASE(SpawnAndExit) {
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
// Close stdin pipe to signal worker to exit.
|
|
w.peer->close_output();
|
|
w.loop.schedule(w.peer->run());
|
|
w.loop.run();
|
|
}
|
|
|
|
TEST_CASE(BuildPCHRequest) {
|
|
TempDir tmp;
|
|
tmp.touch("test_pch.h", "#pragma once\nint pch_global = 42;\n");
|
|
auto hdr = tmp.path("test_pch.h");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> et::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::BuildPCH;
|
|
params.file = hdr;
|
|
params.directory = "/tmp";
|
|
params.arguments =
|
|
{"clang++", "-resource-dir", std::string(resource_dir()), "-x", "c++-header", hdr};
|
|
params.text = "#pragma once\nint pch_global = 42;\n";
|
|
params.output_path = tmp.path("test_pch.pch");
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
if(!result.has_value()) {
|
|
w.peer->close_output();
|
|
co_return;
|
|
}
|
|
EXPECT_TRUE(result.value().success);
|
|
EXPECT_FALSE(result.value().output_path.empty());
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
TEST_CASE(IndexRequest) {
|
|
TempDir tmp;
|
|
tmp.touch("test_index.cpp", "int indexed_var = 1;\n");
|
|
auto src = tmp.path("test_index.cpp");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> et::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::Index;
|
|
params.file = src;
|
|
params.directory = "/tmp";
|
|
params.arguments = make_args(src);
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
}; // TEST_SUITE(StatelessWorker)
|
|
|
|
// ============================================================================
|
|
// StatelessWorker Extended Tests
|
|
// ============================================================================
|
|
|
|
TEST_SUITE(StatelessWorkerExtended) {
|
|
|
|
TEST_CASE(BuildPCMRequest) {
|
|
TempDir tmp;
|
|
tmp.touch("test_module.cppm",
|
|
"export module test_module;\nexport int module_func() { return 1; }\n");
|
|
auto src = tmp.path("test_module.cppm");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> et::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::BuildPCM;
|
|
params.file = src;
|
|
params.directory = "/tmp";
|
|
params.arguments = {"clang++",
|
|
"-resource-dir",
|
|
std::string(resource_dir()),
|
|
"-std=c++20",
|
|
"--precompile",
|
|
src};
|
|
params.module_name = "test_module";
|
|
params.output_path = tmp.path("test_module.pcm");
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
TEST_CASE(CompletionRequest) {
|
|
std::string text = "int foo = 1;\nint bar = fo";
|
|
TempDir tmp;
|
|
tmp.touch("completion_test.cpp", text);
|
|
auto src = tmp.path("completion_test.cpp");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> et::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::Completion;
|
|
params.file = src;
|
|
params.version = 1;
|
|
params.text = text;
|
|
params.directory = "/tmp";
|
|
params.arguments = make_args(src);
|
|
params.offset = 25; // after "fo" in "int bar = fo" (13 + 12)
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
TEST_CASE(SignatureHelpRequest) {
|
|
std::string text = "void foo(int a, int b) {}\nint main() { foo(";
|
|
TempDir tmp;
|
|
tmp.touch("sighelp_test.cpp", text);
|
|
auto src = tmp.path("sighelp_test.cpp");
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> et::task<> {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::SignatureHelp;
|
|
params.file = src;
|
|
params.version = 1;
|
|
params.text = text;
|
|
params.directory = "/tmp";
|
|
params.arguments = make_args(src);
|
|
params.offset = 45; // after "foo(" (26 + 19)
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
// Should return signature help for foo(int a, int b).
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
TEST_CASE(MultipleStatelessRequests) {
|
|
TempDir tmp;
|
|
std::vector<std::string> paths;
|
|
for(int i = 0; i < 3; i++) {
|
|
auto name = "multi_index_" + std::to_string(i) + ".cpp";
|
|
auto text = "int idx_var_" + std::to_string(i) + " = " + std::to_string(i) + ";\n";
|
|
tmp.touch(name, text);
|
|
paths.push_back(tmp.path(name));
|
|
}
|
|
|
|
WorkerHandle w;
|
|
ASSERT_TRUE(w.spawn("stateless-worker"));
|
|
|
|
bool test_done = false;
|
|
|
|
w.run([&]() -> et::task<> {
|
|
// Send multiple index requests to test stateless worker handles them sequentially.
|
|
for(int i = 0; i < 3; i++) {
|
|
worker::BuildParams params;
|
|
params.kind = worker::BuildKind::Index;
|
|
params.file = paths[i];
|
|
params.directory = "/tmp";
|
|
params.arguments = make_args(paths[i]);
|
|
|
|
auto result = co_await w.peer->send_request(params);
|
|
EXPECT_TRUE(result.has_value());
|
|
}
|
|
test_done = true;
|
|
w.peer->close_output();
|
|
});
|
|
|
|
ASSERT_TRUE(test_done);
|
|
}
|
|
|
|
}; // TEST_SUITE(StatelessWorkerExtended)
|
|
|
|
} // namespace
|
|
|
|
} // namespace clice::testing
|