Merge pull request #505 from rspec/support-end-less-methods-in-snippet-extractor

Support end-less methods in Source::Token

Author: yujinakayama

Changelog.md

@@ -1,12 +1,13 @@
 ### Development (unreleased)
 
 Breaking Changes:
-
 * Ruby < 2.3 is no longer supported. (Phil Pirozhkov, #436)
 
 Bug Fixes:
 * Use `Mutex#owned?` to allow `RSpec::Support::ReentrantMutex` to work in
   nested Fibers on Ruby 3.0 and later. (Benoit Daloze, #503)
+* Support `end`-less methods in `RSpec::Support::Source::Token`
+  so that RSpec won't hang when an `end`-less method raises an error. (Yuji Nakayama, #505)
 
 ### 3.10.0 / 2020-10-30
 

lib/rspec/support/source/token.rb

@@ -54,12 +54,16 @@ def keyword?
           type == :on_kw
         end
 
+        def equals_operator?
+          type == :on_op && string == '='
+        end
+
         def opening?
           opening_delimiter? || opening_keyword?
         end
 
         def closed_by?(other)
-          closed_by_delimiter?(other) || closed_by_keyword?(other)
+          delimiter_closed_by?(other) || keyword_closed_by?(other)
         end
 
       private
@@ -73,13 +77,16 @@ def opening_keyword?
           CLOSING_KEYWORDS_BY_OPENING_KEYWORD.key?(string)
         end
 
-        def closed_by_delimiter?(other)
+        def delimiter_closed_by?(other)
           other.type == CLOSING_TYPES_BY_OPENING_TYPE[type]
         end
 
-        def closed_by_keyword?(other)
-          return false unless other.keyword?
-          other.string == CLOSING_KEYWORDS_BY_OPENING_KEYWORD[string]
+        def keyword_closed_by?(other)
+          return false unless keyword?
+          return true if other.string == CLOSING_KEYWORDS_BY_OPENING_KEYWORD[string]
+
+          # Ruby 3's `end`-less method definition: `def method_name = body`
+          string == 'def' && other.equals_operator? && location.line == other.location.line
         end
       end
     end