Skip to content

Commit 51f57d8

Browse files
committed
Merge branch 'feat/vim_highlight_on_copy_config' of github.com:RustyDev69/zed into feat/vim_highlight_on_copy_config
2 parents fb50fe4 + 455cfd9 commit 51f57d8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

assets/settings/default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@
11291129
"use_system_clipboard": "always",
11301130
"use_multiline_find": false,
11311131
"use_smartcase_find": false,
1132-
"highlight_on_copy_duration": 200,
1132+
"highlight_on_yank_duration": 200,
11331133
"custom_digraphs": {}
11341134
},
11351135
// The server to connect to. If the environment variable

crates/vim/src/normal/yank.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ impl Vim {
196196
)
197197
});
198198

199-
let highlight_duration = VimSettings::get_global(cx).highlight_on_copy_duration;
199+
let highlight_duration = VimSettings::get_global(cx).highlight_on_yank_duration;
200200
if !is_yank || self.mode == Mode::Visual || highlight_duration == 0 {
201201
return;
202202
}

crates/vim/src/vim.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@ struct VimSettings {
11881188
pub use_multiline_find: bool,
11891189
pub use_smartcase_find: bool,
11901190
pub custom_digraphs: HashMap<String, Arc<str>>,
1191-
pub highlight_on_copy_duration: u64,
1191+
pub highlight_on_yank_duration: u64,
11921192
}
11931193

11941194
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
@@ -1198,7 +1198,7 @@ struct VimSettingsContent {
11981198
pub use_multiline_find: Option<bool>,
11991199
pub use_smartcase_find: Option<bool>,
12001200
pub custom_digraphs: Option<HashMap<String, Arc<str>>>,
1201-
pub highlight_on_copy_duration: Option<u64>,
1201+
pub highlight_on_yank_duration: Option<u64>,
12021202
}
12031203

12041204
impl Settings for VimSettings {

docs/src/vim.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ Here's an example of these settings changed:
432432
"use_multiline_find": true,
433433
"use_smartcase_find": true,
434434
"toggle_relative_line_numbers": true,
435-
"highlight_on_copy_duration": 50,
435+
"highlight_on_yank_duration": 50,
436436
"custom_digraphs": {
437437
"fz": "🧟‍♀️"
438438
}

0 commit comments

Comments
 (0)