From 15714ac32ec5e181aa25a322bd2242901eef593f Mon Sep 17 00:00:00 2001 From: Skyler Hawthorne Date: Mon, 17 Apr 2023 19:38:24 -0400 Subject: [PATCH] add more list of maps to tests --- helix-term/tests/test/languages/yaml.rs | 64 +++++++++++++++++++++++++ runtime/queries/yaml/indents.scm | 9 ++-- 2 files changed, 67 insertions(+), 6 deletions(-) diff --git a/helix-term/tests/test/languages/yaml.rs b/helix-term/tests/test/languages/yaml.rs index 02e3a0ead..19e88f58c 100644 --- a/helix-term/tests/test/languages/yaml.rs +++ b/helix-term/tests/test/languages/yaml.rs @@ -293,6 +293,38 @@ async fn auto_indent() -> anyhow::Result<()> { fook: "}), ), + ( + helpers::platform_line(indoc! {"\ + - top:#[\n|]# + baz: foo + bax: foox + fook: + "}), + "o", + helpers::platform_line(indoc! {"\ + - top: + #[\n|]# + baz: foo + bax: foox + fook: + "}), + ), + ( + helpers::platform_line(indoc! {"\ + - top: + baz: foo#[\n|]# + bax: foox + fook: + "}), + "o", + helpers::platform_line(indoc! {"\ + - top: + baz: foo + #[\n|]# + bax: foox + fook: + "}), + ), ( helpers::platform_line(indoc! {"\ - top: @@ -604,6 +636,38 @@ async fn auto_indent() -> anyhow::Result<()> { fook: "}), ), + ( + helpers::platform_line(indoc! {"\ + - top: + baz: foo#[\n|]# + bax: foox + fook: + "}), + "O", + helpers::platform_line(indoc! {"\ + - top: + #[\n|]# + baz: foo + bax: foox + fook: + "}), + ), + ( + helpers::platform_line(indoc! {"\ + - top: + baz: foo + bax: foox + fook:#[\n|]# + "}), + "O", + helpers::platform_line(indoc! {"\ + - top: + baz: foo + bax: foox + #[\n|]# + fook: + "}), + ), ]; for test in above_tests { diff --git a/runtime/queries/yaml/indents.scm b/runtime/queries/yaml/indents.scm index 1ca487bf0..a318edd7e 100644 --- a/runtime/queries/yaml/indents.scm +++ b/runtime/queries/yaml/indents.scm @@ -1,8 +1,5 @@ (block_scalar) @indent @extend -((block_mapping_pair - key: (_) @key - value: (_)? @val - (#not-same-line? @key @val) - ) @indent @extend -) +(block_mapping_pair) @indent + +(block_sequence_item) @indent