andrey/helix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify current!(..).1 into doc!()

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-11-06 23:52:26 +09:00
parent e80708eba7
commit 1a1685acf7
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
helix-term/src/commands.rs
View File

@ -743,13 +743,7 @@ fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bo
// usually mix line endings. But we should fix it eventually // usually mix line endings. But we should fix it eventually
// anyway. // anyway.
{ {
current!(cx.editor) doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
.1
.line_ending
.as_str()
.chars()
.next()
.unwrap()
} }
KeyEvent { KeyEvent {
@ -1746,7 +1740,7 @@ fn set_indent_style(
// If no argument, report current indent style. // If no argument, report current indent style.
if args.is_empty() { if args.is_empty() {
let style = current!(cx.editor).1.indent_style; let style = doc!(cx.editor).indent_style;
cx.editor.set_status(match style { cx.editor.set_status(match style {
Tabs => "tabs".into(), Tabs => "tabs".into(),
Spaces(1) => "1 space".into(), Spaces(1) => "1 space".into(),
@ -1785,7 +1779,7 @@ fn set_line_ending(
// If no argument, report current line ending setting. // If no argument, report current line ending setting.
if args.is_empty() { if args.is_empty() {
let line_ending = current!(cx.editor).1.line_ending; let line_ending = doc!(cx.editor).line_ending;
cx.editor.set_status(match line_ending { cx.editor.set_status(match line_ending {
Crlf => "crlf".into(), Crlf => "crlf".into(),
LF => "line feed".into(), LF => "line feed".into(),
@ -3794,7 +3788,7 @@ fn yank_joined_to_clipboard_impl(
} }
fn yank_joined_to_clipboard(cx: &mut Context) { fn yank_joined_to_clipboard(cx: &mut Context) {
let line_ending = current!(cx.editor).1.line_ending; let line_ending = doc!(cx.editor).line_ending;
let _ = yank_joined_to_clipboard_impl( let _ = yank_joined_to_clipboard_impl(
&mut cx.editor, &mut cx.editor,
line_ending.as_str(), line_ending.as_str(),
@ -3828,7 +3822,7 @@ fn yank_main_selection_to_clipboard(cx: &mut Context) {
} }
fn yank_joined_to_primary_clipboard(cx: &mut Context) { fn yank_joined_to_primary_clipboard(cx: &mut Context) {
let line_ending = current!(cx.editor).1.line_ending; let line_ending = doc!(cx.editor).line_ending;
let _ = yank_joined_to_clipboard_impl( let _ = yank_joined_to_clipboard_impl(
&mut cx.editor, &mut cx.editor,
line_ending.as_str(), line_ending.as_str(),
@ -4517,7 +4511,7 @@ fn match_brackets(cx: &mut Context) {
fn jump_forward(cx: &mut Context) { fn jump_forward(cx: &mut Context) {
let count = cx.count(); let count = cx.count();
let (view, _doc) = current!(cx.editor); let view = view_mut!(cx.editor);
if let Some((id, selection)) = view.jumps.forward(count) { if let Some((id, selection)) = view.jumps.forward(count) {
view.doc = *id; view.doc = *id;