rubocop-sorted_methods_by_call 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04b5916bbf8e91aa2792283ad7f15dc939907cb55e6fafec2f77e2cf966b6ff
-  data.tar.gz: 4f1475d1b0a3a5233b7f15010ae850dab4e696be9b209782d41d44cd5f1b3318
+  metadata.gz: 8c568478adfa06fb12f3331475fb296afe821c668bc36b44ec0fbbef97a88a3c
+  data.tar.gz: e04ee937e49ac42aab10de68c5d1b799176e782b9c8c259689c22767e357001c
 SHA512:
-  metadata.gz: 2bea6384c391d4a19a1cf83fb8ac9cb671d3325daeda8685d169c52ee8c1906e1f921b1da96a9ba128305b62bc99aaaf2d99567a8e5a9ea9aebd6630efb73383
-  data.tar.gz: d3cb6250866427b62ca907a9a4c73f8f30c69e94e6d9f767f105851394abb12d8444ac1e691f83df32f05abd1c40d09bf9da272e66d4dc0a1167dba439dcd83b
+  metadata.gz: 22296f6fa5a386b21ee246cdcc6e1cf6f8746a2ec2c3b9c00a8caba4f6238a580649c6dbc3f3b6d0c9705d495fc8179d01f3fb8555f553adfac58ead4c57afc0
+  data.tar.gz: c4fd9dbe58f02fdec60db0475b934ea420ff17c8c0abe6e732d19a1a251e25f73af69c4b06ed4df9425d98357ebc0f90cfeb78ddc98bada6ea9c049f31e3253b

data/config/default.yml

@@ -1,7 +1,7 @@
 SortedMethodsByCall/Waterfall:
   Description: "Enforces method ordering based on call relationships."
   Enabled: true
-  VersionAdded: "1.2.1"
+  VersionAdded: "1.2.2"
   SafeAutoCorrect: false
   AllowedRecursion: true
   SkipCyclicSiblingEdges: false

data/lib/rubocop/cop/sorted_methods_by_call/waterfall.rb

@@ -453,24 +453,15 @@ module RuboCop
           ranges_by_name = defs.to_h { |d| [d.method_name, range_with_leading_comments(d)] }
           sorted_def_sources = sorted_names.map { |n| ranges_by_name.fetch(n).source }
 
-          visibility_node   = target_section[:visibility]
-          visibility_source = visibility_node&.source.to_s
+          # IMPORTANT: only rewrite the contiguous def/defs block itself.
+          # Do NOT include the visibility line (private/protected/public) in the rewritten region,
+          # otherwise non-method statements between the visibility modifier and the first `def`
+          # (e.g., `helper_method :x`) can be deleted. See issue #10.
+          new_content = sorted_def_sources.join("\n\n")
 
-          new_content =
-            if visibility_source.empty?
-              sorted_def_sources.join("\n\n")
-            else
-              "#{visibility_source}\n\n#{sorted_def_sources.join("\n\n")}"
-            end
-
-          section_begin =
-            if visibility_node
-              visibility_node.source_range.begin_pos
-            else
-              defs.map { |d| range_with_leading_comments(d).begin_pos }.min
-            end
+          section_begin = defs.map { |d| ranges_by_name.fetch(d.method_name).begin_pos }.min
+          section_end   = defs.map { |d| ranges_by_name.fetch(d.method_name).end_pos }.max
 
-          section_end = target_section[:end_pos]
           region = range_between(section_begin, section_end)
           corrector.replace(region, new_content)
         end

data/lib/rubocop/sorted_methods_by_call/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module SortedMethodsByCall
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sorted_methods_by_call
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - unurgunite