Skip to content
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.

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

dont fire possible_missing_comma if intendation is present #5083

Merged
merged 1 commit into from
Jan 25, 2020

Conversation

basil-cow
Copy link
Contributor

Closes #4399
changelog: dont fire possible_missing_comma if intendation is present

I suspect there is already a utils function for indentation (but searching indent didn't yield a function for that), and my solution is certainly not universal, but it's probably the best we can do.

let lo = cx.sess.source_map().lookup_char_pos(span.lo());
lo.file
.get_line(lo.line - 1 /* line numbers in `Loc` are 1-based */)
.map(|line| line[..lo.col.0].chars().map(|c| if c == '\t' { 8 } else { 1 }).sum())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't special case tab chars here. Since tab chars are always formatted differently, adding 8 for tabs can be correct in one editor, but wrong in others.

Copy link
Contributor Author

@basil-cow basil-cow Jan 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, but 8 is de-facto default tab size, and IMO it's better than not accounting for it at all (or maybe better solution is to not lint at all if tab chars are present?)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should lint, when tabs are present, since formatting something like

    1
        - 2,
// the same as 
    1
    - 2,
// in some other editor

with tabs and then rely on the formatting is weird.

Also if someone uses tabs instead of spaces, they probably use it in every line, so it doesn't have to be special cased.

What I'm saying is, that the biggest argument against tabs is, that the formatting is inconsistent across editors. This is a heuristic that relies on consistent formatting. So I wouldn't try to solve the tab-formatting problem at all here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I special cased it because of

1, 2, 3 -
            4,
 5, 6

(although I don't know if that's a possible rustfmt output).
Well worst case scenario if I we don't special case it we get a false-positive, so I'll remove it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can configure rustfmt to use hard_tabs. But then rustfmt will use tabs for indentation and spaces for alignment. So also in this case special casing tabs isn't necessary.

@flip1995
Copy link
Member

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Jan 25, 2020

📌 Commit a234aef has been approved by flip1995

@bors
Copy link
Contributor

bors commented Jan 25, 2020

⌛ Testing commit a234aef with merge fd6f609...

bors added a commit that referenced this pull request Jan 25, 2020
dont fire `possible_missing_comma` if intendation is present

Closes #4399
changelog: dont fire `possible_missing_comma` if intendation is present

I suspect there is already a utils function for indentation (but searching indent didn't yield a function for that), and my solution is certainly not universal, but it's probably the best we can do.
@bors
Copy link
Contributor

bors commented Jan 25, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing fd6f609 to master...

@bors bors merged commit a234aef into rust-lang:master Jan 25, 2020
@basil-cow basil-cow deleted the issue-4399 branch January 25, 2020 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

False positive in possible_missing_comma
3 participants