From d3fa14e8438a4bce18c141e1011059f7f5a125fc Mon Sep 17 00:00:00 2001 From: murphy Date: Wed, 30 Dec 2009 07:15:11 +0000 Subject: Using XML scanner for XML literals. --- lib/coderay/scanners/java_script.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/coderay/scanners/java_script.rb') diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb index 46c8c50..772c854 100644 --- a/lib/coderay/scanners/java_script.rb +++ b/lib/coderay/scanners/java_script.rb @@ -90,7 +90,8 @@ module Scanners end elsif value_expected && match = scan(/<([[:alpha:]]\w*) (?: [^\/>]*\/> | .*?<\/\1>)/xim) - html_scanner.tokenize match + # FIXME: scan over nested tags + xml_scanner.tokenize match value_expected = false next @@ -210,11 +211,11 @@ module Scanners def reset_instance super - @html_scanner.reset if defined? @html_scanner + @xml_scanner.reset if defined? @xml_scanner end - def html_scanner - @html_scanner ||= CodeRay.scanner :html, :tokens => @tokens, :keep_tokens => true, :keep_state => true + def xml_scanner + @xml_scanner ||= CodeRay.scanner :xml, :tokens => @tokens, :keep_tokens => true, :keep_state => true end end -- cgit v1.2.1