From 9e8bc56d5a50470b9b747a9dd9d27f0369c53a4f Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Wed, 12 Jul 2023 03:44:15 -0400
Subject: [PATCH] Enable Rubocop Style/Semicolon with config (#23652)
---
.rubocop.yml | 5 +++++
.rubocop_todo.yml | 7 -------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/.rubocop.yml b/.rubocop.yml
index eff89bdae..5c109a7e5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -192,6 +192,11 @@ Style/RedundantBegin:
Style/RescueStandardError:
EnforcedStyle: implicit
+# Reason: Simplify some spec layouts
+# https://docs.rubocop.org/rubocop/cops_style.html#stylesemicolon
+Style/Semicolon:
+ AllowAsExpressionSeparator: true
+
# Reason: Originally disabled for CodeClimate, and no config consensus has been found
# https://docs.rubocop.org/rubocop/cops_style.html#stylesymbolarray
Style/SymbolArray:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 24f02d4d3..a2b27bcfa 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1336,13 +1336,6 @@ Style/SafeNavigation:
- 'app/models/concerns/account_finder_concern.rb'
- 'app/models/status.rb'
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowAsExpressionSeparator.
-Style/Semicolon:
- Exclude:
- - 'spec/services/activitypub/process_status_update_service_spec.rb'
- - 'spec/validators/blacklisted_email_validator_spec.rb'
-
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: only_raise, only_fail, semantic