Pass the percent string type directly down instead of attempting to guess it from the ending character

Author: drbrain

lib/rdoc/ruby_lex.rb

@@ -1032,21 +1032,22 @@ def identify_here_document
   end
 
   def identify_quotation
-    ch = getc
-    if lt = PERCENT_LTYPE[ch]
+    type = ch = getc
+    if lt = PERCENT_LTYPE[type]
       ch = getc
-    elsif ch =~ /\W/
+    elsif type =~ /\W/
+      type = nil
       lt = "\""
     else
-      raise Error, "unknown type of %string #{ch.inspect}"
+      raise Error, "unknown type of %string #{type.inspect}"
     end
     #     if ch !~ /\W/
     #       ungetc
     #       next
     #     end
     #@ltype = lt
     @quoted = ch unless @quoted = PERCENT_PAREN[ch]
-    identify_string(lt, @quoted)
+    identify_string(lt, @quoted, type)
   end
 
   def identify_number(op = "")
@@ -1157,17 +1158,17 @@ def identify_number(op = "")
     Token(type, num)
   end
 
-  def identify_string(ltype, quoted = ltype)
+  def identify_string(ltype, quoted = ltype, type = nil)
     close = PERCENT_PAREN.values.include?(quoted)
     @ltype = ltype
     @quoted = quoted
 
     str = if ltype == quoted and %w[" '].include? ltype then
             ltype.dup
           elsif RUBY_VERSION > '1.9' then
-            "%#{PERCENT_LTYPE.key ltype}#{PERCENT_PAREN_REV[quoted]}"
+            "%#{type or PERCENT_LTYPE.key ltype}#{PERCENT_PAREN_REV[quoted]}"
           else
-            "%#{PERCENT_LTYPE.index ltype}#{PERCENT_PAREN_REV[quoted]}"
+            "%#{type or PERCENT_LTYPE.index ltype}#{PERCENT_PAREN_REV[quoted]}"
           end
 
     subtype = nil

test/test_rdoc_ruby_lex.rb

@@ -95,10 +95,10 @@ def test_class_tokenize_heredoc_percent_N
   end
 
   def test_class_tokenize_percent_w
-    tokens = RDoc::RubyLex.tokenize "%w[hi]", nil
+    tokens = RDoc::RubyLex.tokenize '%w[hi]', nil
 
     expected = [
-      @TK::TkDSTRING.new( 0, 1,  0, "%w[hi]"),
+      @TK::TkDSTRING.new( 0, 1,  0, '%w[hi]'),
       @TK::TkNL     .new( 6, 1, 6, "\n"),
     ]