92c328c · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Add wbc and wbc! commands (#6947)

92c328cKitsu3 years ago

book/src/generated/typable-cmd.md+3−1

compare with master

unifiedsplit

@@ -12,7 +12,9 @@

12| `:buffer-next`, `:bn`, `:bnext` | Goto next buffer. |

13| `:buffer-previous`, `:bp`, `:bprev` | Goto previous buffer. |

14| `:write`, `:w` | Write changes to disk. Accepts an optional path (:write some/path.txt) |

15−| `:write!`, `:w!` | Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write some/path.txt) |

15+| `:write!`, `:w!` | Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt) |

16+| `:write-buffer-close`, `:wbc` | Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt) |

17+| `:write-buffer-close!`, `:wbc!` | Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt) |

16| `:new`, `:n` | Create a new scratch buffer. |

18| `:new`, `:n` | Create a new scratch buffer. |

17| `:format`, `:fmt` | Format the file using the LSP formatter. |

19| `:format`, `:fmt` | Format the file using the LSP formatter. |

18| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.) |

20| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.) |

helix-term/src/commands/typed.rs+45−1

@@ -382,6 +382,36 @@ fn force_write(

382 write_impl(cx, args.first(), true)

383}

384

385+fn write_buffer_close(

386+ cx: &mut compositor::Context,

387+ args: &[Cow<str>],

388+ event: PromptEvent,

389+) -> anyhow::Result<()> {

390+ if event != PromptEvent::Validate {

391+ return Ok(());

392+ }

393+

394+ write_impl(cx, args.first(), false)?;

395+

396+ let document_ids = buffer_gather_paths_impl(cx.editor, args);

397+ buffer_close_by_ids_impl(cx, &document_ids, false)

398+}

399+

400+fn force_write_buffer_close(

401+ cx: &mut compositor::Context,

402+ args: &[Cow<str>],

403+ event: PromptEvent,

404+) -> anyhow::Result<()> {

405+ if event != PromptEvent::Validate {

406+ return Ok(());

407+ }

408+

409+ write_impl(cx, args.first(), true)?;

410+

411+ let document_ids = buffer_gather_paths_impl(cx.editor, args);

412+ buffer_close_by_ids_impl(cx, &document_ids, false)

413+}

414+

385fn new_file(

415fn new_file(

386 cx: &mut compositor::Context,

416 cx: &mut compositor::Context,

387 _args: &[Cow<str>],

417 _args: &[Cow<str>],

@@ -2287,10 +2317,24 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[

2287 TypableCommand {

2317 TypableCommand {

2288 name: "write!",

2318 name: "write!",

2289 aliases: &["w!"],

2319 aliases: &["w!"],

2290− doc: "Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write some/path.txt)",

2320+ doc: "Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt)",

2291 fun: force_write,

2321 fun: force_write,

2292 signature: CommandSignature::positional(&[completers::filename]),

2322 signature: CommandSignature::positional(&[completers::filename]),

2293 },

2323 },

2324+ TypableCommand {

2325+ name: "write-buffer-close",

2326+ aliases: &["wbc"],

2327+ doc: "Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt)",

2328+ fun: write_buffer_close,

2329+ signature: CommandSignature::positional(&[completers::filename]),

2330+ },

2331+ TypableCommand {

2332+ name: "write-buffer-close!",

2333+ aliases: &["wbc!"],

2334+ doc: "Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt)",

2335+ fun: force_write_buffer_close,

2336+ signature: CommandSignature::positional(&[completers::filename]),

2337+ },

2294 TypableCommand {

2338 TypableCommand {

2295 name: "new",

2339 name: "new",

2296 aliases: &["n"],

2340 aliases: &["n"],