Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tests relying on off-spec behavior

Browse source
This commit is contained in:
Mikayla 2023-09-29 12:19:58 -07:00
parent 4887ea3563
commit 31ff5bffd6
No known key found for this signature in database
1 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

54
crates/project/src/project.rs
View file

@ -2232,24 +2232,8 @@ impl Project {
.and_then(|m| m.get_mut(&language_server.server_id()))?; .and_then(|m| m.get_mut(&language_server.server_id()))?;
let previous_snapshot = buffer_snapshots.last()?; let previous_snapshot = buffer_snapshots.last()?;
let document_sync_kind = language_server let build_incremental_change = || {
.capabilities() buffer
.text_document_sync
.as_ref()
.and_then(|sync| match sync {
lsp::TextDocumentSyncCapability::Kind(kind) => Some(*kind),
lsp::TextDocumentSyncCapability::Options(options) => options.change,
});
let content_changes: Vec<_> = match document_sync_kind {
Some(lsp::TextDocumentSyncKind::FULL) => {
vec![lsp::TextDocumentContentChangeEvent {
range: None,
range_length: None,
text: next_snapshot.text(),
}]
}
Some(lsp::TextDocumentSyncKind::INCREMENTAL) => buffer
.edits_since::<(PointUtf16, usize)>( .edits_since::<(PointUtf16, usize)>(
previous_snapshot.snapshot.version(), previous_snapshot.snapshot.version(),
) )
@ -2268,8 +2252,38 @@ impl Project {
text: new_text, text: new_text,
} }
}) })
.collect(), .collect()
_ => continue, };
let document_sync_kind = language_server
.capabilities()
.text_document_sync
.as_ref()
.and_then(|sync| match sync {
lsp::TextDocumentSyncCapability::Kind(kind) => Some(*kind),
lsp::TextDocumentSyncCapability::Options(options) => options.change,
});
let content_changes: Vec<_> = match document_sync_kind {
Some(lsp::TextDocumentSyncKind::FULL) => {
vec![lsp::TextDocumentContentChangeEvent {
range: None,
range_length: None,
text: next_snapshot.text(),
}]
}
Some(lsp::TextDocumentSyncKind::INCREMENTAL) => build_incremental_change(),
_ => {
#[cfg(any(test, feature = "test-support"))]
{
build_incremental_change()
}
#[cfg(not(any(test, feature = "test-support")))]
{
continue;
}
}
}; };
let next_version = previous_snapshot.version + 1; let next_version = previous_snapshot.version + 1;