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 calculation of cop department for nested departments #9258

Merged
merged 1 commit into from Dec 20, 2020

Conversation

mvz
Copy link
Contributor

@mvz mvz commented Dec 19, 2020

This fixes an issue I ran into with rubocop-i18n. This gem provides two nested departments, I18n/RailsI18n and I18n/GetText. The intent is to enable one and disable the other. However, disabling a department would not disable its cops.

I tracked this issue down to how RuboCop::Config calculates a cops department before looking at that department's configuration: It only considers the part before the first /.

This pull request changes this method by considering instead all parts before the last /.


Before submitting the PR make sure the following are checked:

  • The PR relates to only one subject with a clear title and description in grammatically correct, complete sentences.
  • Wrote good commit messages.
  • Commit message starts with [Fix #issue-number] (if the related issue exists).
  • Feature branch is up-to-date with master (if not - rebase it).
  • Squashed related commits together.
  • Added tests.
  • Ran bundle exec rake default. It executes all tests and runs RuboCop on its own code.
  • Added an entry (file) to the changelog folder named {change_type}_{change_description}.md if the new code introduces user-observable changes. See changelog entry format for details.

This fixes an issue I ran into with rubocop-i18n. This gem provides two
nested departments, I18n/RailsI18n and I18n/GetText. The intent is to
enable one and disable the other. However, disabling a department would
not disable its cops.

I tracked this issue down to how RuboCop::Config calculates a cops
department before looking at that department's configuration: It only
considers the part before the first `/`.

This commit changes this method by considering instead all parts before
the last `/`.
@mvz mvz force-pushed the fix-disabling-nested-departments branch from aae0cab to aad4c7a Compare December 19, 2020 09:40
@bbatsov
Copy link
Collaborator

bbatsov commented Dec 19, 2020

The changes seem reasonable to me. I'll cc here @dmytro-savochkin as well as he worked on this in #8490

@bbatsov bbatsov merged commit 2e7ef70 into rubocop:master Dec 20, 2020
@bbatsov
Copy link
Collaborator

bbatsov commented Dec 20, 2020

Thanks!

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.

None yet

2 participants