Skip to content

Properly align comments in unicode lines #4171

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 1 commit into from
May 12, 2020
Merged

Properly align comments in unicode lines #4171

Show file tree
Hide file tree
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
15 changes: 10 additions & 5 deletions rustfmt-core/rustfmt-lib/src/lists.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use std::cmp;
use std::iter::Peekable;

use rustc_span::BytePos;
use unicode_segmentation::UnicodeSegmentation;

use crate::comment::{find_comment_end, rewrite_comment, FindUncommented};
use crate::config::lists::*;
Expand Down Expand Up @@ -464,8 +465,10 @@ where

if !starts_with_newline(comment) {
if formatting.align_comments {
let mut comment_alignment =
post_comment_alignment(item_max_width, inner_item.len());
let mut comment_alignment = post_comment_alignment(
item_max_width,
UnicodeSegmentation::graphemes(inner_item.as_str(), true).count(),
);
if first_line_width(&formatted_comment)
+ last_line_width(&result)
+ comment_alignment
Expand All @@ -474,8 +477,10 @@ where
{
item_max_width = None;
formatted_comment = rewrite_post_comment(&mut item_max_width)?;
comment_alignment =
post_comment_alignment(item_max_width, inner_item.len());
comment_alignment = post_comment_alignment(
item_max_width,
UnicodeSegmentation::graphemes(inner_item.as_str(), true).count(),
);
}
for _ in 0..=comment_alignment {
result.push(' ');
Expand Down Expand Up @@ -533,7 +538,7 @@ where
let mut first = true;
for item in items.clone().into_iter().skip(i) {
let item = item.as_ref();
let inner_item_width = item.inner_as_ref().len();
let inner_item_width = UnicodeSegmentation::graphemes(item.inner_as_ref(), true).count();
if !first
&& (item.is_different_group()
|| item.post_comment.is_none()
Expand Down
8 changes: 8 additions & 0 deletions rustfmt-core/rustfmt-lib/tests/target/issue-4151.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fn main() {
let mappings = [
("gamma", 'ɡ'), // comment 1
("sqrt", '√'), // comment 2
("a", 'a'), // comment 3
("eye", 'ಠ'), // comment 4
];
}