Merge pull request #689 from standardrb/updates-2025-01-14

Updates and configures Rubocop 1.70
standardrb · Jan 14, 2025 · b4daefb · b4daefb
2 parents 92b86d4 + c695a30
commit b4daefb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+* Updates rubocop to [1.70.0](https://github.com/rubocop/rubocop/tree/v1.70.0)
+
 ## 1.43.0
 
 * Updates rubocop to [1.69.1](https://github.com/rubocop/rubocop/tree/v1.69.1)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,7 +4,7 @@ PATH
     standard (1.43.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.69.1)
+      rubocop (~> 1.70.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.6)
 
@@ -34,7 +34,7 @@ GEM
     rbs (3.5.2)
       logger
     regexp_parser (2.9.3)
-    rubocop (1.69.1)
+    rubocop (1.70.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

diff --git a/config/base.yml b/config/base.yml
@@ -464,6 +464,9 @@ Lint/ConstantDefinitionInBlock:
 Lint/ConstantOverwrittenInRescue:
   Enabled: true
 
+Lint/ConstantReassignment:
+  Enabled: true
+
 Lint/ConstantResolution:
   Enabled: false
 
@@ -777,6 +780,9 @@ Lint/ShadowedException:
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 
+Lint/SharedMutableDefault:
+  Enabled: true
+
 Lint/StructNewOverride:
   Enabled: false
 
@@ -1323,6 +1329,9 @@ Style/InvertibleUnlessCondition:
 Style/IpAddresses:
   Enabled: false
 
+Style/ItAssignment:
+  Enabled: true
+
 Style/KeywordArgumentsMerging:
   Enabled: false
 

diff --git a/lib/ruby_lsp/standard/addon.rb b/lib/ruby_lsp/standard/addon.rb
@@ -11,7 +11,7 @@ def name
       def activate(global_state, message_queue)
         @logger = ::Standard::Lsp::Logger.new(prefix: "[Standard Ruby]")
         @logger.puts "Activating Standard Ruby LSP addon v#{::Standard::VERSION}"
-        RuboCop::LSP.enable
+        ::RuboCop::LSP.enable
         @wraps_built_in_lsp_standardizer = WrapsBuiltinLspStandardizer.new
         global_state.register_formatter("standard", @wraps_built_in_lsp_standardizer)
         register_additional_file_watchers(global_state, message_queue)

diff --git a/standard.gemspec b/standard.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.metadata["rubygems_mfa_required"] = "true"
 
-  spec.add_dependency "rubocop", "~> 1.69.1"
+  spec.add_dependency "rubocop", "~> 1.70.0"
 
   spec.add_dependency "lint_roller", "~> 1.0"
   spec.add_dependency "standard-custom", "~> 1.0.0"