[#5390] Allow exceptions to Style/InlineComment for RuboCop comments (#…

…5697)

Previously if InlineComment was enabled, any RuboCop inline comments
which disabled a cop would require also disabling the InlineComment cop.

CHANGELOG.md

@@ -32,6 +32,7 @@
 * [#5637](https://github.com/bbatsov/rubocop/issues/5637): Fix error for `Layout/SpaceInsideArrayLiteralBrackets` when contains an array literal as an argument after a heredoc is started. ([@koic][])
 * [#5498](https://github.com/bbatsov/rubocop/issues/5498): Correct IndentHeredoc message for Ruby 2.3 when using `<<~` operator with invalid indentation. ([@hamada14][])
 * [#5610](https://github.com/bbatsov/rubocop/issues/5610): Use `gems.locked` or `Gemfile.lock` to determine the best `TargetRubyVersion` when it is not specified in the config. ([@roberts1000][])
+* [#5390](https://github.com/bbatsov/rubocop/issues/5390): Allow exceptions to `Style/InlineComment` for inline comments which enable or disable rubocop cops. ([@jfelchner][])
 * Add progress bar to offenses formatter. ([@drewpterry][])
 
 ## 0.53.0 (2018-03-05)

lib/rubocop/cop/style/inline_comment.rb

@@ -22,7 +22,9 @@ class InlineComment < Cop
 
         def investigate(processed_source)
           processed_source.each_comment do |comment|
-            next if comment_line?(processed_source[comment.loc.line - 1])
+            next if comment_line?(processed_source[comment.loc.line - 1]) ||
+                    comment.text.match(/\A# rubocop:(enable|disable)/)
+
             add_offense(comment)
           end
         end

spec/rubocop/cop/style/inline_comment_spec.rb

@@ -10,6 +10,12 @@
     RUBY
   end
 
+  it 'does not register an offense for special rubocop inline comments' do
+    expect_no_offenses(<<-RUBY.strip_indent)
+      two = 1 + 1 # rubocop:disable Layout/ExtraSpacing
+    RUBY
+  end
+
   it 'does not register an offense for a standalone comment' do
     expect_no_offenses('# A standalone comment')
   end