Skip to content

Fixes x%x% characters shown instead of & #1

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes x%x% characters shown instead of & #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e5f16b
Fixes x%x% characters shown instead of &
thorin Oct 21, 2014
2a539a5
Rails 5 compatibility : to_prepare
Utopism Aug 31, 2018
759e1f9
Merge pull request #1 from Utopism/master
thorin Sep 2, 2018
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
8 changes: 7 additions & 1 deletion init.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@
end

# Patches
ActionDispatch::Callbacks.to_prepare do
if Rails::VERSION::MAJOR >= 5
reload_object = ActiveSupport::Reloader
else
reload_object = ActionDispatch::Callbacks
end

reload_object.to_prepare do
# .. to uv gem itself
require_dependency 'uv_extension'
require_dependency 'uv_syntax_highlighting'
Expand Down
4 changes: 2 additions & 2 deletions lib/uv_syntax_highlighting.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ class << self
# Should not return line numbers nor outer pre tag
def highlight_by_filename(text, filename)
language = Uv.syntax_for_text(text, filename)
language ? highlight_by_language(text, language) : ERB::Util.h(text)
language ? highlight_by_language(text.gsub(/x%x%/m, '&'), language) : ERB::Util.h(text)
end

# Highlights +text+ using +language+ syntax
# Should not return outer pre tag
def highlight_by_language(text, language)
syntax = Uv.unalias(language)
if syntax then
xhtml = Uv.parse(text, "xhtml", syntax, false, user_theme)
xhtml = Uv.parse(text.gsub(/x%x%/m, '&'), "xhtml", syntax, false, user_theme)
xhtml.gsub /^<pre class=".+?">(.*)<\/pre>$/m, '\1'
else
Rails.logger.warn "redmine_ultraviolet: unknown syntax #{language}"
Expand Down