diff --git a/Cargo.lock b/Cargo.lock index b6bd1c35..18ecec77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2823,9 +2823,9 @@ dependencies = [ [[package]] name = "tiny_pretty" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6f118a569adc26e8a9a377130f181a461770225e588c73a00c8636b8680b6c" +checksum = "4c4c0dd4d9821b02f4a9848656f971304402049d80fb434d64a83890b2ade7d7" [[package]] name = "tinystr" diff --git a/Cargo.toml b/Cargo.toml index 24f30e7d..63b28af5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ serde_repr = "0.1" regex = "1.11.1" simplelog = "0.12.0" tempfile = "3.21.0" -tiny_pretty = "0.4.2" +tiny_pretty = "0.4.3" toml = "0.5.9" dir-test = "0.4" drop_bomb = "0.1.5" diff --git a/crates/squawk_fmt/src/fmt.rs b/crates/squawk_fmt/src/fmt.rs index 8f9b19a9..c6c51960 100644 --- a/crates/squawk_fmt/src/fmt.rs +++ b/crates/squawk_fmt/src/fmt.rs @@ -1,4 +1,4 @@ -use anyhow::{Result, bail}; +use anyhow::Result; use itertools::Itertools; use rowan::Direction; use squawk_line_index::{LineEnding, UniversalNewlines, find_newline}; @@ -1463,8 +1463,7 @@ pub fn fmt(text: &str) -> Result { .unwrap_or_default(); let line_break = match line_ending { - // see: https://github.com/g-plane/tiny_pretty/issues/3 - LineEnding::Cr => bail!("CR line endings aren't supported"), + LineEnding::Cr => LineBreak::Cr, LineEnding::CrLf => LineBreak::Crlf, LineEnding::Lf => LineBreak::Lf, }; diff --git a/crates/squawk_fmt/tests/tests.rs b/crates/squawk_fmt/tests/tests.rs index 0ff91b6d..217f4a0d 100644 --- a/crates/squawk_fmt/tests/tests.rs +++ b/crates/squawk_fmt/tests/tests.rs @@ -83,7 +83,7 @@ fn fmt_crlf_line_endings() { #[test] fn fmt_cr_line_endings() { - assert_snapshot!(fmt_with_line_ending("\r"), @"error: CR line endings aren't supported"); + assert_snapshot!(fmt_with_line_ending("\r"), @"-- a commentselect 1;/* a comment * spanning lines */select 'a', 'really long string ';"); } fn meaningful_tokens(text: &str) -> Vec<(TokenKind, &str)> {