Merge remote-tracking branch 'upstream/master' into fix-postfix-if-after-escaped-newline

Author: aycabta

lib/rdoc/parser/ruby.rb

@@ -1508,6 +1508,7 @@ def parse_method_or_yield_parameters(method = nil,
       end
       tk = get_tk
     end
+    @scanner.first_in_method_statement = true
 
     get_tkread_clean(/\s+/, ' ')
   end

lib/rdoc/ruby_lex.rb

@@ -45,6 +45,7 @@ class Error < RDoc::Error
 
   attr_accessor :continue
   attr_accessor :lex_state
+  attr_accessor :first_in_method_statement
   attr_reader :reader
 
   class << self
@@ -113,6 +114,7 @@ def initialize(content, options)
     @lex_state = :EXPR_BEG
     @space_seen = false
     @escaped_nl = false
+    @first_in_method_statement = false
     @after_question = false
 
     @continue = false
@@ -354,6 +356,7 @@ def token
       begin
         tk = @OP.match(self)
         @space_seen = tk.kind_of?(TkSPACE)
+        @first_in_method_statement = false if !@space_seen && @first_in_method_statement
       rescue SyntaxError => e
         raise Error, "syntax error: #{e.message}" if
           @exception_on_syntax_error
@@ -741,7 +744,7 @@ def lex_int2
       if :EXPR_FNAME == @lex_state or :EXPR_DOT == @lex_state
         @lex_state = :EXPR_ARG
         Token(TkId, op)
-      elsif @lex_state == :EXPR_BEG || @lex_state == :EXPR_MID
+      elsif @lex_state == :EXPR_BEG || @lex_state == :EXPR_MID || @first_in_method_statement
         identify_string(op)
       elsif peek(0) == '='
         getc

test/test_rdoc_parser_ruby.rb

@@ -2528,6 +2528,28 @@ def blah()
     assert_equal markup_code, expected
   end
 
+  def test_parse_statements_method_oneliner_with_regexp
+    util_parser <<RUBY
+class Foo
+  def blah() /bar/ end
+end
+RUBY
+
+    expected = <<EXPTECTED
+<span class="ruby-keyword">def</span> <span class="ruby-identifier">blah</span>() <span class="ruby-regexp">/bar/</span> <span class="ruby-keyword">end</span>
+EXPTECTED
+    expected = expected.rstrip
+
+    @parser.scan
+
+    foo = @top_level.classes.first
+    assert_equal 'Foo', foo.full_name
+
+    blah = foo.method_list.first
+    markup_code = blah.markup_code.sub(/^.*\n/, '')
+    assert_equal expected, markup_code
+  end
+
   def test_parse_statements_embdoc_in_document
     @filename = 'file.rb'
     util_parser <<RUBY