Skip to content

refactor: use more iterator and named format args #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 27, 2023
Merged

refactor: use more iterator and named format args #1

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7f7e4d
refactor: destructure range
scarf005 Nov 24, 2023
d14cfe6
style: clippy
scarf005 Nov 24, 2023
f2cc7c8
refactor: extract options
scarf005 Nov 24, 2023
d4bc4d7
refactor: collect `text_changes` immutably
scarf005 Nov 24, 2023
ace848e
refactor: inline format arguments
scarf005 Nov 24, 2023
2ba9324
Revert "refactor: inline format arguments"
scarf005 Nov 25, 2023
f1cbf18
Revert "refactor: extract options"
scarf005 Nov 25, 2023
d9a7005
Revert "refactor: destructure range"
scarf005 Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/format_text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ fn format_root(
let root_obj = root_value.as_object()?;
let maybe_default_language = get_metadata_language(root_obj);
let cells = root_value.as_object()?.get_array("cells")?;
let mut text_changes = Vec::new();
for element in &cells.elements {
let maybe_text_change = get_cell_text_change(input_text, element, maybe_default_language, &mut format_with_host);
if let Some(text_change) = maybe_text_change {
text_changes.push(text_change);
}
}

let text_changes: Vec<TextChange> = cells
.elements
.iter()
.filter_map(|element| get_cell_text_change(input_text, element, maybe_default_language, &mut format_with_host))
.collect();

if text_changes.is_empty() {
None
} else {
Expand Down Expand Up @@ -105,6 +105,7 @@ fn analyze_code_block<'a>(cell: &jsonc_parser::ast::Object<'a>, file_text: &'a s
}
strings.push(&string_lit.value);
}

let mut text = String::with_capacity(strings.iter().map(|s| s.len()).sum::<usize>());
for string in strings {
text.push_str(string);
Expand Down