pronto-rubocop 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1b54bb1da3b75627d89dcf30ade91899bc7841331d07aee4741dcd0dbd666bf
-  data.tar.gz: d7aa8f5af922b6ba949e4261494d28b14c870f0fc38a09a951de25eaca15aee7
+  metadata.gz: 31a6b1d783a13213827c18f9b43e4abeb8059eeb5f03327932ab4adddb4a605e
+  data.tar.gz: f6c46e2ec733ae8e6734f6c8b5ad0e6960a4cf7ab084ac5ef9b9c1c522f6f9a2
 SHA512:
-  metadata.gz: d66a9abf4c546eb99092f9a253f6ed6da1a38d12aa8172a77a5fb4ce043e7958efd1a25d6b26714fd1fb3c36c3f6d55e9be90aadec77746ddcb33da8905f83f4
-  data.tar.gz: 372bd0473ed8a3704b97e9b633a2238d159746d0b780641e8898261dbbc0549f6df6fe096e212b0b1c20ab5bb74ec31444c74f71174d8b059f322ca073e811cf
+  metadata.gz: 8334a6dcde6ea5160695f8ec9104f74bdd81b5e9d3f67dd4ed7dbd19d4ccec6f843832449141996012cac311a1e653e1e3957614ee7145c024fb5689d31c2f76
+  data.tar.gz: de20031af59547eb5c717a03943086267cfa6efef577bd604d817e32e85b9c5136f6826ae08a806bc51c03be114a1d89f8d487d4b95ac511c6668e427d7b23cf

data/.github/workflows/checks.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0']
+        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
         rubocop: ['0.63.1', '0.81.0', '0.84.0', '0.85.0', '0.86.0', '0.87.0', '< 1.0', '1.0.0', '1.29.1', '1.30.0', '1.38.0', '< 2.0']
         include:
           - ruby: '2.3'
@@ -36,7 +36,7 @@ jobs:
             rubocop: '1.38.0'
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: use specific rubocop version
       run: echo "gem 'rubocop', '${{ matrix.rubocop }}'" > Gemfile.local
     - name: use specific rubocop-ast version (if required)

data/lib/pronto/rubocop/offense_line.rb

@@ -34,6 +34,7 @@ module Pronto
       def suggestion_text
         return unless patch_cop.runner.pronto_rubocop_config['suggestions']
         return if corrections_count.zero?
+        return if corrector.nil?  # possible after optimisation in https://github.com/rubocop/rubocop/pull/11264
         return if differing_lines_count != corrections_count
 
         @suggestion_text ||= corrected_lines[offense.line - 1]

data/lib/pronto/rubocop/patch_cop.rb

@@ -13,12 +13,9 @@ module Pronto
       def messages
         return [] unless valid?
 
-        offenses.flat_map do |offense|
-          patch
-            .added_lines
-            .select { |line| line.new_lineno == offense.line }
-            .map { |line| OffenseLine.new(self, offense, line).message }
-        end
+        offenses
+          .map { |offense| first_relevant_message(patch, offense) }
+          .compact
       end
 
       def processed_source
@@ -67,6 +64,11 @@ module Pronto
           .reject(&:disabled?)
       end
 
+      def offense_includes?(offense, line_number)
+        offense_range = (offense.location.first_line..offense.location.last_line)
+        offense_range.include?(line_number)
+      end
+
       def team
         @team ||=
           if ::RuboCop::Cop::Team.respond_to?(:mobilize)
@@ -76,6 +78,19 @@ module Pronto
             ::RuboCop::Cop::Team.new(registry, rubocop_config)
           end
       end
+
+      def first_relevant_line(patch, offense)
+        patch.added_lines.detect do |line|
+          offense_includes?(offense, line.new_lineno)
+        end
+      end
+
+      def first_relevant_message(patch, offense)
+        offending_line = first_relevant_line(patch, offense)
+        return nil unless offending_line
+
+        OffenseLine.new(self, offense, offending_line).message
+      end
     end
   end
 end

data/lib/pronto/rubocop/version.rb

@@ -2,6 +2,6 @@
 
 module Pronto
   module RubocopVersion
-    VERSION = '0.11.4'
+    VERSION = '0.11.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pronto-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Mindaugas Mozūras
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-31 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pronto
@@ -86,7 +86,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description:
+description: 
 email: mindaugas.mozuras@gmail.com
 executables: []
 extensions: []
@@ -107,7 +107,7 @@ homepage: http://github.com/mmozuras/pronto-rubocop
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Pronto runner for Rubocop, ruby code analyzer
 test_files: []