Fix winding lines forward multiple lines

fixtures/small/all_method_blocks_actual.rb

@@ -21,3 +21,10 @@
 a.b 1 do
 
 end
+
+a do
+  # Comment at the beginning
+
+
+  # Comment at the end
+end

fixtures/small/all_method_blocks_expected.rb

@@ -15,3 +15,10 @@
 
 a.b(1) do
 end
+
+a do
+  # Comment at the beginning
+
+
+  # Comment at the end
+end

fixtures/small/begin_ensure_rescue_actual.rb

@@ -35,6 +35,17 @@ def func_with_comments
     end
   end
 
+  def another_func_with_comments
+    begin
+      # We don't do anything in here
+
+      # for some good reason
+    rescue
+      # I promise it's a good reason
+
+    end
+  end
+
   def func_with_mulilines
     _lambda_to_break_stuff = lambda do |this, that, the_other|
       wreak_havoc!

fixtures/small/begin_ensure_rescue_expected.rb

@@ -34,6 +34,17 @@ def func_with_comments
     end
   end
 
+  def another_func_with_comments
+    begin
+      # We don't do anything in here
+
+      # for some good reason
+    rescue
+      # I promise it's a good reason
+
+    end
+  end
+
   def func_with_mulilines
     _lambda_to_break_stuff = lambda do |this, that, the_other|
       wreak_havoc!

librubyfmt/rubyfmt_lib.rb

@@ -66,16 +66,10 @@ def initialize(file_data)
     @rbracket_stack = []
     @lbrace_stack = []
     @comments = {}
-    @last_ln = 0
     # binary contents comming after a `__END__` node
     @data_contents_start_line = nil
   end
 
-  def on_nl(*args)
-    @last_ln = lineno+1
-    super(*args)
-  end
-
   # This method has incorrect behavior inside Ripper,
   # so we patch it for now
   # original: https://github.com/ruby/ruby/blob/118368c1dd9304c0c21a4437016af235bd9b8438/ext/ripper/lib/ripper/sexp.rb#L144-L155
@@ -113,7 +107,7 @@ def parse
         nil
       end
 
-      [res, @comments, @lines_with_any_ruby, @last_ln, data_contents]
+      [res, @comments, @lines_with_any_ruby, @file_lines.count, data_contents]
     end
   end