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: no-useless-return false positive on conditionals (fixes #7477) #7482

Merged
merged 1 commit into from Oct 31, 2016

Conversation

not-an-aardvark
Copy link
Member

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

[x] Bug fix (template)

See #7477

What changes did you make? (Give an overview)

This ensures that if a return statement has an argument, and it's on the same code path as another return statement, the first return statement is not considered to be a useless return.

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

Nothing in particular.

@not-an-aardvark not-an-aardvark added bug ESLint is working incorrectly rule Relates to ESLint's core rules accepted There is consensus among the team that this change meets the criteria for inclusion labels Oct 29, 2016
@mention-bot
Copy link

@not-an-aardvark, thanks for your PR! By analyzing the history of the files in this pull request, we identified @mysticatea to be a potential reviewer.

@eslintbot
Copy link

LGTM


// FIXME: Re-add this case (removed due to https://github.com/eslint/eslint/issues/7481):
// https://github.com/eslint/eslint/blob/261d7287820253408ec87c344beccdba2fe829a4/tests/lib/rules/no-useless-return.js#L308-L329

Copy link
Member Author

Choose a reason for hiding this comment

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

This fix caused this test case to fail due to #7481. However, the fix for #7481 will be semver-minor, so I think it's best to remove this case for now, and then re-add it when #7481 is fixed.

@not-an-aardvark not-an-aardvark added the patch candidate This issue may necessitate a patch release in the next few days label Oct 29, 2016
Copy link
Member

@mysticatea mysticatea left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!
You are always faster than me. 😄

Copy link
Member

@kaicataldo kaicataldo left a comment

Choose a reason for hiding this comment

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

LGTM

@kaicataldo kaicataldo merged commit 8a71d4a into master Oct 31, 2016
@not-an-aardvark not-an-aardvark deleted the no-useless-return-fix-7477 branch October 31, 2016 18:33
@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
accepted There is consensus among the team that this change meets the criteria for inclusion archived due to age This issue has been archived; please open a new issue for any further discussion bug ESLint is working incorrectly patch candidate This issue may necessitate a patch release in the next few days rule Relates to ESLint's core rules
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants