From 98fab60935ac4dc98d400ec3c54fc394bfc68410 Mon Sep 17 00:00:00 2001 From: Daniel Vandersluis Date: Thu, 26 Aug 2021 14:21:13 -0400 Subject: [PATCH] [Fix #9674] Disable `Style/AsciiComments` by default. --- ...nge_disable_styleasciicomments_by_default.md | 1 + config/default.yml | 4 ++-- lib/rubocop/cop/naming/ascii_identifiers.rb | 3 --- lib/rubocop/cop/style/ascii_comments.rb | 3 --- spec/fixtures/html_formatter/expected.html | 17 +++-------------- 5 files changed, 6 insertions(+), 22 deletions(-) create mode 100644 changelog/change_disable_styleasciicomments_by_default.md diff --git a/changelog/change_disable_styleasciicomments_by_default.md b/changelog/change_disable_styleasciicomments_by_default.md new file mode 100644 index 00000000000..7992118188d --- /dev/null +++ b/changelog/change_disable_styleasciicomments_by_default.md @@ -0,0 +1 @@ +* [#9674](https://github.com/rubocop/rubocop/issues/9674): Disable `Style/AsciiComments` by default. ([@dvandersluis][]) diff --git a/config/default.yml b/config/default.yml index 84e4078fa15..d8cf08d23ef 100644 --- a/config/default.yml +++ b/config/default.yml @@ -2831,9 +2831,9 @@ Style/ArrayJoin: Style/AsciiComments: Description: 'Use only ascii symbols in comments.' StyleGuide: '#english-comments' - Enabled: true + Enabled: false VersionAdded: '0.9' - VersionChanged: '0.52' + VersionChanged: '<>' AllowedChars: - © diff --git a/lib/rubocop/cop/naming/ascii_identifiers.rb b/lib/rubocop/cop/naming/ascii_identifiers.rb index b5e60ede696..6deca210ec2 100644 --- a/lib/rubocop/cop/naming/ascii_identifiers.rb +++ b/lib/rubocop/cop/naming/ascii_identifiers.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -# rubocop:disable Style/AsciiComments - module RuboCop module Cop module Naming @@ -90,4 +88,3 @@ def first_non_ascii_chars(string) end end end -# rubocop:enable Style/AsciiComments diff --git a/lib/rubocop/cop/style/ascii_comments.rb b/lib/rubocop/cop/style/ascii_comments.rb index 6aa506053ae..892bd90500b 100644 --- a/lib/rubocop/cop/style/ascii_comments.rb +++ b/lib/rubocop/cop/style/ascii_comments.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -# rubocop:disable Style/AsciiComments - module RuboCop module Cop module Style @@ -57,4 +55,3 @@ def allowed_non_ascii_chars end end end -# rubocop:enable Style/AsciiComments diff --git a/spec/fixtures/html_formatter/expected.html b/spec/fixtures/html_formatter/expected.html index 7ae5c86df47..9ea254f8dac 100644 --- a/spec/fixtures/html_formatter/expected.html +++ b/spec/fixtures/html_formatter/expected.html @@ -367,14 +367,14 @@

RuboCop Inspection Report

3 files inspected, - 23 offenses detected: + 22 offenses detected: