[Fix rubocop#9895] Set CheckStrings: false and remove master from…

… `FlaggedTerms` for `Naming/InclusiveLanguage` Fixes rubocop#9895 and follow up rubocop#9893 (comment). This PR sets `CheckStrings: false` and removes `master` from `FlaggedTerms` for `Naming/InclusiveLanguage` because it has an unexpectedly impact for many users who give feedback.
koic · Jun 29, 2021 · 1976f27 · 1976f27
1 parent ba3e33e
commit 1976f27
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 24 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -100,19 +100,6 @@ Metrics/ModuleLength:
 Naming/InclusiveLanguage:
   Exclude:
     - lib/rubocop/cop/naming/inclusive_language.rb
-    - spec/rubocop/cop/naming/inclusive_language_spec.rb
-  FlaggedTerms:
-    whitelist:
-      Suggestions:
-        - allowlist
-    blacklist:
-      Suggestions:
-        - denylist
-    master:
-      AllowedRegex:
-        - 'blob/master/'
-        - 'master \(unreleased\)'
-        - !ruby/regexp "/ENV\\['RUBOCOP_VERSION'\\] == 'master'/"
 
 RSpec/FilePath:
   Exclude:

diff --git a/...ange_set_check_strings_false_and_remove_master_for_naming_inclusive_language.md b/...ange_set_check_strings_false_and_remove_master_for_naming_inclusive_language.md
@@ -0,0 +1 @@
+* [#9895](https://github.com/rubocop/rubocop/issues/9895): Set `CheckStrings: false` and Remove `master` from `FlaggedTerms` for `Naming/InclusiveLanguage`. ([@koic][])
diff --git a/config/default.yml b/config/default.yml
@@ -2541,7 +2541,7 @@ Naming/InclusiveLanguage:
   CheckIdentifiers: true
   CheckConstants: true
   CheckVariables: true
-  CheckStrings: true
+  CheckStrings: false
   CheckSymbols: true
   CheckComments: true
   CheckFilepaths: true
@@ -2556,12 +2556,6 @@ Naming/InclusiveLanguage:
       Suggestions:
         - denylist
         - block
-    master:
-      Suggestions: ['main', 'primary', 'leader']
-      AllowedRegex:
-        - 'Master of None'
-        - 'Master Boot Record'
-        - 'Mastercard'        
     slave:
       Suggestions: ['replica', 'secondary', 'follower']
 

diff --git a/spec/rubocop/cop/naming/inclusive_language_spec.rb b/spec/rubocop/cop/naming/inclusive_language_spec.rb
@@ -136,9 +136,12 @@ class Nodewhitelist
 
     context 'flagged term with three or more suggestions' do
       let(:cop_config) do
-        { 'FlaggedTerms' => {
-          'master' => { 'Suggestions' => %w[main primary leader] }
-        } }
+        {
+          'CheckStrings' => true,
+          'FlaggedTerms' => {
+            'master' => { 'Suggestions' => %w[main primary leader] }
+          }
+        }
       end
 
       it 'includes all suggestions in the message' do

diff --git a/tasks/cut_release.rake b/tasks/cut_release.rake
@@ -40,7 +40,7 @@ namespace :cut_release do
   def update_docs(old_version, new_version)
     update_file('docs/antora.yml') do |antora_metadata|
       antora_metadata.sub(
-        "version: 'master'", # rubocop:disable Naming/InclusiveLanguage
+        "version: 'master'",
         "version: '#{version_sans_patch(new_version)}'"
       )
     end