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

Don't use function_name in vim tests

Browse source
This commit is contained in:
Conrad Irwin 2023-10-25 23:24:17 +02:00
parent 4f859e0253
commit ffcec011f8
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/vim/src/test/neovim_backed_test_context.rs
View file

@ -1,7 +1,10 @@
use editor::scroll::VERTICAL_SCROLL_MARGIN; use editor::scroll::VERTICAL_SCROLL_MARGIN;
use indoc::indoc; use indoc::indoc;
use settings::SettingsStore; use settings::SettingsStore;
use std::ops::{Deref, DerefMut}; use std::{
ops::{Deref, DerefMut},
panic, thread,
};
use collections::{HashMap, HashSet}; use collections::{HashMap, HashSet};
use gpui::{geometry::vector::vec2f, ContextHandle}; use gpui::{geometry::vector::vec2f, ContextHandle};
@ -59,12 +62,22 @@ pub struct NeovimBackedTestContext<'a> {
impl<'a> NeovimBackedTestContext<'a> { impl<'a> NeovimBackedTestContext<'a> {
pub async fn new(cx: &'a mut gpui::TestAppContext) -> NeovimBackedTestContext<'a> { pub async fn new(cx: &'a mut gpui::TestAppContext) -> NeovimBackedTestContext<'a> {
let function_name = cx.function_name.clone(); // rust stores the name of the test on the current thread.
let cx = VimTestContext::new(cx, true).await; // We use this to automatically name a file that will store
// the neovim connection's requests/responses so that we can
// run without neovim on CI.
let thread = thread::current();
let test_name = thread
.name()
.expect("thread is not named")
.split(":")
.last()
.unwrap()
.to_string();
Self { Self {
cx, cx: VimTestContext::new(cx, true).await,
exemptions: Default::default(), exemptions: Default::default(),
neovim: NeovimConnection::new(function_name).await, neovim: NeovimConnection::new(test_name).await,
last_set_state: None, last_set_state: None,
recent_keystrokes: Default::default(), recent_keystrokes: Default::default(),