diff options
| -rw-r--r-- | etc/CodeRay.tmproj | 27 | ||||
| -rw-r--r-- | lib/coderay/scanners/haml.rb | 6 |
2 files changed, 6 insertions, 27 deletions
diff --git a/etc/CodeRay.tmproj b/etc/CodeRay.tmproj index f6d94ca..b63f332 100644 --- a/etc/CodeRay.tmproj +++ b/etc/CodeRay.tmproj @@ -2,8 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>currentDocument</key> - <string>../lib/coderay/scanners/haml.rb</string> <key>documents</key> <array> <dict> @@ -34,7 +32,7 @@ <key>filename</key> <string>../Changes-1.0.textile</string> <key>lastUsed</key> - <date>2011-08-19T03:20:53Z</date> + <date>2011-09-08T23:01:08Z</date> </dict> <dict> <key>filename</key> @@ -120,7 +118,7 @@ </dict> <dict> <key>filename</key> - <string>../rakefile</string> + <string>../Rakefile</string> <key>lastUsed</key> <date>2011-08-23T02:18:45Z</date> </dict> @@ -177,26 +175,7 @@ <key>fileHierarchyDrawerWidth</key> <integer>204</integer> <key>metaData</key> - <dict> - <key>../lib/coderay/scanners/haml.rb</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>94</integer> - <key>line</key> - <integer>135</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>93</integer> - </dict> - </dict> - <key>openDocuments</key> - <array> - <string>../lib/coderay/scanners/haml.rb</string> - </array> + <dict/> <key>showFileHierarchyDrawer</key> <true/> <key>windowFrame</key> diff --git a/lib/coderay/scanners/haml.rb b/lib/coderay/scanners/haml.rb index 52988b2..5433790 100644 --- a/lib/coderay/scanners/haml.rb +++ b/lib/coderay/scanners/haml.rb @@ -16,9 +16,9 @@ module Scanners def setup super - @ruby_scanner = CodeRay.scanner :ruby, :tokens => @tokens, :keep_tokens => true - @embedded_ruby_scanner = CodeRay.scanner :ruby, :tokens => @tokens, :keep_tokens => true, :state => @ruby_scanner.interpreted_string_state - @html_scanner = CodeRay.scanner :html, :tokens => @tokens, :keep_tokens => true + @ruby_scanner = CodeRay.scanner :ruby, :tokens => @tokens, :keep_tokens => true + @embedded_ruby_scanner = CodeRay.scanner :ruby, :tokens => @tokens, :keep_tokens => true, :state => @ruby_scanner.interpreted_string_state + @html_scanner = CodeRay.scanner :html, :tokens => @tokens, :keep_tokens => true end def scan_tokens encoder, options |