Fix parsing of symbols when symbol is a keyword

Fixes #1170
lsegal · Jun 3, 2018 · cd4452b · cd4452b
1 parent 5321e10
commit cd4452b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/lib/yard/parser/ruby/ruby_parser.rb b/lib/yard/parser/ruby/ruby_parser.rb
@@ -282,17 +282,9 @@ def add_token(token, data)
             end
           end
 
-          if token == :symbeg
-            @symbol = [:symbol, data, [lineno, charno]]
-          elsif @symbol
-            case token
-            when :tstring_content
-              @symbol[1] += data
-            when :tstring_end, :const, :ident
-              @symbol[1] += data
-              @tokens << @symbol
-              @symbol = nil
-            end
+          if @tokens.last && (@tokens.last[0] == :symbeg ||
+              (@tokens.last[0] == :symbol && token.to_s =~ /^tstring/))
+            @tokens[-1] = [:symbol, @tokens.last[1] + data, @tokens.last[2]]
           elsif @heredoc_state == :started
             @heredoc_tokens << [token, data, [lineno, charno]]
 

diff --git a/spec/parser/ruby/ruby_parser_spec.rb b/spec/parser/ruby/ruby_parser_spec.rb
@@ -310,10 +310,11 @@ class X
           Fuu = :bar
           Bar = :BAR
           Baz = :"B+z"
+          Qux = :if
         end
       eof
       symbols = tokens.select {|t| t[0] == :symbol }.map {|t| t[1] }
-      expect(symbols).to eq %w(:'' :bar :BAR :"B+z")
+      expect(symbols).to eq %w(:'' :bar :BAR :"B+z" :if)
     end
 
     it "parses %w() array in constant declaration" do