diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs index f91a6371..52b123c7 100644 --- a/helix-term/tests/test/commands.rs +++ b/helix-term/tests/test/commands.rs @@ -12,15 +12,13 @@ async fn test_selection_duplication() -> anyhow::Result<()> { #[lo|]#rem ipsum dolor - "}) - .as_str(), + "}), "CC", platform_line(indoc! {"\ #(lo|)#rem #(ip|)#sum #[do|]#lor - "}) - .as_str(), + "}), )) .await?; @@ -30,15 +28,13 @@ async fn test_selection_duplication() -> anyhow::Result<()> { #[|lo]#rem ipsum dolor - "}) - .as_str(), + "}), "CC", platform_line(indoc! {"\ #(|lo)#rem #(|ip)#sum #[|do]#lor - "}) - .as_str(), + "}), )) .await?; @@ -47,14 +43,12 @@ async fn test_selection_duplication() -> anyhow::Result<()> { platform_line(indoc! {"\ test #[testitem|]# - "}) - .as_str(), + "}), "", platform_line(indoc! {"\ test #[testitem|]# - "}) - .as_str(), + "}), )) .await?; @@ -63,14 +57,12 @@ async fn test_selection_duplication() -> anyhow::Result<()> { platform_line(indoc! {"\ test #[test|]# - "}) - .as_str(), + "}), "", platform_line(indoc! {"\ #[test|]# #(test|)# - "}) - .as_str(), + "}), )) .await?; @@ -79,14 +71,12 @@ async fn test_selection_duplication() -> anyhow::Result<()> { platform_line(indoc! {"\ #[testitem|]# test - "}) - .as_str(), + "}), "C", platform_line(indoc! {"\ #[testitem|]# test - "}) - .as_str(), + "}), )) .await?; @@ -95,14 +85,12 @@ async fn test_selection_duplication() -> anyhow::Result<()> { platform_line(indoc! {"\ #[test|]# test - "}) - .as_str(), + "}), "C", platform_line(indoc! {"\ #(test|)# #[test|]# - "}) - .as_str(), + "}), )) .await?; Ok(()) @@ -174,15 +162,13 @@ async fn test_multi_selection_paste() -> anyhow::Result<()> { #[|lorem]# #(|ipsum)# #(|dolor)# - "}) - .as_str(), + "}), "yp", platform_line(indoc! {"\ lorem#[|lorem]# ipsum#(|ipsum)# dolor#(|dolor)# - "}) - .as_str(), + "}), )) .await?; @@ -197,8 +183,7 @@ async fn test_multi_selection_shell_commands() -> anyhow::Result<()> { #[|lorem]# #(|ipsum)# #(|dolor)# - "}) - .as_str(), + "}), "|echo foo", platform_line(indoc! {"\ #[|foo\n]# @@ -207,8 +192,7 @@ async fn test_multi_selection_shell_commands() -> anyhow::Result<()> { #(|foo\n)# - "}) - .as_str(), + "}), )) .await?; @@ -218,8 +202,7 @@ async fn test_multi_selection_shell_commands() -> anyhow::Result<()> { #[|lorem]# #(|ipsum)# #(|dolor)# - "}) - .as_str(), + "}), "!echo foo", platform_line(indoc! {"\ #[|foo\n]# @@ -228,8 +211,7 @@ async fn test_multi_selection_shell_commands() -> anyhow::Result<()> { ipsum #(|foo\n)# dolor - "}) - .as_str(), + "}), )) .await?; @@ -239,8 +221,7 @@ async fn test_multi_selection_shell_commands() -> anyhow::Result<()> { #[|lorem]# #(|ipsum)# #(|dolor)# - "}) - .as_str(), + "}), "echo foo", platform_line(indoc! {"\ lorem#[|foo\n]# @@ -249,8 +230,7 @@ async fn test_multi_selection_shell_commands() -> anyhow::Result<()> { dolor#(|foo\n)# - "}) - .as_str(), + "}), )) .await?; @@ -294,16 +274,14 @@ async fn test_extend_line() -> anyhow::Result<()> { ipsum dolor - "}) - .as_str(), + "}), "x2x", platform_line(indoc! {"\ #[lorem ipsum dolor\n|]# - "}) - .as_str(), + "}), )) .await?; @@ -313,15 +291,13 @@ async fn test_extend_line() -> anyhow::Result<()> { #[l|]#orem ipsum - "}) - .as_str(), + "}), "2x", platform_line(indoc! {"\ #[lorem ipsum\n|]# - "}) - .as_str(), + "}), )) .await?; @@ -390,15 +366,15 @@ async fn test_character_info() -> anyhow::Result<()> { async fn test_delete_char_backward() -> anyhow::Result<()> { // don't panic when deleting overlapping ranges test(( - platform_line("#(x|)# #[x|]#").as_str(), + platform_line("#(x|)# #[x|]#"), "c", - platform_line("#[\n|]#").as_str(), + platform_line("#[\n|]#"), )) .await?; test(( - platform_line("#( |)##( |)#a#( |)#axx#[x|]#a").as_str(), + platform_line("#( |)##( |)#a#( |)#axx#[x|]#a"), "li", - platform_line("#(a|)##(|a)#xx#[|a]#").as_str(), + platform_line("#(a|)##(|a)#xx#[|a]#"), )) .await?; @@ -409,9 +385,9 @@ async fn test_delete_char_backward() -> anyhow::Result<()> { async fn test_delete_word_backward() -> anyhow::Result<()> { // don't panic when deleting overlapping ranges test(( - platform_line("fo#[o|]#ba#(r|)#").as_str(), + platform_line("fo#[o|]#ba#(r|)#"), "a", - platform_line("#[\n|]#").as_str(), + platform_line("#[\n|]#"), )) .await?; Ok(()) @@ -421,9 +397,9 @@ async fn test_delete_word_backward() -> anyhow::Result<()> { async fn test_delete_word_forward() -> anyhow::Result<()> { // don't panic when deleting overlapping ranges test(( - platform_line("fo#[o|]#b#(|ar)#").as_str(), + platform_line("fo#[o|]#b#(|ar)#"), "i", - platform_line("fo#[\n|]#").as_str(), + platform_line("fo#[\n|]#"), )) .await?; Ok(()) @@ -437,16 +413,14 @@ async fn test_delete_char_forward() -> anyhow::Result<()> { #(abc|)#ef #(abc|)#f #(abc|)# - "}) - .as_str(), + "}), "a", platform_line(indoc! {"\ #[abc|]#ef #(abc|)#f #(abc|)# #(abc|)# - "}) - .as_str(), + "}), )) .await?;