diff --git a/README.md b/README.md index 3f166db1b32d..f8f99db2cdd9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,16 @@ +# PRs merged into this branch + +[Add `unbind_default_keys` config option #9384](https://github.com/helix-editor/helix/pull/9384) + +[Add command expansions `%key{body}` #6979](https://github.com/helix-editor/helix/pull/6979) + +~~[Globbing support in `:open` #9723](https://github.com/helix-editor/helix/pull/9723)~~ +*Too many merge conflicts + it's easy to substitute with `:open %sh{ printf '%s\n' }`* + +[Pickers "v2" #9647](https://github.com/helix-editor/helix/pull/9647) + +[Implement new textobject for indentation level #9843](https://github.com/helix-editor/helix/pull/9843) +

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs index bc71e572c4ff..ee7f9e8b5c50 100644 --- a/helix-term/src/commands/typed.rs +++ b/helix-term/src/commands/typed.rs @@ -2472,46 +2472,6 @@ fn echo(cx: &mut compositor::Context, args: &[Cow], event: PromptEvent) -> Ok(()) } -fn yank_diagnostic( - cx: &mut compositor::Context, - args: &[Cow], - event: PromptEvent, -) -> anyhow::Result<()> { - if event != PromptEvent::Validate { - return Ok(()); - } - - let reg = match args.first() { - Some(s) => { - ensure!(s.chars().count() == 1, format!("Invalid register {s}")); - s.chars().next().unwrap() - } - None => '+', - }; - - let (view, doc) = current_ref!(cx.editor); - let primary = doc.selection(view.id).primary(); - - // Look only for diagnostics that intersect with the primary selection - let diag: Vec<_> = doc - .diagnostics() - .iter() - .filter(|d| primary.overlaps(&helix_core::Range::new(d.range.start, d.range.end))) - .map(|d| d.message.clone()) - .collect(); - let n = diag.len(); - if n == 0 { - bail!("No diagnostics under primary selection"); - } - - cx.editor.registers.write(reg, diag)?; - cx.editor.set_status(format!( - "Yanked {n} diagnostic{} to register {reg}", - if n == 1 { "" } else { "s" } - )); - Ok(()) -} - fn read(cx: &mut compositor::Context, args: &[Cow], event: PromptEvent) -> anyhow::Result<()> { if event != PromptEvent::Validate { return Ok(()); diff --git a/languages.toml b/languages.toml index bc23f708da12..fb74a8a14708 100644 --- a/languages.toml +++ b/languages.toml @@ -936,7 +936,7 @@ indent = { tab-width = 2, unit = " " } [[grammar]] name = "bash" -source = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "275effdfc0edce774acf7d481f9ea195c6c403cd" } +source = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "f8fb3274f72a30896075585b32b0c54cad65c086" } [[language]] name = "php" diff --git a/runtime/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm index 92d61e8b83e0..1aa35aa7c790 100644 --- a/runtime/queries/bash/highlights.scm +++ b/runtime/queries/bash/highlights.scm @@ -60,7 +60,6 @@ ">>" "<" "|" - (expansion_flags) ] @operator (