Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Return empty string when token_stream is nil #1056

Merged
merged 2 commits into from
Dec 5, 2023
Merged

fix: Return empty string when token_stream is nil #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
604dc16
fix: fix `NoMethodError` when `token_stream` is nil
toshimaru Nov 19, 2023
dbf2200
Early return when `token_stream` is `nil`
toshimaru Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/rdoc/token_stream.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ def pop_token
# Current token stream

def token_stream
@token_stream || []
@token_stream
end

##
# Returns a string representation of the token stream

def tokens_to_s
token_stream.compact.map { |token| token[:text] }.join ''
(token_stream or return '').compact.map { |token| token[:text] }.join ''
end

end
7 changes: 7 additions & 0 deletions test/rdoc/test_rdoc_token_stream.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ def test_class_to_html_empty
assert_equal '', RDoc::TokenStream.to_html([])
end

def test_token_stream
foo = Class.new do
include RDoc::TokenStream
end.new
assert_equal nil, foo.token_stream
end

def test_tokens_to_s
foo = Class.new do
include RDoc::TokenStream
Expand Down