oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "settings: Remove auxiliary Content types where possible (#16744)" (#17768)

Browse Source 
This breaks setting `{"scrollbar": {"show":"never"}}`
Release Notes:

- N/A
This commit is contained in:
Conrad Irwin
2024-09-12 14:46:08 -04:00
committed by GitHub
parent 3b37db4140
commit 4d26f83d23
49 changed files with 686 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/vim/src/normal/paste.rs
+6 -6
View File
@@ -291,7 +291,7 @@ mod test {
cx.update_global(|store: &mut SettingsStore, cx| {
store.update_user_settings::<VimSettings>(cx, |s| {
s.use_system_clipboard = UseSystemClipboard::Never
s.use_system_clipboard = Some(UseSystemClipboard::Never)
});
});
@@ -327,7 +327,7 @@ mod test {
cx.update_global(|store: &mut SettingsStore, cx| {
store.update_user_settings::<VimSettings>(cx, |s| {
s.use_system_clipboard = UseSystemClipboard::OnYank
s.use_system_clipboard = Some(UseSystemClipboard::OnYank)
});
});
@@ -584,7 +584,7 @@ mod test {
cx.update_global(|store: &mut SettingsStore, cx| {
store.update_user_settings::<VimSettings>(cx, |s| {
s.use_system_clipboard = UseSystemClipboard::Never
s.use_system_clipboard = Some(UseSystemClipboard::Never)
});
});
@@ -630,7 +630,7 @@ mod test {
cx.update_global(|store: &mut SettingsStore, cx| {
store.update_user_settings::<VimSettings>(cx, |s| {
s.use_system_clipboard = UseSystemClipboard::Never
s.use_system_clipboard = Some(UseSystemClipboard::Never)
});
});
@@ -659,7 +659,7 @@ mod test {
cx.update_global(|store: &mut SettingsStore, cx| {
store.update_user_settings::<VimSettings>(cx, |s| {
s.use_system_clipboard = UseSystemClipboard::Never
s.use_system_clipboard = Some(UseSystemClipboard::Never)
});
});
@@ -707,7 +707,7 @@ mod test {
cx.update_global(|store: &mut SettingsStore, cx| {
store.update_user_settings::<VimSettings>(cx, |s| {
s.use_system_clipboard = UseSystemClipboard::Never
s.use_system_clipboard = Some(UseSystemClipboard::Never)
});
});
crates/vim/src/normal/scroll.rs
+1 -1
View File
@@ -294,7 +294,7 @@ mod test {
cx.update_global(|store: &mut SettingsStore, cx| {
store.update_user_settings::<EditorSettings>(cx, |s| {
s.scroll_beyond_last_line = ScrollBeyondLastLine::Off
s.scroll_beyond_last_line = Some(ScrollBeyondLastLine::Off)
});
});
crates/vim/src/normal/search.rs
+2 -2
View File
@@ -542,7 +542,7 @@ mod test {
let mut cx = VimTestContext::new(cx, true).await;
cx.update_global(|store: &mut SettingsStore, cx| {
store.update_user_settings::<EditorSettings>(cx, |s| s.search_wrap = false);
store.update_user_settings::<EditorSettings>(cx, |s| s.search_wrap = Some(false));
});
cx.set_state("ˇhi\nhigh\nhi\n", Mode::Normal);
@@ -655,7 +655,7 @@ mod test {
// check that searching with unable search wrap
cx.update_global(|store: &mut SettingsStore, cx| {
store.update_user_settings::<EditorSettings>(cx, |s| s.search_wrap = false);
store.update_user_settings::<EditorSettings>(cx, |s| s.search_wrap = Some(false));
});
cx.set_state("aa\nbˇb\ncc\ncc\ncc\n", Mode::Normal);
cx.simulate_keystrokes("/ c c enter");