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

Replace global methods with local lambdas #1430

Closed
wants to merge 3 commits into from
Closed

Replace global methods with local lambdas #1430

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ea9668
Replace `load_relative` with `rouge_relative`
ashmaroli Feb 6, 2020
dcc58dd
Merge branch 'master' into rouge-relative
ashmaroli Apr 5, 2020
c8f893a
Convert global methods into local lambdas
ashmaroli Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
96 changes: 45 additions & 51 deletions lib/rouge.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,60 +38,54 @@ def highlight(text, lexer, formatter, &b)
end
end

# mimic Kernel#require_relative API
def load_relative(path)
load File.join(Rouge::LIB_DIR, "#{path}.rb")
end

def lexer_dir(path = '')
File.join(Rouge::LIB_DIR, 'rouge/lexers', path)
end
load_relative = lambda { |path| load File.join(Rouge::LIB_DIR, "#{path}.rb") }
lexer_dir = lambda { |path| File.join(Rouge::LIB_DIR, 'rouge/lexers', path) }

load_relative 'rouge/version'
load_relative 'rouge/util'
load_relative 'rouge/text_analyzer'
load_relative 'rouge/token'
load_relative['rouge/version']
load_relative['rouge/util']
load_relative['rouge/text_analyzer']
load_relative['rouge/token']

load_relative 'rouge/lexer'
load_relative 'rouge/regex_lexer'
load_relative 'rouge/template_lexer'
load_relative['rouge/lexer']
load_relative['rouge/regex_lexer']
load_relative['rouge/template_lexer']

Dir.glob(lexer_dir('*rb')).each { |f| Rouge::Lexers.load_lexer(f.sub(lexer_dir, '')) }
Dir.glob(lexer_dir['*rb']).each { |f| Rouge::Lexers.load_lexer(f.sub(lexer_dir[''], '')) }

load_relative 'rouge/guesser'
load_relative 'rouge/guessers/util'
load_relative 'rouge/guessers/glob_mapping'
load_relative 'rouge/guessers/modeline'
load_relative 'rouge/guessers/filename'
load_relative 'rouge/guessers/mimetype'
load_relative 'rouge/guessers/source'
load_relative 'rouge/guessers/disambiguation'
load_relative['rouge/guesser']
load_relative['rouge/guessers/util']
load_relative['rouge/guessers/glob_mapping']
load_relative['rouge/guessers/modeline']
load_relative['rouge/guessers/filename']
load_relative['rouge/guessers/mimetype']
load_relative['rouge/guessers/source']
load_relative['rouge/guessers/disambiguation']

load_relative 'rouge/formatter'
load_relative 'rouge/formatters/html'
load_relative 'rouge/formatters/html_table'
load_relative 'rouge/formatters/html_pygments'
load_relative 'rouge/formatters/html_legacy'
load_relative 'rouge/formatters/html_linewise'
load_relative 'rouge/formatters/html_line_table'
load_relative 'rouge/formatters/html_inline'
load_relative 'rouge/formatters/terminal256'
load_relative 'rouge/formatters/terminal_truecolor'
load_relative 'rouge/formatters/tex'
load_relative 'rouge/formatters/null'
load_relative['rouge/formatter']
load_relative['rouge/formatters/html']
load_relative['rouge/formatters/html_table']
load_relative['rouge/formatters/html_pygments']
load_relative['rouge/formatters/html_legacy']
load_relative['rouge/formatters/html_linewise']
load_relative['rouge/formatters/html_line_table']
load_relative['rouge/formatters/html_inline']
load_relative['rouge/formatters/terminal256']
load_relative['rouge/formatters/terminal_truecolor']
load_relative['rouge/formatters/tex']
load_relative['rouge/formatters/null']

load_relative 'rouge/theme'
load_relative 'rouge/tex_theme_renderer'
load_relative 'rouge/themes/thankful_eyes'
load_relative 'rouge/themes/colorful'
load_relative 'rouge/themes/base16'
load_relative 'rouge/themes/github'
load_relative 'rouge/themes/igor_pro'
load_relative 'rouge/themes/monokai'
load_relative 'rouge/themes/molokai'
load_relative 'rouge/themes/monokai_sublime'
load_relative 'rouge/themes/gruvbox'
load_relative 'rouge/themes/tulip'
load_relative 'rouge/themes/pastie'
load_relative 'rouge/themes/bw'
load_relative 'rouge/themes/magritte'
load_relative['rouge/theme']
load_relative['rouge/tex_theme_renderer']
load_relative['rouge/themes/thankful_eyes']
load_relative['rouge/themes/colorful']
load_relative['rouge/themes/base16']
load_relative['rouge/themes/github']
load_relative['rouge/themes/igor_pro']
load_relative['rouge/themes/monokai']
load_relative['rouge/themes/molokai']
load_relative['rouge/themes/monokai_sublime']
load_relative['rouge/themes/gruvbox']
load_relative['rouge/themes/tulip']
load_relative['rouge/themes/pastie']
load_relative['rouge/themes/bw']
load_relative['rouge/themes/magritte']