diff --git a/crates/ty_ide/src/completion.rs b/crates/ty_ide/src/completion.rs index 40064ceaccdc26..a8b93080b4f759 100644 --- a/crates/ty_ide/src/completion.rs +++ b/crates/ty_ide/src/completion.rs @@ -9,7 +9,6 @@ use ruff_text_size::{Ranged, TextRange, TextSize}; use crate::Db; use crate::find_node::covering_node; -#[derive(Debug, Clone)] pub struct Completion { pub label: String, } diff --git a/crates/ty_server/src/server.rs b/crates/ty_server/src/server.rs index 4846e0219c5ff5..1d1f78293de1c8 100644 --- a/crates/ty_server/src/server.rs +++ b/crates/ty_server/src/server.rs @@ -2,7 +2,7 @@ use self::schedule::spawn_main_loop; use crate::PositionEncoding; -use crate::session::{AllSettings, ClientSettings, Experimental, Session}; +use crate::session::{AllSettings, ClientSettings, Session}; use lsp_server::Connection; use lsp_types::{ ClientCapabilities, DiagnosticOptions, DiagnosticServerCapabilities, HoverProviderCapability, @@ -53,8 +53,7 @@ impl Server { let client_capabilities = init_params.capabilities; let position_encoding = Self::find_best_position_encoding(&client_capabilities); - let server_capabilities = - Self::server_capabilities(position_encoding, global_settings.experimental.as_ref()); + let server_capabilities = Self::server_capabilities(position_encoding); let connection = connection.initialize_finish( id, @@ -154,10 +153,7 @@ impl Server { .unwrap_or_default() } - fn server_capabilities( - position_encoding: PositionEncoding, - experimental: Option<&Experimental>, - ) -> ServerCapabilities { + fn server_capabilities(position_encoding: PositionEncoding) -> ServerCapabilities { ServerCapabilities { position_encoding: Some(position_encoding.into()), diagnostic_provider: Some(DiagnosticServerCapabilities::Options(DiagnosticOptions { @@ -177,12 +173,10 @@ impl Server { inlay_hint_provider: Some(lsp_types::OneOf::Right( InlayHintServerCapabilities::Options(InlayHintOptions::default()), )), - completion_provider: experimental - .is_some_and(Experimental::is_completions_enabled) - .then_some(lsp_types::CompletionOptions { - trigger_characters: Some(vec!['.'.to_string()]), - ..Default::default() - }), + completion_provider: Some(lsp_types::CompletionOptions { + trigger_characters: Some(vec!['.'.to_string()]), + ..Default::default() + }), ..Default::default() } } diff --git a/crates/ty_server/src/session.rs b/crates/ty_server/src/session.rs index f488ddecc987f1..f76138c13990c8 100644 --- a/crates/ty_server/src/session.rs +++ b/crates/ty_server/src/session.rs @@ -16,7 +16,6 @@ pub(crate) use self::capabilities::ResolvedClientCapabilities; pub use self::index::DocumentQuery; pub(crate) use self::settings::AllSettings; pub use self::settings::ClientSettings; -pub(crate) use self::settings::Experimental; use crate::document::{DocumentKey, DocumentVersion, NotebookDocument}; use crate::session::request_queue::RequestQueue; use crate::system::{AnySystemPath, LSPSystem}; diff --git a/crates/ty_server/src/session/settings.rs b/crates/ty_server/src/session/settings.rs index bbf2363f4afd66..ad33e15cca3bb6 100644 --- a/crates/ty_server/src/session/settings.rs +++ b/crates/ty_server/src/session/settings.rs @@ -7,35 +7,11 @@ use serde::Deserialize; /// Maps a workspace URI to its associated client settings. Used during server initialization. pub(crate) type WorkspaceSettingsMap = FxHashMap; -#[derive(Debug, Deserialize, Default)] -#[cfg_attr(test, derive(PartialEq, Eq))] -#[serde(rename_all = "camelCase")] -struct Completions { - enable: Option, -} - -#[derive(Debug, Deserialize, Default)] -#[cfg_attr(test, derive(PartialEq, Eq))] -#[serde(rename_all = "camelCase")] -pub(crate) struct Experimental { - completions: Option, -} - -impl Experimental { - /// Returns `true` if completions are enabled in the settings. - pub(crate) fn is_completions_enabled(&self) -> bool { - self.completions - .as_ref() - .is_some_and(|completions| completions.enable.unwrap_or_default()) - } -} - /// This is a direct representation of the settings schema sent by the client. #[derive(Debug, Deserialize, Default)] #[cfg_attr(test, derive(PartialEq, Eq))] #[serde(rename_all = "camelCase")] pub struct ClientSettings { - pub(crate) experimental: Option, // These settings are only needed for tracing, and are only read from the global configuration. // These will not be in the resolved settings. #[serde(flatten)]