ruff_python_formatter: add 'line-ending' to test output

It looks like no previous snapshot tests have configured the line ending to anything other than the default, so this wasn't included in the test output. But we would actually like to try and test that line endings are correctly preserved when reformatting code snippets, so we make the option visible in the snapshot.
astral-sh · Nov 22, 2023 · 06c3c22 · 06c3c22
1 parent 570f2af
commit 06c3c22
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 0 deletions.
diff --git a/crates/ruff_python_formatter/tests/fixtures.rs b/crates/ruff_python_formatter/tests/fixtures.rs
@@ -342,13 +342,15 @@ impl fmt::Display for DisplayPyOptions<'_> {
 line-width              = {line_width}
 indent-width            = {indent_width}
 quote-style             = {quote_style:?}
+line-ending             = {line_ending:?}
 magic-trailing-comma    = {magic_trailing_comma:?}
 docstring-code          = {docstring_code:?}
 preview                 = {preview:?}"#,
             indent_style = self.0.indent_style(),
             indent_width = self.0.indent_width().value(),
             line_width = self.0.line_width().value(),
             quote_style = self.0.quote_style(),
+            line_ending = self.0.line_ending(),
             magic_trailing_comma = self.0.magic_trailing_comma(),
             docstring_code = self.0.docstring_code(),
             preview = self.0.preview()

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@docstring.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@docstring.py.snap
@@ -165,6 +165,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -332,6 +333,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 2
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -499,6 +501,7 @@ indent-style            = tab
 line-width              = 88
 indent-width            = 8
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -666,6 +669,7 @@ indent-style            = tab
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples.py.snap
@@ -329,6 +329,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -663,6 +664,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 2
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -997,6 +999,7 @@ indent-style            = tab
 line-width              = 88
 indent-width            = 8
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -1331,6 +1334,7 @@ indent-style            = tab
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -1665,6 +1669,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Enabled
 preview                 = Disabled
@@ -1999,6 +2004,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 2
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Enabled
 preview                 = Disabled
@@ -2333,6 +2339,7 @@ indent-style            = tab
 line-width              = 88
 indent-width            = 8
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Enabled
 preview                 = Disabled
@@ -2667,6 +2674,7 @@ indent-style            = tab
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Enabled
 preview                 = Disabled

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@expression__bytes.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@expression__bytes.py.snap
@@ -133,6 +133,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -283,6 +284,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Single
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@expression__string.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@expression__string.py.snap
@@ -148,6 +148,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -322,6 +323,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Single
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__fmt_off_docstring.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__fmt_off_docstring.py.snap
@@ -32,6 +32,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -66,6 +67,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 2
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__indent.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__indent.py.snap
@@ -13,6 +13,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -28,6 +29,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 1
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -43,6 +45,7 @@ indent-style            = tab
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__mixed_space_and_tab.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__mixed_space_and_tab.py.snap
@@ -28,6 +28,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -59,6 +60,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 2
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -90,6 +92,7 @@ indent-style            = tab
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@preview.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@preview.py.snap
@@ -79,6 +79,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -159,6 +160,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Enabled

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@skip_magic_trailing_comma.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@skip_magic_trailing_comma.py.snap
@@ -46,6 +46,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -100,6 +101,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Ignore
 docstring-code          = Disabled
 preview                 = Disabled

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@tab_width.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@tab_width.py.snap
@@ -21,6 +21,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 2
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -44,6 +45,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 4
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled
@@ -70,6 +72,7 @@ indent-style            = space
 line-width              = 88
 indent-width            = 8
 quote-style             = Double
+line-ending             = LineFeed
 magic-trailing-comma    = Respect
 docstring-code          = Disabled
 preview                 = Disabled