diff --git a/helix-term/tests/integration/auto_indent.rs b/helix-term/tests/integration/auto_indent.rs index 74d1ac587..8933cb6a3 100644 --- a/helix-term/tests/integration/auto_indent.rs +++ b/helix-term/tests/integration/auto_indent.rs @@ -10,13 +10,14 @@ async fn auto_indent_c() -> anyhow::Result<()> { Config::default(), // switches to append mode? ( - "void foo() {#[|}]#\n", + helpers::platform_line("void foo() {#[|}]#").as_ref(), "i", - indoc! {"\ + helpers::platform_line(indoc! {"\ void foo() { #[|\n]#\ } - "}, + "}) + .as_ref(), ), ) .await?; diff --git a/helix-term/tests/integration/helpers.rs b/helix-term/tests/integration/helpers.rs index 2a542404c..706e1afb0 100644 --- a/helix-term/tests/integration/helpers.rs +++ b/helix-term/tests/integration/helpers.rs @@ -138,3 +138,20 @@ pub fn temp_file_with_contents>( temp_file.as_file_mut().sync_all()?; Ok(temp_file) } + +/// Replaces all LF chars with the system's appropriate line feed +/// character, and if one doesn't exist already, appends the system's +/// appropriate line ending to the end of a string. +pub fn platform_line(input: &str) -> String { + let line_end = helix_core::DEFAULT_LINE_ENDING.as_str(); + + // we can assume that the source files in this code base will always + // be LF, so indoc strings will always insert LF + let mut output = input.replace("\n", line_end); + + if !output.ends_with(line_end) { + output.push_str(line_end); + } + + output +} diff --git a/helix-term/tests/integration/write.rs b/helix-term/tests/integration/write.rs index 4f8f0eb51..06af9dd84 100644 --- a/helix-term/tests/integration/write.rs +++ b/helix-term/tests/integration/write.rs @@ -31,7 +31,10 @@ async fn test_write() -> anyhow::Result<()> { let mut file_content = String::new(); file.as_file_mut().read_to_string(&mut file_content)?; - assert_eq!("i can eat glass, it will not hurt me\n", file_content); + assert_eq!( + helpers::platform_line("i can eat glass, it will not hurt me"), + file_content + ); Ok(()) }