[Fix rubocop#2643] MagicComment uppercase and dashes

Ruby's "magic comments" may use dashes instead of underscores [1] and are case-insensitive [2]. [1]: https://github.com/ruby/ruby/blob/78b95b49f8715a4782f5b9bdc4c163e445cdc303/parse.y#L7134-L7136 [2]: https://github.com/ruby/ruby/blob/78b95b49f8715a4782f5b9bdc4c163e445cdc303/parse.y#L7138
mikegee · Jan 23, 2017 · 8e779f7 · 8e779f7
1 parent d76dc90
commit 8e779f7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 * [#3923](https://github.com/bbatsov/rubocop/issues/3923): Allow asciibetical sorting in `Bundler/OrderedGems`. ([@mikegee][])
 * [#3855](https://github.com/bbatsov/rubocop/issues/3855): Make `Lint/NonLocalExitFromIterator` aware of method definitions. ([@drenmi][])
+* [#2643](https://github.com/bbatsov/rubocop/issues/2643): Allow uppercase and dashes in `MagicComment`. ([@mikegee][])
 
 ## 0.47.1 (2017-01-18)
 

diff --git a/lib/rubocop/magic_comment.rb b/lib/rubocop/magic_comment.rb
@@ -179,7 +179,7 @@ def frozen_string_literal; end
     class SimpleComment < MagicComment
       # Match `encoding` or `coding`
       def encoding
-        extract(/\b(?:en)?coding: (#{TOKEN})/)
+        extract(/\b(?:en)?coding: (#{TOKEN})/i)
       end
 
       private
@@ -188,8 +188,11 @@ def encoding
       #
       # The `frozen_string_literal` magic comment only works if it
       # is the only text in the comment.
+      #
+      # Case-insensitive and dashes/underscores are acceptable.
+      # @see https://git.io/vM7Mg
       def extract_frozen_string_literal
-        extract(/^#\s*frozen_string_literal:\s*(#{TOKEN})\s*$/)
+        extract(/\A#\s*frozen[_-]string[_-]literal:\s*(#{TOKEN})\s*\z/i)
       end
     end
   end

diff --git a/spec/rubocop/magic_comment_spec.rb b/spec/rubocop/magic_comment_spec.rb
@@ -24,6 +24,14 @@
                    '# encoding: utf-8',
                    encoding: 'utf-8'
 
+  include_examples 'magic comment',
+                   '# ENCODING: utf-8',
+                   encoding: 'utf-8'
+
+  include_examples 'magic comment',
+                   '# eNcOdInG: utf-8',
+                   encoding: 'utf-8'
+
   include_examples 'magic comment',
                    '# coding: utf-8',
                    encoding: 'utf-8'
@@ -47,6 +55,18 @@
                    '# frozen_string_literal: false',
                    frozen_string_literal: false
 
+  include_examples 'magic comment',
+                   '# frozen-string-literal: true',
+                   frozen_string_literal: true
+
+  include_examples 'magic comment',
+                   '# FROZEN-STRING-LITERAL: true',
+                   frozen_string_literal: true
+
+  include_examples 'magic comment',
+                   '# fRoZeN-sTrInG_lItErAl: true',
+                   frozen_string_literal: true
+
   include_examples 'magic comment',
                    '# frozen_string_literal: invalid',
                    frozen_string_literal: 'invalid'