issue #7: source fixed

pejuko · Nov 4, 2012 · 2649e28 · 2649e28
1 parent 1be6b65
commit 2649e28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/coderay/scanners/bash.rb b/lib/coderay/scanners/bash.rb
@@ -87,7 +87,9 @@ def scan_tokens encoder, options
             kind = :comment
           elsif match = scan(/[^"]#/)
             kind = :ident
-          elsif match = scan(/(?:\. |source ).*/)
+          elsif match = scan(/\.+/)
+            kind = :plain
+          elsif match = scan(/(?:\.|source)\s+/)
             kind = :reserved
           elsif match = scan(/(?:\\.|,)/)
             kind = :plain

diff --git a/test/test.rb b/test/test.rb
@@ -81,7 +81,7 @@ class TestArray < Test::Unit::TestCase
 
   def test_0010_Array
     eb_file = File.join($current_dir, "json.sh")
-    assert_equal(["cat",:ident," ",:space,"$1",:predefined_constant," ",:space,"|",:plain," ",:space,"while",:reserved," ",:space,"read",:method," ",:space,"json;",:instance_variable," ",:space,"do",:reserved," ",:space,"if",:reserved," ",:space,"[",:reserved,"[",:reserved," ",:space,"${",:instance_variable,"array2",:instance_variable,"[",:operator,"0",:key,"]",:operator,"}",:instance_variable," ",:space,"=",:operator,"=",:operator," ",:space,"1",:integer," ",:space,"]",:reserved,"]",:reserved,";",:delimiter," ",:space,"then",:reserved,"\n",:end_line,"echo",:method," ",:space,"$json",:instance_variable," ",:space,"|",:plain," ",:space,".",:plain,".",:plain,".",:plain,".",:plain,".",:plain,".",:plain,"\n",:end_line],
+    assert_equal(["cat",:ident," ",:space,"$1",:predefined_constant," ",:space,"|",:plain," ",:space,"while",:reserved," ",:space,"read",:method," ",:space,"json;",:instance_variable," ",:space,"do",:reserved," ",:space,"if",:reserved," ",:space,"[",:reserved,"[",:reserved," ",:space,"${",:instance_variable,"array2",:instance_variable,"[",:operator,"0",:key,"]",:operator,"}",:instance_variable," ",:space,"=",:operator,"=",:operator," ",:space,"1",:integer," ",:space,"]",:reserved,"]",:reserved,";",:delimiter," ",:space,"then",:reserved,"\n",:end_line,"echo",:method," ",:space,"$json",:instance_variable," ",:space,"|",:plain," ",:space,"......",:plain,"\n",:end_line],
                  CodeRay.scan(File.read(eb_file), :bash).tokens)
   end