Merge pull request rmosolgo#1448 from michal-samluk/fix_upgrader_parentheses

Parentheses are breaking upgrader

Author: Robert Mosolgo

lib/graphql/upgrader/member.rb

@@ -161,7 +161,8 @@ def apply(input_text)
         keep_looking = true
         while keep_looking do
           keep_looking = false
-          input_text = input_text.gsub(/(?<field>(?:field|input_field|return_field|connection|argument)(?:\(.*|.*,))\n\s*(?<next_line>.+)/) do
+          # Find the `field` call (or other method), and an open paren, but not a close paren, or a comma between arguments
+          input_text = input_text.gsub(/(?<field>(?:field|input_field|return_field|connection|argument)(?:\([^)]*|.*,))\n\s*(?<next_line>.+)/) do
             keep_looking = true
             field = $~[:field].chomp
             next_line = $~[:next_line]
@@ -177,8 +178,8 @@ def apply(input_text)
     class RemoveMethodParensTransform < Transform
       def apply(input_text)
         input_text.sub(
-          /(field|input_field|return_field|connection|argument)\( *(.*?) *\) */,
-          '\1 \2'
+          /(field|input_field|return_field|connection|argument)\( *(.*?) *\)( *)/,
+          '\1 \2\3'
         )
       end
     end
@@ -485,7 +486,7 @@ def find_returned_hashes(node, returning:)
 
     class ResolveProcToMethodTransform < Transform
       def apply(input_text)
-        if input_text =~ /resolve ->/
+        if input_text =~ /resolve\(? ?->/
           # - Find the proc literal
           # - Get the three argument names (obj, arg, ctx)
           # - Get the proc body

spec/fixtures/upgrader/photo.original.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module Platform
+  module Objects
+    Photo = GraphQL::ObjectType.define do
+      field(:caption, types.String) do
+        resolve(->(obj, _args, _ctx) { obj.caption })
+      end
+    end
+  end
+end

spec/fixtures/upgrader/photo.transformed.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Platform
+  module Objects
+    class Photo < Platform::Objects::Base
+      field :caption, String, null: true
+
+      def caption
+        @object.caption
+      end
+    end
+  end
+end