Rename Client to ClientOld

MichaReiser · MichaReiser · commit 28c3a2750fa7 · 2025-05-22T21:12:32.000+02:00
diff --git a/crates/ty_server/src/server.rs b/crates/ty_server/src/server.rs
@@ -16,7 +16,7 @@ use crate::PositionEncoding;
 use crate::session::{AllSettings, ClientSettings, Experimental, Session};
 
 mod api;
-mod client;
+mod client_old;
 mod connection;
 mod main_loop;
 mod schedule;
diff --git a/crates/ty_server/src/server/api.rs b/crates/ty_server/src/server/api.rs
@@ -17,7 +17,7 @@ use notifications as notification;
 use requests as request;
 use ruff_db::panic::PanicError;
 
-use super::{Result, client::Responder, schedule::BackgroundSchedule};
+use super::{Result, client_old::Responder, schedule::BackgroundSchedule};
 
 pub(super) fn request(req: server::Request) -> Task {
     let id = req.id.clone();
diff --git a/crates/ty_server/src/server/api/diagnostics.rs b/crates/ty_server/src/server/api/diagnostics.rs
@@ -2,7 +2,7 @@ use lsp_server::ErrorCode;
 use lsp_types::{PublishDiagnosticsParams, Url, notification::PublishDiagnostics};
 
 use crate::server::Result;
-use crate::server::client::Notifier;
+use crate::server::client_old::Notifier;
 
 use super::LSPResult;
 
diff --git a/crates/ty_server/src/server/api/notifications/did_change.rs b/crates/ty_server/src/server/api/notifications/did_change.rs
@@ -7,7 +7,7 @@ use ty_project::watch::ChangeEvent;
 use crate::server::Result;
 use crate::server::api::LSPResult;
 use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::client::{Notifier, Requester};
+use crate::server::client_old::{Notifier, Requester};
 use crate::session::Session;
 use crate::system::{AnySystemPath, url_to_any_system_path};
 
diff --git a/crates/ty_server/src/server/api/notifications/did_change_watched_files.rs b/crates/ty_server/src/server/api/notifications/did_change_watched_files.rs
@@ -1,7 +1,7 @@
 use crate::server::Result;
 use crate::server::api::LSPResult;
 use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::client::{Notifier, Requester};
+use crate::server::client_old::{Notifier, Requester};
 use crate::server::schedule::Task;
 use crate::session::Session;
 use crate::system::{AnySystemPath, url_to_any_system_path};
diff --git a/crates/ty_server/src/server/api/notifications/did_close.rs b/crates/ty_server/src/server/api/notifications/did_close.rs
@@ -7,7 +7,7 @@ use crate::server::Result;
 use crate::server::api::LSPResult;
 use crate::server::api::diagnostics::clear_diagnostics;
 use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::client::{Notifier, Requester};
+use crate::server::client_old::{Notifier, Requester};
 use crate::session::Session;
 use crate::system::{AnySystemPath, url_to_any_system_path};
 
diff --git a/crates/ty_server/src/server/api/notifications/did_close_notebook.rs b/crates/ty_server/src/server/api/notifications/did_close_notebook.rs
@@ -6,7 +6,7 @@ use ty_project::watch::ChangeEvent;
 use crate::server::Result;
 use crate::server::api::LSPResult;
 use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::client::{Notifier, Requester};
+use crate::server::client_old::{Notifier, Requester};
 use crate::session::Session;
 use crate::system::{AnySystemPath, url_to_any_system_path};
 
diff --git a/crates/ty_server/src/server/api/notifications/did_open.rs b/crates/ty_server/src/server/api/notifications/did_open.rs
@@ -7,7 +7,7 @@ use ty_project::watch::ChangeEvent;
 use crate::TextDocument;
 use crate::server::Result;
 use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::client::{Notifier, Requester};
+use crate::server::client_old::{Notifier, Requester};
 use crate::session::Session;
 use crate::system::{AnySystemPath, url_to_any_system_path};
 
diff --git a/crates/ty_server/src/server/api/notifications/did_open_notebook.rs b/crates/ty_server/src/server/api/notifications/did_open_notebook.rs
@@ -9,7 +9,7 @@ use crate::document::NotebookDocument;
 use crate::server::Result;
 use crate::server::api::LSPResult;
 use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::client::{Notifier, Requester};
+use crate::server::client_old::{Notifier, Requester};
 use crate::session::Session;
 use crate::system::{AnySystemPath, url_to_any_system_path};
 
diff --git a/crates/ty_server/src/server/api/requests/completion.rs b/crates/ty_server/src/server/api/requests/completion.rs
@@ -9,7 +9,7 @@ use ty_project::ProjectDatabase;
 use crate::DocumentSnapshot;
 use crate::document::PositionExt;
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
-use crate::server::client::Notifier;
+use crate::server::client_old::Notifier;
 
 pub(crate) struct CompletionRequestHandler;
 
diff --git a/crates/ty_server/src/server/api/requests/diagnostic.rs b/crates/ty_server/src/server/api/requests/diagnostic.rs
@@ -10,7 +10,7 @@ use lsp_types::{
 use crate::PositionEncoding;
 use crate::document::{FileRangeExt, ToRangeExt};
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
-use crate::server::{Result, client::Notifier};
+use crate::server::{Result, client_old::Notifier};
 use crate::session::DocumentSnapshot;
 use ruff_db::diagnostic::{Annotation, Severity, SubDiagnostic};
 use ruff_db::files::FileRange;
diff --git a/crates/ty_server/src/server/api/requests/goto_type_definition.rs b/crates/ty_server/src/server/api/requests/goto_type_definition.rs
@@ -9,7 +9,7 @@ use ty_project::ProjectDatabase;
 use crate::DocumentSnapshot;
 use crate::document::{PositionExt, ToLink};
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
-use crate::server::client::Notifier;
+use crate::server::client_old::Notifier;
 
 pub(crate) struct GotoTypeDefinitionRequestHandler;
 
diff --git a/crates/ty_server/src/server/api/requests/hover.rs b/crates/ty_server/src/server/api/requests/hover.rs
@@ -3,7 +3,7 @@ use std::borrow::Cow;
 use crate::DocumentSnapshot;
 use crate::document::{PositionExt, ToRangeExt};
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
-use crate::server::client::Notifier;
+use crate::server::client_old::Notifier;
 use lsp_types::request::HoverRequest;
 use lsp_types::{HoverContents, HoverParams, MarkupContent, Url};
 use ruff_db::source::{line_index, source_text};
diff --git a/crates/ty_server/src/server/api/requests/inlay_hints.rs b/crates/ty_server/src/server/api/requests/inlay_hints.rs
@@ -3,7 +3,7 @@ use std::borrow::Cow;
 use crate::DocumentSnapshot;
 use crate::document::{RangeExt, TextSizeExt};
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
-use crate::server::client::Notifier;
+use crate::server::client_old::Notifier;
 use lsp_types::request::InlayHintRequest;
 use lsp_types::{InlayHintParams, Url};
 use ruff_db::source::{line_index, source_text};
diff --git a/crates/ty_server/src/server/api/traits.rs b/crates/ty_server/src/server/api/traits.rs
@@ -1,6 +1,6 @@
 //! A stateful LSP implementation that calls into the ty API.
 
-use crate::server::client::{Notifier, Requester};
+use crate::server::client_old::{Notifier, Requester};
 use crate::session::{DocumentSnapshot, Session};
 
 use lsp_types::notification::Notification as LSPNotification;
diff --git a/crates/ty_server/src/server/client_old.rs b/crates/ty_server/src/server/client_old.rs
@@ -8,7 +8,7 @@ use super::{ClientSender, schedule::Task};
 
 type ResponseBuilder = Box<dyn FnOnce(lsp_server::Response) -> Task>;
 
-pub(crate) struct Client {
+pub(crate) struct ClientOld {
     notifier: Notifier,
     responder: Responder,
     pub(super) requester: Requester,
@@ -26,7 +26,7 @@ pub(crate) struct Requester {
     response_handlers: FxHashMap<lsp_server::RequestId, ResponseBuilder>,
 }
 
-impl Client {
+impl ClientOld {
     pub(super) fn new(sender: ClientSender) -> Self {
         Self {
             notifier: Notifier(sender.clone()),
diff --git a/crates/ty_server/src/server/schedule.rs b/crates/ty_server/src/server/schedule.rs
@@ -12,7 +12,7 @@ use self::{
     thread::ThreadPriority,
 };
 
-use super::{ClientSender, client::Client};
+use super::{ClientSender, client_old::ClientOld};
 
 /// The event loop thread is actually a secondary thread that we spawn from the
 /// _actual_ main thread. This secondary thread has a larger stack size
@@ -33,7 +33,7 @@ pub(crate) fn spawn_main_loop(
 }
 
 pub(crate) struct Scheduler {
-    client: Client,
+    client: ClientOld,
     fmt_pool: thread::Pool,
     background_pool: thread::Pool,
 }
@@ -44,7 +44,7 @@ impl Scheduler {
         Self {
             fmt_pool: thread::Pool::new(NonZeroUsize::try_from(FMT_THREADS).unwrap()),
             background_pool: thread::Pool::new(worker_threads),
-            client: Client::new(sender),
+            client: ClientOld::new(sender),
         }
     }
 
diff --git a/crates/ty_server/src/server/schedule/task.rs b/crates/ty_server/src/server/schedule/task.rs
@@ -2,7 +2,7 @@ use lsp_server::RequestId;
 use serde::Serialize;
 
 use crate::{
-    server::client::{Notifier, Requester, Responder},
+    server::client_old::{Notifier, Requester, Responder},
     session::Session,
 };
 
