mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-04 18:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix server panic when undoing an edit (#14010)

Browse source
This commit is contained in:
Micha Reiser 2024-11-01 08:16:53 +01:00 • committed by GitHub
parent b8acadd6a2
commit 20b8a43017
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 74 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

81
crates/ruff_server/src/edit/text_document.rs
View file

@ -94,7 +94,6 @@ impl TextDocument {
return;
}
let old_contents = self.contents().to_string();
let mut new_contents = self.contents().to_string();
let mut active_index = self.index().clone();
@ -115,15 +114,11 @@ impl TextDocument {
new_contents = change;
}
if new_contents != old_contents {
active_index = LineIndex::from_source_text(&new_contents);
}
active_index = LineIndex::from_source_text(&new_contents);
}
self.modify_with_manual_index(|contents, version, index| {
if contents != &new_contents {
*index = active_index;
}
*index = active_index;
*contents = new_contents;
*version = new_version;
});
@ -153,3 +148,75 @@ impl TextDocument {
debug_assert!(self.version >= old_version);
}
}
#[cfg(test)]
mod tests {
use crate::{PositionEncoding, TextDocument};
use lsp_types::{Position, TextDocumentContentChangeEvent};
#[test]
fn redo_edit() {
let mut document = TextDocument::new(
r#""""
测试comment
一些测试内容
"""
import click
@click.group()
def interface():
pas
"#
.to_string(),
0,
);
// Add an `s`, remove it again (back to the original code), and then re-add the `s`
document.apply_changes(
vec![
TextDocumentContentChangeEvent {
range: Some(lsp_types::Range::new(
Position::new(9, 7),
Position::new(9, 7),
)),
range_length: Some(0),
text: "s".to_string(),
},
TextDocumentContentChangeEvent {
range: Some(lsp_types::Range::new(
Position::new(9, 7),
Position::new(9, 8),
)),
range_length: Some(1),
text: String::new(),
},
TextDocumentContentChangeEvent {
range: Some(lsp_types::Range::new(
Position::new(9, 7),
Position::new(9, 7),
)),
range_length: Some(0),
text: "s".to_string(),
},
],
1,
PositionEncoding::UTF16,
);
assert_eq!(
&document.contents,
r#""""
测试comment
一些测试内容
"""
import click
@click.group()
def interface():
pass
"#
);
}
}