Skip to content

Commit d1d0678

Browse files
authored
[red-knot] Remove notebook support from the server (#13040)
## Summary This PR removes notebook sync support from server capabilities because it isn't tested, it'll be added back once we actually add full support for notebook.
1 parent 93f9023 commit d1d0678

File tree

1 file changed

+14
-27
lines changed

1 file changed

+14
-27
lines changed

crates/red_knot_server/src/server.rs

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
use std::num::NonZeroUsize;
44
use std::panic::PanicInfo;
55

6-
use lsp_server as lsp;
7-
use lsp_types as types;
6+
use lsp_server::Message;
87
use lsp_types::{
9-
ClientCapabilities, DiagnosticOptions, NotebookCellSelector, NotebookDocumentSyncOptions,
10-
NotebookSelector, TextDocumentSyncCapability, TextDocumentSyncOptions,
8+
ClientCapabilities, DiagnosticOptions, DiagnosticServerCapabilities, MessageType,
9+
ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncOptions, Url,
1110
};
1211

1312
use self::connection::{Connection, ConnectionInitializer};
@@ -74,7 +73,7 @@ impl Server {
7473
init_params.client_info.as_ref(),
7574
);
7675

77-
let mut workspace_for_url = |url: lsp_types::Url| {
76+
let mut workspace_for_url = |url: Url| {
7877
let Some(workspace_settings) = workspace_settings.as_mut() else {
7978
return (url, ClientSettings::default());
8079
};
@@ -93,7 +92,7 @@ impl Server {
9392
}).collect())
9493
.or_else(|| {
9594
tracing::warn!("No workspace(s) were provided during initialization. Using the current working directory as a default workspace...");
96-
let uri = types::Url::from_file_path(std::env::current_dir().ok()?).ok()?;
95+
let uri = Url::from_file_path(std::env::current_dir().ok()?).ok()?;
9796
Some(vec![workspace_for_url(uri)])
9897
})
9998
.ok_or_else(|| {
@@ -149,7 +148,7 @@ impl Server {
149148
try_show_message(
150149
"The Ruff language server exited with a panic. See the logs for more details."
151150
.to_string(),
152-
lsp_types::MessageType::ERROR,
151+
MessageType::ERROR,
153152
)
154153
.ok();
155154
}));
@@ -182,9 +181,9 @@ impl Server {
182181
break;
183182
}
184183
let task = match msg {
185-
lsp::Message::Request(req) => api::request(req),
186-
lsp::Message::Notification(notification) => api::notification(notification),
187-
lsp::Message::Response(response) => scheduler.response(response),
184+
Message::Request(req) => api::request(req),
185+
Message::Notification(notification) => api::notification(notification),
186+
Message::Response(response) => scheduler.response(response),
188187
};
189188
scheduler.dispatch(task);
190189
}
@@ -206,24 +205,12 @@ impl Server {
206205
.unwrap_or_default()
207206
}
208207

209-
fn server_capabilities(position_encoding: PositionEncoding) -> types::ServerCapabilities {
210-
types::ServerCapabilities {
208+
fn server_capabilities(position_encoding: PositionEncoding) -> ServerCapabilities {
209+
ServerCapabilities {
211210
position_encoding: Some(position_encoding.into()),
212-
diagnostic_provider: Some(types::DiagnosticServerCapabilities::Options(
213-
DiagnosticOptions {
214-
identifier: Some(crate::DIAGNOSTIC_NAME.into()),
215-
..Default::default()
216-
},
217-
)),
218-
notebook_document_sync: Some(types::OneOf::Left(NotebookDocumentSyncOptions {
219-
save: Some(false),
220-
notebook_selector: [NotebookSelector::ByCells {
221-
notebook: None,
222-
cells: vec![NotebookCellSelector {
223-
language: "python".to_string(),
224-
}],
225-
}]
226-
.to_vec(),
211+
diagnostic_provider: Some(DiagnosticServerCapabilities::Options(DiagnosticOptions {
212+
identifier: Some(crate::DIAGNOSTIC_NAME.into()),
213+
..Default::default()
227214
})),
228215
text_document_sync: Some(TextDocumentSyncCapability::Options(
229216
TextDocumentSyncOptions {

0 commit comments

Comments
 (0)