language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-01 22:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use Python whitespace utilities in ruff_textwrap (#4996)

Browse source 
## Summary

This change was intended to be included in #4994, but was somehow
dropped.
This commit is contained in:
Charlie Marsh 2023-06-09 22:32:42 -04:00 • committed by GitHub
parent f401050878
commit 5abb8ec0dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ruff_textwrap/src/lib.rs
View file

@ -4,7 +4,7 @@
use std::borrow::Cow; use std::borrow::Cow;
use std::cmp; use std::cmp;
use ruff_python_whitespace::UniversalNewlines; use ruff_python_whitespace::{PythonWhitespace, UniversalNewlines};
/// Indent each line by the given prefix. /// Indent each line by the given prefix.
/// ///
@ -57,9 +57,9 @@ pub fn indent<'a>(text: &'a str, prefix: &str) -> Cow<'a, str> {
} }
let mut result = String::with_capacity(text.len() + prefix.len()); let mut result = String::with_capacity(text.len() + prefix.len());
let trimmed_prefix = prefix.trim_end(); let trimmed_prefix = prefix.trim_whitespace_end();
for line in text.universal_newlines() { for line in text.universal_newlines() {
if line.trim().is_empty() { if line.trim_whitespace().is_empty() {
result.push_str(trimmed_prefix); result.push_str(trimmed_prefix);
} else { } else {
result.push_str(prefix); result.push_str(prefix);
@ -92,7 +92,7 @@ pub fn dedent(text: &str) -> Cow<'_, str> {
let prefix_len = text let prefix_len = text
.universal_newlines() .universal_newlines()
.fold(usize::MAX, |prefix_len, line| { .fold(usize::MAX, |prefix_len, line| {
let leading_whitespace_len = line.len() - line.trim_start().len(); let leading_whitespace_len = line.len() - line.trim_whitespace_start().len();
if leading_whitespace_len == line.len() { if leading_whitespace_len == line.len() {
// Skip empty lines. // Skip empty lines.
prefix_len prefix_len
@ -109,7 +109,7 @@ pub fn dedent(text: &str) -> Cow<'_, str> {
// Remove the common prefix from each line. // Remove the common prefix from each line.
let mut result = String::with_capacity(text.len()); let mut result = String::with_capacity(text.len());
for line in text.universal_newlines() { for line in text.universal_newlines() {
if line.trim().is_empty() { if line.trim_whitespace().is_empty() {
if let Some(line_ending) = line.line_ending() { if let Some(line_ending) = line.line_ending() {
result.push_str(&line_ending); result.push_str(&line_ending);
} }
@ -333,4 +333,13 @@ mod tests {
].join(""); ].join("");
assert_eq!(dedent(&x), y); assert_eq!(dedent(&x), y);
} }
#[test]
fn dedent_non_python_whitespace() {
let text = r#"        C = int(f.rea1,0],[-1,0,1]],
[[-1,-1,1],[1,1,-1],[0,-1,0]],
[[-1,-1,-1],[1,1,0],[1,0,1]]
]"#;
assert_eq!(dedent(text), text);
}
} }