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

Fix: avoid indent and no-mixed-spaces-and-tabs conflicts (fixes #7248) #7266

Merged

Conversation

not-an-aardvark
Copy link
Member

What is the purpose of this pull request? (put an "X" next to item)

[ ] Documentation update
[x] Bug fix (template)
[ ] New rule (template)
[ ] Changes an existing rule (template)
[ ] Add autofixing to a rule
[ ] Add a CLI option
[ ] Add something to the core
[ ] Other, please explain:

See #7248

Please check each item to ensure your pull request is ready:

  • I've read the pull request guide
  • I've included tests for my change
  • (n/a) I've updated documentation for my change (if appropriate)

What changes did you make? (Give an overview)

This updates indent to not report lines that have mixed spaces and tabs, to avoid conflicts with the no-mixed-spaces-and-tabs rule.

I think this is better than reverting 8b3fc32, because if that commit is reverted, then indent's autofix will be broken again on lines containing mixed spaces and tabs (see #4274).

Is there anything you'd like reviewers to focus on?

Nothing in particular.

@eslintbot
Copy link

LGTM

Copy link
Member

@platinumazure platinumazure left a comment

Choose a reason for hiding this comment

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

LGTM, thanks very much for writing this up so quickly.

Copy link
Member

@nzakas nzakas left a comment

Choose a reason for hiding this comment

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

LGTM

@ilyavolodin ilyavolodin merged commit 742ae67 into eslint:master Sep 28, 2016
@not-an-aardvark not-an-aardvark deleted the indent-mixed-spaces-and-tabs-7248 branch September 28, 2016 23:30
@eslint-deprecated eslint-deprecated bot locked and limited conversation to collaborators Feb 6, 2018
@eslint-deprecated eslint-deprecated bot added the archived due to age This issue has been archived; please open a new issue for any further discussion label Feb 6, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
archived due to age This issue has been archived; please open a new issue for any further discussion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants