mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-29 21:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix some warnings and merge errors

Browse source
This commit is contained in:
K Simmons 2022-10-08 23:49:04 -07:00
parent 515c1ea123
commit f90b693ed5
2 changed files with 7631 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7630
Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

18
crates/vim/src/test_contexts/neovim_backed_test_context.rs
View file

@ -52,22 +52,6 @@ impl<'a> NeovimBackedTestContext<'a> {
self.exemptions.insert(initial_state, None);
}
pub fn add_keybinding_exemption<const COUNT: usize>(
&mut self,
keybinding: [&str; COUNT],
initial_state: &str,
) {
let initial_state = initial_state.to_string();
let exempted_keybindings = self
.exemptions
.entry(initial_state)
.or_insert(Some(Default::default()));
if let Some(exempted_bindings) = exempted_keybindings.as_mut() {
exempted_bindings.insert(format!("{keybinding:?}"));
}
}
pub async fn simulate_shared_keystroke(&mut self, keystroke_text: &str) {
let keystroke = Keystroke::parse(keystroke_text).unwrap();
@ -118,7 +102,7 @@ impl<'a> NeovimBackedTestContext<'a> {
.get_current_buf()
.await
.expect("Could not get neovim buffer");
let mut lines = self
let lines = self
.buffer_text()
.split('\n')
.map(|line| line.to_string())