Skip to content

Commit 7103813

Browse files
committed
Basic notebook support
1 parent 6273b56 commit 7103813

File tree

16 files changed

+332
-319
lines changed

16 files changed

+332
-319
lines changed

crates/ty_server/src/capabilities.rs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use lsp_types::{
22
ClientCapabilities, CompletionOptions, DeclarationCapability, DiagnosticOptions,
33
DiagnosticServerCapabilities, HoverProviderCapability, InlayHintOptions,
4-
InlayHintServerCapabilities, MarkupKind, OneOf, RenameOptions,
5-
SelectionRangeProviderCapability, SemanticTokensFullOptions, SemanticTokensLegend,
6-
SemanticTokensOptions, SemanticTokensServerCapabilities, ServerCapabilities,
7-
SignatureHelpOptions, TextDocumentSyncCapability, TextDocumentSyncKind,
4+
InlayHintServerCapabilities, MarkupKind, NotebookCellSelector, NotebookSelector, OneOf,
5+
RenameOptions, SelectionRangeProviderCapability, SemanticTokensFullOptions,
6+
SemanticTokensLegend, SemanticTokensOptions, SemanticTokensServerCapabilities,
7+
ServerCapabilities, SignatureHelpOptions, TextDocumentSyncCapability, TextDocumentSyncKind,
88
TextDocumentSyncOptions, TypeDefinitionProviderCapability, WorkDoneProgressOptions,
99
};
1010

@@ -407,6 +407,16 @@ pub(crate) fn server_capabilities(
407407
selection_range_provider: Some(SelectionRangeProviderCapability::Simple(true)),
408408
document_symbol_provider: Some(OneOf::Left(true)),
409409
workspace_symbol_provider: Some(OneOf::Left(true)),
410+
notebook_document_sync: Some(OneOf::Left(lsp_types::NotebookDocumentSyncOptions {
411+
save: Some(false),
412+
notebook_selector: [NotebookSelector::ByCells {
413+
notebook: None,
414+
cells: vec![NotebookCellSelector {
415+
language: "python".to_string(),
416+
}],
417+
}]
418+
.to_vec(),
419+
})),
410420
..Default::default()
411421
}
412422
}

crates/ty_server/src/document.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,6 @@ impl DocumentKey {
8484
}
8585
}
8686

87-
pub(crate) fn as_opaque(&self) -> Option<&str> {
88-
match self {
89-
Self::Opaque(uri) => Some(uri),
90-
Self::File(_) => None,
91-
}
92-
}
93-
9487
/// Returns the corresponding [`AnySystemPath`] for this document key.
9588
///
9689
/// Note, calling this method on a `DocumentKey::Opaque` representing a cell document

0 commit comments

Comments
 (0)