e239b0d32c
## Summary ### Preamble completeness check - `is_preamble_complete()` in `scan.cpp`: checks whether `#include`/`import`/`export module` directives in the preamble region are syntactically complete (have closing `>`/`"`/`;`) - `ensure_pch` defers PCH rebuild when preamble is incomplete (user still typing), reuses old PCH instead of failing ### #include / import completion - Master intercepts completion requests in `#include "..."` / `#include <...>` / `import ...` contexts before forwarding to worker - `complete_include()`: searches include paths (from compile args via `SearchConfig`) using `DirListingCache`, supports quoted/angled/multi-level paths - `complete_import()`: filters `path_to_module` map by prefix - Word boundary checks prevent false matches (e.g. `important` not treated as `import`) ### Detached compile task (rapid-edit fix) - Compile operations (`ensure_deps` + `send_stateful` + `publish_diagnostics`) run as detached tasks via `loop.schedule()`, independent of the LSP request coroutine chain - LSP `$/cancelRequest` can no longer kill in-flight compilations — previously, cancellation would destroy the `ensure_compiled` coroutine frame, leaving `doc.compiling` permanently set and hanging all subsequent requests - `CompileGuard` RAII ensures `doc.compiling` is always cleaned up even if the detached task fails - Stale feature requests (where `ast_dirty` became true after compile finished) are dropped before forwarding to worker ### Other fixes - `signal(SIGPIPE, SIG_IGN)` on POSIX: prevents server crash when LSP client disconnects mid-write - `CompilationUnitRef::file_path()` / `deps()`: null-check `FileEntryRef` to prevent segfault on invalid FileID - `stateless_worker.cpp`: log BuildPCH diagnostic errors for debuggability - Default worker counts changed to 2 stateful + 3 stateless - `logging_dir` default changed to `.clice/logs` in config ### Tests - 19 unit tests for `is_preamble_complete` (incomplete `#include`, `import`, `export module`, mixed cases) - Integration tests: `test_include_completion.py` (5 tests), `test_import_completion.py` (4 tests), `test_rapid_edit.py` (2 tests), `test_pch.py` (4 new tests) - Smoke test: `rapid_edit.jsonl` — recorded VSCode session with 40 rapid edits + 61 cancel requests ## Test plan - [x] Unit tests: 463 passed - [x] Integration tests: 104 passed - [x] Smoke test (rapid_edit.jsonl): PASS - [x] Manual VSCode testing with `#include <iostream>` project 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
100 lines
3.1 KiB
C++
100 lines
3.1 KiB
C++
#include "server/config.h"
|
|
|
|
#include <algorithm>
|
|
#include <thread>
|
|
|
|
#include "eventide/serde/toml.h"
|
|
#include "support/filesystem.h"
|
|
#include "support/logging.h"
|
|
|
|
namespace clice {
|
|
|
|
/// Replace all occurrences of ${workspace} with the workspace root.
|
|
static void substitute_workspace(std::string& value, const std::string& workspace_root) {
|
|
constexpr std::string_view placeholder = "${workspace}";
|
|
std::string::size_type pos = 0;
|
|
while((pos = value.find(placeholder, pos)) != std::string::npos) {
|
|
value.replace(pos, placeholder.size(), workspace_root);
|
|
pos += workspace_root.size();
|
|
}
|
|
}
|
|
|
|
void CliceConfig::apply_defaults(const std::string& workspace_root) {
|
|
auto cpu_count = std::thread::hardware_concurrency();
|
|
if(cpu_count == 0)
|
|
cpu_count = 4;
|
|
|
|
if(stateful_worker_count == 0) {
|
|
stateful_worker_count = 2;
|
|
}
|
|
if(stateless_worker_count == 0) {
|
|
stateless_worker_count = 3;
|
|
}
|
|
if(worker_memory_limit == 0) {
|
|
worker_memory_limit = 4ULL * 1024 * 1024 * 1024; // 4GB default
|
|
}
|
|
if(cache_dir.empty() && !workspace_root.empty()) {
|
|
cache_dir = path::join(workspace_root, ".clice");
|
|
}
|
|
|
|
if(index_dir.empty() && !cache_dir.empty()) {
|
|
index_dir = path::join(cache_dir, "index");
|
|
}
|
|
|
|
if(logging_dir.empty() && !cache_dir.empty()) {
|
|
logging_dir = path::join(cache_dir, "logs");
|
|
}
|
|
|
|
// Apply variable substitution to string fields
|
|
substitute_workspace(compile_commands_path, workspace_root);
|
|
substitute_workspace(cache_dir, workspace_root);
|
|
substitute_workspace(index_dir, workspace_root);
|
|
substitute_workspace(logging_dir, workspace_root);
|
|
}
|
|
|
|
std::optional<CliceConfig> CliceConfig::load(const std::string& path,
|
|
const std::string& workspace_root) {
|
|
auto content = fs::read(path);
|
|
if(!content) {
|
|
return std::nullopt;
|
|
}
|
|
|
|
auto result = eventide::serde::toml::parse<CliceConfig>(*content);
|
|
if(!result) {
|
|
LOG_WARN("Failed to parse config file {}", path);
|
|
return std::nullopt;
|
|
}
|
|
|
|
auto config = std::move(*result);
|
|
config.apply_defaults(workspace_root);
|
|
|
|
LOG_INFO("Loaded config from {}", path);
|
|
return config;
|
|
}
|
|
|
|
CliceConfig CliceConfig::load_from_workspace(const std::string& workspace_root) {
|
|
if(!workspace_root.empty()) {
|
|
// Try standard config file locations
|
|
for(auto* name: {"clice.toml", ".clice/config.toml"}) {
|
|
auto config_path = path::join(workspace_root, name);
|
|
if(llvm::sys::fs::exists(config_path)) {
|
|
auto config = load(config_path, workspace_root);
|
|
if(config)
|
|
return std::move(*config);
|
|
}
|
|
}
|
|
}
|
|
|
|
// No config file found; use defaults
|
|
CliceConfig config;
|
|
config.apply_defaults(workspace_root);
|
|
LOG_INFO(
|
|
"No clice.toml found, using default configuration " "(stateful={}, stateless={}, memory_limit={}MB)",
|
|
config.stateful_worker_count,
|
|
config.stateless_worker_count,
|
|
config.worker_memory_limit / (1024 * 1024));
|
|
return config;
|
|
}
|
|
|
|
} // namespace clice
|