diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-08-30 17:02:38 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-08-30 17:02:38 +0200 |
commit | 19e48b58c1b3c4b57c85071ad7a939db0db35737 (patch) | |
tree | d1cf4638de95f18070b375a7f6ca2ea047a715f5 /lib/coderay/scanners/raydebug.rb | |
parent | 4e13ac40b21a9cb272fc7475a9976e1e0c0d8b11 (diff) | |
parent | a31b36683834f39c1581add498cce0b016f20fb5 (diff) | |
download | coderay-19e48b58c1b3c4b57c85071ad7a939db0db35737.tar.gz |
Merge branch 'master' into escape-utils
Diffstat (limited to 'lib/coderay/scanners/raydebug.rb')
-rw-r--r-- | lib/coderay/scanners/raydebug.rb | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/lib/coderay/scanners/raydebug.rb b/lib/coderay/scanners/raydebug.rb index d39d962..1effdc8 100644 --- a/lib/coderay/scanners/raydebug.rb +++ b/lib/coderay/scanners/raydebug.rb @@ -1,9 +1,11 @@ +require 'set' + module CodeRay module Scanners - # = Debug Scanner + # = Raydebug Scanner # - # Parses the output of the Encoders::Debug encoder. + # Highlights the output of the Encoders::Debug encoder. class Raydebug < Scanner register_for :raydebug @@ -12,6 +14,11 @@ module Scanners protected + def setup + super + @known_token_kinds = TokenKinds.keys.map(&:to_s).to_set + end + def scan_tokens encoder, options opened_tokens = [] @@ -26,20 +33,22 @@ module Scanners encoder.text_token kind, :class encoder.text_token '(', :operator match = self[2] - encoder.text_token match, kind.to_sym unless match.empty? + unless match.empty? + if @known_token_kinds.include? kind + encoder.text_token match, kind.to_sym + else + encoder.text_token match, :plain + end + end encoder.text_token match, :operator if match = scan(/\)/) elsif match = scan(/ (\w+) ([<\[]) /x) - kind = self[1] - case self[2] - when '<' - encoder.text_token kind, :class - when '[' - encoder.text_token kind, :class + encoder.text_token self[1], :class + if @known_token_kinds.include? self[1] + kind = self[1].to_sym else - raise 'CodeRay bug: This case should not be reached.' + kind = :unknown end - kind = kind.to_sym opened_tokens << kind encoder.begin_group kind encoder.text_token self[2], :operator |