8000 Speed up HTML encoder for 1.2 by korny · Pull Request #153 · rubychan/coderay · GitHub
[go: up one dir, main page]
Skip to content

Speed up HTML encoder for 1.2 #153

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 19 commits into
base: master
Choose a base branch
from
Open

Speed up HTML encoder for 1.2 #153

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
90cf032
cache escaped tokens, reduce HTML enc setup time
korny Aug 31, 2013
4f19f44
Merge branch 'master' into possible-speedups
korny Sep 7, 2013
370c6d3
cleanup changes into make_escape_cache
korny Sep 20, 2013
9cd856d
Merge branch 'master' into possible-speedups
korny Sep 20, 2013
0023dee
don't break old API
korny Oct 3, 2013
94ced62
even less API changes
korny Oct 3, 2013
bc4854f
don't escape " in HTML
korny Nov 20, 2013
7aa6ea0
Merge branch 'master' into possible-speedups
korny Dec 18, 2014
e93cdf6
Merge branch 'master' into possible-speedups
korny Dec 24, 2015
0b19ccf
Merge branch 'master' into possible-speedups
korny Feb 13, 2016
3e10d56
Merge branch 'master' into possible-speedups
korny Jun 4, 2016
aa9229f
use EscapeUtils
korny Jun 7, 2016
122dd5f
speedup plugin lookup
korny Jun 12, 2016
351822b
don't escape /
korny Jun 12, 2016
c999deb
fix tests
korny Jun 12, 2016
ffdd9dd
Merge branch 'master' into possible-speedups
korny Dec 28, 2016
8537875
Merge branch 'master' into possible-speedups
korny Nov 2, 2017
0dc1ca3
Merge branch 'master' into possible-speedups
korny Nov 2, 2017
2e3fbe3
Merge branch 'master' into possible-speedups
korny Nov 2, 2017
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
Prev Previous commit
Next Next commit
Merge branch 'master' into possible-speedups 
Conflicts:
	lib/coderay/encoders/html.rb
  • Loading branch information
@korny
korny committed Dec 18, 2014
commit 7aa6ea080d05b7e6a70b076b25f37b72fd7669ad
2 changes: 1 addition & 1 deletion lib/coderay/encoders/html.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def make_escape_cache options
if options[:tab_width] == DEFAULT_OPTIONS[:tab_width]
HTML_ESCAPE
else
HTML_ESCAPE.merge("\t" => ' ' * options[:tab_width])
HTML_ESCAPE.merge("\t" => options[:tab_width] ? ' ' * options[:tab_width] : "\t")
end

Hash.new do |cache, text|
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0