rubocop_method_order 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a11e352cb4082399b5874ee8e3cd5832ec63767bce1fecf763623fcb007239b
-  data.tar.gz: 7d79c93d3f9fa79c4a68ab6ce6ebacb98e1f7a44dc018b5539d4e335381f3f01
+  metadata.gz: def792f4f78a2a78d2cffad454cfd738ac29c51930fa4b7514120f43b36ca2d3
+  data.tar.gz: 417d5b458152c7110bd0a391f58b9637d387509e25d629ad9398a467984ead49
 SHA512:
-  metadata.gz: d9dbbc9ff80535bf34c0b87ff1f20105f843647d9b8c668386a8d57f03971f921eb3c1d487127e45c9eb9e265e0f369940bf79397679032a100eb8c4a4233454
-  data.tar.gz: d5ed4b360456386c23e88bdb5ffae8b5b7eb445b183f5a97f9240cb5fa31a4fcd251538a537e5fdb477deab27d8d111f85b20e1112e263686e722c4471527770
+  metadata.gz: 3aef9fedf03c3cfc070234056250960ea06f119b65a09bee868e6c894cfcd3d8d301454c4732a9f5221ff3418507e7b127a2fa56cf6bfbef1dd25837c2606d92
+  data.tar.gz: 678b55a3dddd9da59c469dd0de80f21fbf8d03c6ad85f9b3885a0e6782cb6aec9adcb086becbed5c731a8881d467f74c2523d0dc1ee0a5193c60c74edd578676

data/CHANGELOG.md

@@ -3,7 +3,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [unreleased]
+
+## [0.2.1] - 2018-03-22
+
+### Fixed
+
+* Fix bug when trying to work with last method in file if there is no blank
+  ending line in the file.
+
+## [0.2.0] - 2018-03-22
 
 ### Fixed
 
@@ -16,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * Initial version of the extension.
 
-[unreleased]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.2.0...HEAD
+[unreleased]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/CoffeeAndCode/rubocop_method_order/releases/tag/v0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop_method_order (0.2.0)
+    rubocop_method_order (0.2.1)
       rubocop (~> 0.53)
 
 GEM

data/lib/rubocop/cop/style/method_order.rb

@@ -106,7 +106,9 @@ module RuboCop
         MSG = 'Methods should be sorted in alphabetical order within their section' \
               ' of the code. Method `%<method>s` should come before `%<previous_method>s`.'
 
-        def autocorrect(_node) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,
+        # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
+        def autocorrect(_node)
           lambda do |corrector|
             @method_collector.nodes_by_scope.values.each do |method_collection|
               next if @autocorrected_method_collections.include?(method_collection)
@@ -119,12 +121,21 @@ module RuboCop
                   @autocorrected_nodes << node_to_move
                   node_source = range_with_method_comments(node_to_move).source
                   replacement_range = range_with_method_comments(node_to_replace)
-                  corrector.replace(replacement_range, node_source)
+
+                  if node_source.end_with?("\n") && !replacement_range.source.end_with?("\n")
+                    corrector.replace(replacement_range, node_source.chomp("\n"))
+                  elsif !node_source.end_with?("\n") && replacement_range.source.end_with?("\n")
+                    corrector.replace(replacement_range, node_source + "\n")
+                  else
+                    corrector.replace(replacement_range, node_source)
+                  end
                 end
               end
             end
           end
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity,
+        # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
 
         def investigate(_processed_source)
           @autocorrected_method_collections = []
@@ -191,10 +202,16 @@ module RuboCop
           processed_source.comment_config.cop_enabled_at_line?(self, node.first_line)
         end
 
-        def end_pos_with_comments(node)
+        def end_pos_with_comments(node) # rubocop:disable Metrics/AbcSize
           range = node.source_range
           last_line = @processed_source.buffer.source_line(range.last_line)
-          range.end_pos + last_line.length - range.last_column + 1 # account for \n char
+          end_position = range.end_pos + last_line.length - range.last_column
+
+          if node.source_range.last_line == @processed_source.lines.count
+            end_position
+          else
+            end_position + 1
+          end
         end
 
         def message(method_name, following_method_name)

data/lib/rubocop_method_order/version.rb

@@ -11,7 +11,7 @@ module RuboCopMethodOrder
   module VERSION
     MAJOR = 0
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_method_order
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jonathan Knapp