standard 1.28.1 → 1.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c0920e71bbf9f203f59f683dfaec09f0b5828546a4b47d9d72079aa2a8fda9
-  data.tar.gz: 53cce6a924e050971619a48ae411dba9e002f0c3cdd48588c3f7a2ee68e20c9f
+  metadata.gz: 38cefe66ce8063af630a8ce4e21f3565ae614d9b4b06ec977f42586123d110ba
+  data.tar.gz: 6281549367fe086c1c6118662c741ab1042493c2f98942fd1b6f6e64755bfb8f
 SHA512:
-  metadata.gz: f8d4318e2527b6f2d20308caa846ba861a1432a9b1930ebfd2003475eed86dc0b095191cc64f1415a8d6f6130e82923e792cbadfc686eb60401a18026ea8b0df
-  data.tar.gz: e1fa000dc59e5c530a369238ddc1beb75470d10deb191709bc9d84546b39a327bb4bd80ee80202ec81fc788fee8cd8af588ccab75a4f111457336a16af3a9e52
+  metadata.gz: 4c6bf6c09d594f5a6bc2af47597e502d79717e8a5540d5214b20eb00222281bad3bcc01b2d48db1048df88229a67fc29ba1e2f7336aaf28e596b1aeed9cb5f11
+  data.tar.gz: ba211a922855471058ad9053684958532f82d8d160f763dd119d6bfa373dd0b63a408946e7134081b823c791f83febfa544a300232cfb8a4d2f0e0daad51ac15

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.28.2
+
+* Attempts to fix the not-actually fixed plugin behavior in 1.28.1
+
 ## 1.28.1
 
 * Fixes plugin behavior caused by setting `DisabledByDefault: true` in `AllCops`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    standard (1.28.1)
+    standard (1.28.2)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50.2)

data/lib/standard/plugin/merges_plugins_into_rubocop_config.rb

@@ -27,17 +27,16 @@ module Standard
 
       def call(options_config, standard_config, plugins, permit_merging:)
         runner_context = @creates_runner_context.call(standard_config)
-        plugin_config = combine_rubocop_configs(options_config, runner_context, plugins).to_h
+        plugin_config = combine_rubocop_configs(options_config, runner_context, plugins, permit_merging: permit_merging).to_h
         merge_config_into_all_cops!(options_config, plugin_config)
         merge_config_into_standard!(options_config, plugin_config, permit_merging: permit_merging)
       end
 
       private
 
-      def combine_rubocop_configs(options_config, runner_context, plugins)
+      def combine_rubocop_configs(options_config, runner_context, plugins, permit_merging:)
+        all_cop_keys_configured_by_plugins = all_cop_keys_previously_configured_by_plugins(options_config, permit_merging: permit_merging)
         fake_out_rubocop_default_configuration(options_config) do |fake_config|
-          all_cop_keys_configured_by_plugins = []
-
           plugins.reduce(fake_config) do |combined_config, plugin|
             RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, combined_config)
             next_config, path = config_for_plugin(plugin, runner_context)
@@ -49,7 +48,7 @@ module Standard
             )
             delete_already_configured_keys!(combined_config.keys, next_config, dont_delete_keys: ["AllCops"])
 
-            RuboCop::ConfigLoader.merge_with_default(next_config, path)
+            RuboCop::ConfigLoader.merge_with_default(next_config, path, unset_nil: false)
           end
         end
       end
@@ -61,7 +60,7 @@ module Standard
           [RuboCop::ConfigLoader.load_file(rules.value), rules.value]
         elsif rules.type == :object
           path = plugin.method(:rules).source_location[0]
-          [RuboCop::Config.create(rules.value, path), path]
+          [RuboCop::Config.create(rules.value, path, check: true), path]
         elsif rules.type == :error
           raise "Plugin `#{plugin.about&.name || plugin.inspect}' failed to load with error: #{rules.value.respond_to?(:message) ? rules.value.message : rules.value}"
         end
@@ -124,8 +123,16 @@ module Standard
         end
       end
 
+      def all_cop_keys_previously_configured_by_plugins(options_config, permit_merging:)
+        if permit_merging
+          []
+        else
+          Array(options_config["AllCops"]&.keys) - RuboCop::ConfigLoader.default_configuration["AllCops"].keys
+        end
+      end
+
       def fake_out_rubocop_default_configuration(options_config)
-        og_default_config = RuboCop::ConfigLoader.instance_variable_get(:@default_configuration)
+        og_default_config = RuboCop::ConfigLoader.default_configuration
         set_target_rails_version_on_all_cops_because_its_technically_not_allowed!(options_config)
         result = yield blank_rubocop_config(options_config)
         RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, og_default_config)
@@ -137,9 +144,9 @@ module Standard
       #
       # See: https://github.com/rubocop/rubocop/pull/11833
       def set_target_rails_version_on_all_cops_because_its_technically_not_allowed!(options_config)
-        return unless options_config.key?("AllCops")
+        return if !options_config.key?("AllCops") || options_config["AllCops"].key?("TargetRailsVersion")
 
-        options_config["AllCops"]["TargetRailsVersion"] = "~"
+        options_config["AllCops"]["TargetRailsVersion"] = nil
       end
 
       def blank_rubocop_config(example_config)

data/lib/standard/version.rb

@@ -1,3 +1,3 @@
 module Standard
-  VERSION = Gem::Version.new("1.28.1")
+  VERSION = Gem::Version.new("1.28.2")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standard
 version: !ruby/object:Gem::Version
-  version: 1.28.1
+  version: 1.28.2
 platform: ruby
 authors:
 - Justin Searls