chore(linter): fix merge conflict

This commit is contained in:
Boshen 2024-06-11 16:43:11 +08:00
parent 110661cc80
commit b3d4a53396
No known key found for this signature in database
GPG key ID: 9C7A8C8AB22BEBD1
2 changed files with 22 additions and 22 deletions

View file

@ -307,7 +307,7 @@ impl SortImports {
let specifiers_span = specifiers[0].span.merge(&specifiers[specifiers.len() - 1].span);
ctx.diagnostic_with_fix(
sort_members_alphabetically_diagnostic(unsorted_name, unsorted_span),
|| {
|fixer| {
// import { a, b, c, d } from 'foo.js'
// ^ ^^^^^^ ^
let mut paddings: Vec<&str> = specifiers
@ -344,7 +344,7 @@ impl SortImports {
},
);
Fix::new(sorted_text, specifiers_span)
fixer.replace(specifiers_span, sorted_text)
},
);
} else {