Skip to content

Fix: Ignore automated formatting changes in authorship (fixes #725) #726

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

Open
adanisman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Ignore automated formatting changes in authorship (fixes #725) #726

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions src/authorship/attribution_tracker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,9 +1013,25 @@ impl AttributionTracker {
let is_whitespace_only = data_is_whitespace(diff.data());
let contains_newline = diff.data().contains(&b'\n');
let is_formatting_pair = prev_whitespace_delete && is_whitespace_only;
#[allow(clippy::if_same_then_else)]
let (author_id, attribution_ts) = if contains_newline {
let (author_id, attribution_ts) = if contains_newline && is_substantive_insert
{
// New substantive line content — attribute to current author
(current_author.to_string(), ts)
} else if contains_newline && !is_substantive_insert {
// Line re-inserted with only formatting/whitespace changes (e.g. by a
// code formatter like `mvn spotless:apply`). Preserve the original
// attribution instead of crediting the human author.
if let Some(attr) = find_attribution_for_insertion(
old_attributions,
old_pos,
&mut insertion_attr_cursor,
) {
(attr.author_id.clone(), attr.ts)
} else if let Some(attr) = new_attributions.last() {
(attr.author_id.clone(), attr.ts)
} else {
(current_author.to_string(), ts)
}
} else if is_substantive_insert {
(current_author.to_string(), ts)
} else if is_formatting_pair {
Expand Down
Loading