diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2011-12-27 04:08:29 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2011-12-27 04:08:29 +0100 |
| commit | 2afe23ab0a3d17b50f55750241a682403ced4fc8 (patch) | |
| tree | 19708f1d79ce22eed6b0e90de4760a8cfcc9504b /lib/coderay/scanners | |
| parent | c044a7a6eaba9ba47b8fde2cd6bdd444d8f87062 (diff) | |
| parent | 9c3837e0086ca07f241e9cc74c9fabbeb2d39987 (diff) | |
| download | coderay-2afe23ab0a3d17b50f55750241a682403ced4fc8.tar.gz | |
Merge branch 'master' into multiline-inline-diff
Conflicts:
coderay.gemspec
Diffstat (limited to 'lib/coderay/scanners')
| -rw-r--r-- | lib/coderay/scanners/diff.rb | 4 | ||||
| -rw-r--r-- | lib/coderay/scanners/java.rb | 2 | ||||
| -rw-r--r-- | lib/coderay/scanners/ruby.rb | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb index b890ed5..38efaf4 100644 --- a/lib/coderay/scanners/diff.rb +++ b/lib/coderay/scanners/diff.rb @@ -16,8 +16,6 @@ module Scanners protected - require 'coderay/helpers/file_type' - def scan_tokens encoder, options line_kind = nil @@ -50,7 +48,7 @@ module Scanners if match = scan(/.*?(?=$|[\t\n\x00]| \(revision)/) encoder.text_token match, :filename if options[:highlight_code] && match != '/dev/null' - file_type = FileType.fetch(match, :text) + file_type = CodeRay::FileType.fetch(match, :text) file_type = :text if file_type == :diff content_scanner = scanners[file_type] content_scanner_entry_state = nil diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb index d3502e3..c1490ac 100644 --- a/lib/coderay/scanners/java.rb +++ b/lib/coderay/scanners/java.rb @@ -6,7 +6,7 @@ module Scanners register_for :java - autoload :BuiltinTypes, 'coderay/scanners/java/builtin_types' + autoload :BuiltinTypes, CodeRay.coderay_path('scanners', 'java', 'builtin_types') # http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html KEYWORDS = %w[ diff --git a/lib/coderay/scanners/ruby.rb b/lib/coderay/scanners/ruby.rb index 4244ab7..2be98a6 100644 --- a/lib/coderay/scanners/ruby.rb +++ b/lib/coderay/scanners/ruby.rb @@ -13,8 +13,8 @@ module Scanners register_for :ruby file_extension 'rb' - autoload :Patterns, 'coderay/scanners/ruby/patterns' - autoload :StringState, 'coderay/scanners/ruby/string_state' + autoload :Patterns, CodeRay.coderay_path('scanners', 'ruby', 'patterns') + autoload :StringState, CodeRay.coderay_path('scanners', 'ruby', 'string_state') def interpreted_string_state StringState.new :string, true, '"' |