Cyclic0007/ruff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Buffer::write_element non-failable (#6613)

Browse Source
This commit is contained in:
Micha Reiser
2023-08-16 15:13:07 +02:00
committed by GitHub
parent 86ccdcc9d9
commit daac31d2b9
9 changed files with 115 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/ruff_python_formatter/src/expression/parentheses.rs
View File

@@ -268,7 +268,8 @@ impl<'ast> Format<PyFormatContext<'ast>> for InParenthesesOnlyLineBreak {
f.write_element(FormatElement::Line(match self {
InParenthesesOnlyLineBreak::SoftLineBreak => LineMode::Soft,
InParenthesesOnlyLineBreak::SoftLineBreakOrSpace => LineMode::SoftOrSpace,
}))
}));
Ok(())
}
}
}

4
crates/ruff_python_formatter/src/lib.rs
View File

@@ -184,11 +184,11 @@ impl Format<PyFormatContext<'_>> for NotYetImplementedCustomText<'_> {
tag::VerbatimKind::Verbatim {
length: self.text.text_len(),
},
)))?;
)));
text(self.text).fmt(f)?;
f.write_element(FormatElement::Tag(Tag::EndVerbatim))?;
f.write_element(FormatElement::Tag(Tag::EndVerbatim));
f.context()
.comments()

5
crates/ruff_python_formatter/src/verbatim.rs
View File

@@ -855,7 +855,7 @@ impl Format<PyFormatContext<'_>> for VerbatimText {
tag::VerbatimKind::Verbatim {
length: self.verbatim_range.len(),
},
)))?;
)));
match normalize_newlines(f.context().locator().slice(self.verbatim_range), ['\r']) {
Cow::Borrowed(_) => {
@@ -878,6 +878,7 @@ impl Format<PyFormatContext<'_>> for VerbatimText {
}
}
f.write_element(FormatElement::Tag(Tag::EndVerbatim))
f.write_element(FormatElement::Tag(Tag::EndVerbatim));
Ok(())
}
}