fixed YAML scanner (Scanner#column rewrite broke it)

korny · korny · commit 02e41d8e5891 · 2011-08-29T07:06:27.000+02:00
diff --git a/lib/coderay/scanner.rb b/lib/coderay/scanner.rb
@@ -231,9 +231,6 @@ def line pos = self.pos
       
       # The current column position of the scanner, starting with 1.
       # See also: #line.
-      #
-      # Beware, this is implemented inefficiently. It should be used
-      # for debugging only.
       def column pos = self.pos
         return 1 if pos <= 0
         pos - (binary_string.rindex(?\n, pos - 1) || -1)
diff --git a/lib/coderay/scanners/yaml.rb b/lib/coderay/scanners/yaml.rb
@@ -15,9 +15,8 @@ class YAML < Scanner
     
     def scan_tokens encoder, options
       
-      value_expected = nil
       state = :initial
-      key_indent = indent = 0
+      key_indent = string_indent = 0
       
       until eos?
         
@@ -55,14 +54,14 @@ def scan_tokens encoder, options
           when match = scan(/[|>][-+]?/)
             encoder.begin_group :string
             encoder.text_token match, :delimiter
-            string_indent = key_indent || column(pos - match.size - 1)
+            string_indent = key_indent || column(pos - match.size) - 1
             encoder.text_token matched, :content if scan(/(?:\n+ {#{string_indent + 1}}.*)+/)
             encoder.end_group :string
             next
           when match = scan(/(?![!"*&]).+?(?=$|\s+#)/)
             encoder.begin_group :string
             encoder.text_token match, :content
-            string_indent = key_indent || column(pos - match.size - 1)
+            string_indent = key_indent || column(pos - match.size) - 1
             encoder.text_token matched, :content if scan(/(?:\n+ {#{string_indent + 1}}.*)+/)
             encoder.end_group :string
             next
@@ -79,7 +78,7 @@ def scan_tokens encoder, options
             next
           when state == :initial && match = scan(/[\w.() ]*\S(?= *:(?: |$))/)
             encoder.text_token match, :key
-            key_indent = column(pos - match.size - 1)
+            key_indent = column(pos - match.size) - 1
             state = :colon
             next
           when match = scan(/(?:"[^"\n]*"|'[^'\n]*')(?= *:(?: |$))/)
@@ -88,7 +87,7 @@ def scan_tokens encoder, options
             encoder.text_token match[1..-2], :content
             encoder.text_token match[-1,1], :delimiter
             encoder.end_group :key
-            key_indent = column(pos - match.size - 1)
+            key_indent = column(pos - match.size) - 1
             state = :colon
             next
           when match = scan(/(![\w\/]+)(:([\w:]+))?/)
