1818namespace clice {
1919
2020namespace protocol = eventide::ipc::protocol;
21+ namespace lsp = eventide::ipc::lsp;
22+ namespace refl = eventide::refl;
2123using et::ipc::RequestResult;
2224using RequestContext = et::ipc::JsonPeer::RequestContext;
2325
2426MasterServer::MasterServer (et::event_loop& loop, et::ipc::JsonPeer& peer, std::string self_path) :
2527 loop (loop), peer(peer), pool(loop), self_path(std::move(self_path)) {}
2628
2729std::string MasterServer::uri_to_path (const std::string& uri) {
28- namespace lsp = eventide::ipc::lsp;
2930 auto parsed = lsp::URI::parse (uri);
3031 if (parsed.has_value ()) {
3132 auto path = parsed->file_path ();
@@ -221,7 +222,7 @@ et::task<bool> MasterServer::ensure_compiled(std::uint32_t path_id, const std::s
221222// Forwarding helpers
222223// =========================================================================
223224
224- using serde_raw = eventide ::serde::RawValue;
225+ using serde_raw = et ::serde::RawValue;
225226
226227template <typename WorkerParams>
227228MasterServer::RawResult MasterServer::forward_stateful (const std::string& uri) {
@@ -241,9 +242,8 @@ MasterServer::RawResult MasterServer::forward_stateful(const std::string& uri) {
241242}
242243
243244template <typename WorkerParams>
244- MasterServer::RawResult
245- MasterServer::forward_stateful (const std::string& uri,
246- const eventide::ipc::protocol::Position& position) {
245+ MasterServer::RawResult MasterServer::forward_stateful (const std::string& uri,
246+ const protocol::Position& position) {
247247 auto path = uri_to_path (uri);
248248 auto path_id = path_pool.intern (path);
249249
@@ -255,9 +255,7 @@ MasterServer::RawResult
255255
256256 auto doc_it = documents.find (path_id);
257257 if (doc_it != documents.end ()) {
258- using eventide::ipc::lsp::PositionEncoding;
259- using eventide::ipc::lsp::PositionMapper;
260- PositionMapper mapper (doc_it->second .text , PositionEncoding::UTF16);
258+ lsp::PositionMapper mapper (doc_it->second .text , lsp::PositionEncoding::UTF16);
261259 wp.offset = mapper.to_offset (position);
262260 }
263261
@@ -268,9 +266,8 @@ MasterServer::RawResult
268266}
269267
270268template <typename WorkerParams>
271- MasterServer::RawResult
272- MasterServer::forward_stateless (const std::string& uri,
273- const eventide::ipc::protocol::Position& position) {
269+ MasterServer::RawResult MasterServer::forward_stateless (const std::string& uri,
270+ const protocol::Position& position) {
274271 auto path = uri_to_path (uri);
275272 auto path_id = path_pool.intern (path);
276273
@@ -280,9 +277,7 @@ MasterServer::RawResult
280277
281278 auto & doc = doc_it->second ;
282279
283- using eventide::ipc::lsp::PositionEncoding;
284- using eventide::ipc::lsp::PositionMapper;
285- PositionMapper mapper (doc.text , PositionEncoding::UTF16);
280+ lsp::PositionMapper mapper (doc.text , lsp::PositionEncoding::UTF16);
286281
287282 WorkerParams wp;
288283 wp.path = path;
@@ -347,18 +342,16 @@ void MasterServer::register_handlers() {
347342 return s;
348343 };
349344
350- namespace views = std::ranges::views;
351345 auto to_names = [&](auto names) {
352- return names | views::transform (lower_first) | std::ranges::to<std::vector>();
346+ return std::ranges::to<std::vector>(names | std::views::transform (lower_first) );
353347 };
354348
355349 sem_opts.legend = protocol::SemanticTokensLegend{
356- to_names (eventide:: refl::reflection<SymbolKind::Kind>::member_names),
357- to_names (eventide:: refl::reflection<SymbolModifiers::Kind>::member_names),
350+ to_names (refl::reflection<SymbolKind::Kind>::member_names),
351+ to_names (refl::reflection<SymbolModifiers::Kind>::member_names),
358352 };
359353 }
360- sem_opts.full =
361- protocol::variant<protocol::boolean, protocol::SemanticTokensFullDelta>{true };
354+ sem_opts.full = true ;
362355 result.capabilities .semantic_tokens_provider = std::move (sem_opts);
363356
364357 // Server info
@@ -465,9 +458,7 @@ void MasterServer::register_handlers() {
465458 // Incremental change: replace range
466459 auto & range = c.range ;
467460
468- using eventide::ipc::lsp::PositionMapper;
469- using eventide::ipc::lsp::PositionEncoding;
470- PositionMapper mapper (doc.text , PositionEncoding::UTF16);
461+ lsp::PositionMapper mapper (doc.text , lsp::PositionEncoding::UTF16);
471462 auto start = mapper.to_offset (range.start );
472463 auto end = mapper.to_offset (range.end );
473464 if (start <= doc.text .size () && end <= doc.text .size () && start <= end) {
0 commit comments