rubocop-asjer 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f00a4effbc757a8aee4981d7b2c20608298f8b8a29c7c9399ac3fcdc9444313f
-  data.tar.gz: d2c05a6ec5e488ffb464b086c59b851563e08ba8b13920bb6caf36bdb20d8d8a
+  metadata.gz: e5ca85da8803a2b7cf65f61600adea61a52c32cd8c327b5e42d83b84a312035c
+  data.tar.gz: 82c413cfd54796c72251bfb67b53ac369a829e41ea64e91265de42dbebea1810
 SHA512:
-  metadata.gz: 2c0d217cb4de61f093339f34a3e667f46c69e3e9f7ca28c33240d9417509cc7d564a058e1f8a37b56a11a64c1c465c62705aa786f5d50bd4a2d714378f625017
-  data.tar.gz: ac1517e3467076ac9b5ab78d764e06461d908762413ebf09dc961c1bb3d64ba0a0080beea7ac19074b3852b32eab052d82f1881bd57884e94da9f13b9ae8c7fc
+  metadata.gz: 78f2ca3c66f118973d282f8e1ce6ad7e79a47a2c8e4e627c7aa25c006bb914d80ff2c0afde079cb47e5ace29b191d4565fc87f028a6fdc362816103e4f271846
+  data.tar.gz: fb1910e981dca843eeb1b0425d098b7d4fed04c96d3ee1e6b2bf15dda990b4ff92ea30db3fadfde05d36ef1772ecfe3d255a4f750910af1d0117839f91e9b72a

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.4.3"
+  ".": "0.4.5"
 }

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.4.5](https://github.com/asjer/rubocop-asjer/compare/v0.4.4...v0.4.5) (2026-03-08)
+
+
+### Bug Fixes
+
+* **rails_class_order:** prevent autocorrect from deleting interleaved non-target lines ([f7f1628](https://github.com/asjer/rubocop-asjer/commit/f7f162842e2188e99b24a53e55650bcaa678253f))
+
+## [0.4.4](https://github.com/asjer/rubocop-asjer/compare/v0.4.3...v0.4.4) (2026-02-10)
+
+
+### Bug Fixes
+
+* prevent excessive blank lines after autocorrect in `RailsClassOrder` cop ([56f6def](https://github.com/asjer/rubocop-asjer/commit/56f6deff1fab470ea5c7deac175d1d0088cd11f5))
+
 ## [0.4.3](https://github.com/asjer/rubocop-asjer/compare/v0.4.2...v0.4.3) (2026-01-28)
 
 

data/lib/rubocop/asjer/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Asjer
-    VERSION = '0.4.3'
+    VERSION = '0.4.5'
   end
 end

data/lib/rubocop/cop/asjer/rails_class_order.rb

@@ -93,24 +93,37 @@ module RuboCop
       # Autocorrect helpers for RailsClassOrder cop
       module RailsClassOrderCorrector
         def autocorrect(corrector, body, original, sorted)
-          first_target = original.min_by { |m| body.children.index(m) }
-          new_source = build_sorted_source(sorted, original)
-          corrector.replace(range_with_comments(first_target), new_source.rstrip)
+          ordered_targets = ordered_target_nodes(original)
+          corrector.replace(
+            correction_range_for(ordered_targets),
+            rebuilt_source(
+              sorted,
+              ordered_targets,
+              trailing_sibling: trailing_sibling?(body, ordered_targets.last)
+            )
+          )
+        end
 
-          (original - [first_target]).each do |method|
-            corrector.remove(full_method_range(method))
-          end
+        def ordered_target_nodes(original) = original.sort_by { |method| full_method_range(method).begin_pos }
+
+        def correction_range_for(ordered_targets)
+          # Stop at the last expression boundary so any newline/blank-line
+          # suffix after the final target stays in the surrounding source.
+          range_between(
+            range_with_comments(ordered_targets.first).begin_pos,
+            range_with_comments(ordered_targets.last).end_pos
+          )
         end
 
+        def trailing_sibling?(body, last_target) = body.children.index(last_target) < body.children.size - 1
+
         def range_with_comments(node)
           comments = preceding_comments(node)
           start_pos = comments.empty? ? node.loc.expression.begin_pos : comments.first.loc.expression.begin_pos
           range_between(start_pos, node.loc.expression.end_pos)
         end
 
-        def preceding_comments(node)
-          collect_adjacent_comments(node.loc.expression)
-        end
+        def preceding_comments(node) = collect_adjacent_comments(node.loc.expression)
 
         def collect_adjacent_comments(node_pos)
           expected_line = node_pos.first_line - 1
@@ -129,15 +142,74 @@ module RuboCop
           source = processed_source.buffer.source
           line_start = source.rindex("\n", range.begin_pos - 1)&.+(1) || 0
           end_pos = source[range.end_pos] == "\n" ? range.end_pos + 1 : range.end_pos
-          range_between(line_start, end_pos)
+
+          range_between(line_start, skip_trailing_blank_lines(source, end_pos))
         end
 
-        def build_sorted_source(sorted, original)
-          indent = ' ' * original.first.loc.column
+        def skip_trailing_blank_lines(source, pos)
+          while pos < source.length
+            line_end = source.index("\n", pos)
+            break unless line_end
+            break unless source[pos...line_end].strip.empty?
+
+            pos = line_end + 1
+          end
+          pos
+        end
+
+        def build_sorted_source(sorted, reference_targets)
+          indent = ' ' * reference_targets.first.loc.column
           grouped = sorted.group_by { |m| method_type(m) }
           format_grouped_source(grouped, indent)
         end
 
+        def rebuilt_source(sorted, ordered_targets, trailing_sibling:)
+          preserved = preserved_interstitial_source(ordered_targets)
+          rebuilt = [
+            build_sorted_source(sorted, ordered_targets).rstrip,
+            preserved
+          ].reject(&:empty?).join("\n\n")
+          trimmed = trim_trailing_newlines(rebuilt)
+
+          # Keep end-of-class output flush unless the final preserved chunk
+          # already carried a trailing blank line before it was moved.
+          return trimmed if trailing_sibling || !trailing_blank_line?(preserved)
+
+          "#{trimmed}\n"
+        end
+
+        def trim_trailing_newlines(source)
+          trimmed = source.dup
+          trimmed.chop! while trimmed.end_with?("\n")
+          trimmed
+        end
+
+        def trailing_blank_line?(source)
+          return false unless source&.end_with?("\n")
+
+          source[(source.rindex("\n", source.length - 2)&.+(1) || 0)...-1].strip.empty?
+        end
+
+        def preserved_interstitial_source(ordered_targets)
+          source = processed_source.buffer.source
+
+          ordered_targets
+            .map { |method| full_method_range(method) }
+            .each_cons(2)
+            .filter_map do |left, right|
+              normalize_interstitial_chunk(source[left.end_pos...right.begin_pos])
+            end
+            .join
+        end
+
+        def normalize_interstitial_chunk(chunk)
+          return if chunk.nil? || chunk.strip.empty?
+
+          # Strip leading blank lines only; trailing ones stay attached so later
+          # preserved chunks keep their separator spacing.
+          chunk.sub(/\A(?:[ \t]*\n)+/, '')
+        end
+
         def format_grouped_source(grouped, indent)
           self.class::TYPE_ORDER.keys.filter_map do |type|
             next unless grouped[type]&.any?

data/mise.toml

@@ -0,0 +1,2 @@
+[env]
+_.path = ["{{cwd}}/bin"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-asjer
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Asjer Querido
@@ -58,6 +58,7 @@ files:
 - lib/rubocop/asjer/version.rb
 - lib/rubocop/cop/asjer/no_default_translation.rb
 - lib/rubocop/cop/asjer/rails_class_order.rb
+- mise.toml
 - release-please-config.json
 - sig/rubocop/i18n.rbs
 homepage: https://github.com/asjer/rubocop-asjer