rubocop-graphql 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54137ed6106e3d8c0d2c675ea02e41989aef1d4480edf875071c9c7918a96fba
-  data.tar.gz: a1a0b7d307854a39d4b4761d77cc829569dd9e97453a329d027886331407aae0
+  metadata.gz: dcfe45f266ed034043a0d696144d81221322a9a6a68128e192fbac769ac696e7
+  data.tar.gz: 2f9a5060ffa601ba91b05fe3351029453d48da27a16a2b3512319fc4360bddc9
 SHA512:
-  metadata.gz: 9e1fc8711b226bd656ca33d8409949a40667e9eabf31ca55a3536ae5f4f54f3af4e7254cbaa589e406172c724afdeb6772ffe5dd689909ebeb09608c7c94b848
-  data.tar.gz: 392b99c409b0e2b8247fff232d35fab529c1abf5eb3f7b648f40eb9020b07a5c56f074d88538626e564872a4a13f1cb59ee20a5ddc0c982099a2aa3edc596289
+  metadata.gz: ba60c5712c2c6c5445e4ef26ca320bc55e9e83a563389162cad75bfac2fbdb6f20ff3c947fd75eda284367fca751a0f053429b2acc84255b403d04cd42e2bfec
+  data.tar.gz: 3e60c89cfaea9ed2e281f7cb6a62f77776c4ab816bd20051ac7e1f0acb5061fdf494de2928777c8fd67568d314e0cb3cf7109eb2bc0b78c8c1b292ac58948be1

data/lib/rubocop/cop/graphql/field_definitions.rb

@@ -47,6 +47,7 @@ module RuboCop
       class FieldDefinitions < Base # rubocop:disable Metrics/ClassLength
         extend AutoCorrector
         include ConfigurableEnforcedStyle
+        include CommentsHelp
         include RuboCop::GraphQL::NodePattern
         include RuboCop::Cop::RangeHelp
         include RuboCop::GraphQL::Sorbet
@@ -212,17 +213,19 @@ module RuboCop
         end
 
         def insert_new_resolver(corrector, field_definition, resolver_definition)
+          resolver_definition_range = source_range_with_comment(resolver_definition)
           source_to_insert =
             "\n#{signature_to_insert(resolver_definition)}\n" \
-              "#{indent(resolver_definition)}#{resolver_definition.source}\n"
+              "#{indent(resolver_definition)}#{resolver_definition_range.source.strip}\n"
 
           field_definition_range = range_including_heredoc(field_definition)
           corrector.insert_after(field_definition_range, source_to_insert)
         end
 
         def remove_old_resolver(corrector, resolver_definition)
+          resolver_definition_range = source_range_with_comment(resolver_definition)
           range_to_remove = range_with_surrounding_space(
-            range: resolver_definition.source_range, side: :left
+            range: resolver_definition_range, side: :left
           )
           corrector.remove(range_to_remove)
 
@@ -230,8 +233,9 @@ module RuboCop
 
           return unless resolver_signature
 
+          resolver_signature_range = source_range_with_comment(resolver_signature)
           range_to_remove = range_with_surrounding_space(
-            range: resolver_signature.source_range, side: :left
+            range: resolver_signature_range, side: :left
           )
           corrector.remove(range_to_remove)
         end
@@ -241,7 +245,8 @@ module RuboCop
 
           return unless signature
 
-          "\n#{indent(signature)}#{signature.source}"
+          range = source_range_with_comment(signature)
+          "\n#{indent(signature)}#{range.source.strip}"
         end
 
         def indent(node)

data/lib/rubocop/graphql/heredoc.rb

@@ -8,16 +8,23 @@ module RuboCop
       end
 
       def range_including_heredoc(node)
-        field = RuboCop::GraphQL::Field.new(node)
-        last_heredoc = field.kwargs.instance_variable_get(:@nodes).reverse.find do |kwarg|
-                         heredoc?(kwarg.value)
-                       end&.value
+        last_heredoc = find_last_heredoc(node)
 
         range = node.source_range
         range = range.join(last_heredoc.loc.heredoc_end) if last_heredoc
 
         range_by_whole_lines(range)
       end
+
+      private
+
+      def find_last_heredoc(node)
+        # Do a cheap check first.
+        return nil unless node.source.include?("<<")
+
+        heredocs = node.descendants.select { |descendant| heredoc?(descendant) }
+        heredocs.max_by { |heredoc| heredoc.loc.heredoc_end }
+      end
     end
   end
 end

data/lib/rubocop/graphql/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module GraphQL
-    VERSION = "1.5.2".freeze
+    VERSION = "1.5.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-01 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.90'
+        version: '1.50'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.90'
+        version: '1.50'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'