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 #4886] Fix false offense for Style/CommentedKeyword #4944

Merged
merged 1 commit into from Oct 28, 2017

Conversation

michniewicz
Copy link
Contributor

[Fix #4886] Fix false offense for Style/CommentedKeyword

Fix also contains cop improvements:
Instead of going through each line of the processed_source we can easily take comments only and cop only those lines, where comments are located.
Instead of splitting line with # symbol we take column values from comment.location.


Before submitting the PR make sure the following are checked:

  • Wrote good commit messages.
  • Commit message starts with [Fix #issue-number] (if the related issue exists).
  • Used the same coding conventions as the rest of the project.
  • Feature branch is up-to-date with master (if not - rebase it).
  • Squashed related commits together.
  • Added tests.
  • Added an entry to the Changelog if the new code introduces user-observable changes. See changelog entry format.
  • All tests(rake spec) are passing.
  • The new code doesn't generate RuboCop offenses that are checked by rake internal_investigation.
  • The PR relates to only one subject with a clear title
    and description in grammatically correct, complete sentences.
  • Updated cop documentation with rake generate_cops_documentation (required only when you've added a new cop or changed the configuration/documentation of an existing cop).

@@ -57,7 +59,8 @@ def investigate(processed_source)
ALLOWED_COMMENTS = %w[:nodoc: rubocop:disable].freeze

def offensive?(line)
KEYWORDS.any? { |k| line =~ /^\s*#{k}\s+.*#/ } &&
line = line.lstrip
KEYWORDS.any? { |keyword| line.start_with?(keyword) } &&
Copy link
Collaborator

@pocke pocke Oct 27, 2017

Choose a reason for hiding this comment

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

String#start_with? can receive more than one string.
e.g. line.start_with?(*KEYWORDS)

BTW, we can add a cop for the pattern.

Commit also contains cop improvements:
Instead of going through each line of the processed_source we can easily take comments only and cop only those lines, where comments are located.
Instead of splitting line with `#` symbol we take column values from `comment.location`.
@bbatsov bbatsov merged commit f6f9dfa into rubocop:master Oct 28, 2017
@bbatsov
Copy link
Collaborator

bbatsov commented Oct 28, 2017

👍

@michniewicz michniewicz deleted the 4886-fix-false-comment-offence branch October 28, 2017 17:51
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

3 participants