Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: lsegal/yard
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.9.13
Choose a base ref
...
head repository: lsegal/yard
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.9.14
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on May 28, 2018

  1. Update changelog

    lsegal committed May 28, 2018
    Copy the full SHA
    5321e10 View commit details

Commits on Jun 3, 2018

  1. Copy the full SHA
    cd4452b View commit details
  2. Update changelog

    lsegal committed Jun 3, 2018
    Copy the full SHA
    1245beb View commit details
  3. Tag release v0.9.14

    References:
      #1170
    lsegal committed Jun 3, 2018
    Copy the full SHA
    41e6c84 View commit details
Showing with 22 additions and 13 deletions.
  1. +16 −0 CHANGELOG.md
  2. +3 −11 lib/yard/parser/ruby/ruby_parser.rb
  3. +1 −1 lib/yard/version.rb
  4. +2 −1 spec/parser/ruby/ruby_parser_spec.rb
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# [0.9.14] - June 2nd, 2018

[0.9.14]: https://github.com/lsegal/yard/compare/v0.9.13...v0.9.14

- Fixed a regression in symbol parsing (#1170).

# [0.9.13] - May 28th, 2018

[0.9.13]: https://github.com/lsegal/yard/compare/v0.9.12...v0.9.13

- Added support for grouped constants via `@!group` directive (#1056).
- Added support for quoted symbols (#1168).
- Added support for i18n in tag text (#1169).
- Fixed HTML rendering of inline code blocks (#1152).
- Fixed rendering of anchor URLs in rendered HTML (#1154).

# [0.9.12] - November 26th, 2017

[0.9.12]: https://github.com/lsegal/yard/compare/v0.9.11...v0.9.12
14 changes: 3 additions & 11 deletions lib/yard/parser/ruby/ruby_parser.rb
Original file line number Diff line number Diff line change
@@ -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]]

2 changes: 1 addition & 1 deletion lib/yard/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module YARD
VERSION = '0.9.13'
VERSION = '0.9.14'
end
3 changes: 2 additions & 1 deletion spec/parser/ruby/ruby_parser_spec.rb
Original file line number Diff line number Diff line change
@@ -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