Set line and offset correctly

Author: drbrain

lib/rdoc/parser/ruby.rb

@@ -452,7 +452,7 @@ def make_message message
   # +comment+.
 
   def parse_attr(context, single, tk, comment)
-    column  = tk.char_no
+    offset  = tk.seek
     line_no = tk.line_no
 
     args = parse_symbol_arg 1
@@ -470,7 +470,7 @@ def parse_attr(context, single, tk, comment)
 
       att = RDoc::Attr.new get_tkread, name, rw, comment, single == SINGLE
       att.record_location @top_level
-      att.offset = column
+      att.offset = offset
       att.line   = line_no
 
       read_documentation_modifiers att, RDoc::ATTR_MODIFIERS
@@ -488,7 +488,7 @@ def parse_attr(context, single, tk, comment)
   # comment for each to +comment+.
 
   def parse_attr_accessor(context, single, tk, comment)
-    column  = tk.char_no
+    offset  = tk.seek
     line_no = tk.line_no
 
     args = parse_symbol_arg
@@ -509,7 +509,7 @@ def parse_attr_accessor(context, single, tk, comment)
     for name in args
       att = RDoc::Attr.new get_tkread, name, rw, comment, single == SINGLE
       att.record_location @top_level
-      att.offset = column
+      att.offset = offset
       att.line   = line_no
 
       context.add_attribute att
@@ -521,7 +521,7 @@ def parse_attr_accessor(context, single, tk, comment)
   # Parses an +alias+ in +context+ with +comment+
 
   def parse_alias(context, single, tk, comment)
-    column  = tk.char_no
+    offset  = tk.seek
     line_no = tk.line_no
 
     skip_tkspace
@@ -550,7 +550,7 @@ def parse_alias(context, single, tk, comment)
     al = RDoc::Alias.new(get_tkread, old_name, new_name, comment,
                          single == SINGLE)
     al.record_location @top_level
-    al.offset = column
+    al.offset = offset
     al.line   = line_no
 
     read_documentation_modifiers al, RDoc::ATTR_MODIFIERS
@@ -604,7 +604,7 @@ def parse_call_parameters(tk)
   # Parses a class in +context+ with +comment+
 
   def parse_class(container, single, tk, comment)
-    column  = tk.char_no
+    offset  = tk.seek
     line_no = tk.line_no
 
     declaration_context = container
@@ -627,7 +627,7 @@ def parse_class(container, single, tk, comment)
 
       read_documentation_modifiers cls, RDoc::CLASS_MODIFIERS
       cls.record_location @top_level
-      cls.offset = column
+      cls.offset = offset
       cls.line   = line_no
 
       cls.comment = comment if cls.document_self
@@ -646,7 +646,7 @@ def parse_class(container, single, tk, comment)
         unless other then
           other = container.add_module RDoc::NormalModule, name
           other.record_location @top_level
-          other.offset  = column
+          other.offset  = offset
           other.line    = line_no
 
           other.comment = comment
@@ -675,7 +675,7 @@ def parse_class(container, single, tk, comment)
   # Parses a constant in +context+ with +comment+
 
   def parse_constant(container, tk, comment)
-    column  = tk.char_no
+    offset  = tk.seek
     line_no = tk.line_no
 
     name = tk.name
@@ -750,7 +750,7 @@ def parse_constant(container, tk, comment)
 
     con = RDoc::Constant.new name, res, comment
     con.record_location @top_level
-    con.offset = column
+    con.offset = offset
     con.line   = line_no
     read_documentation_modifiers con, RDoc::CONSTANT_MODIFIERS
 
@@ -764,8 +764,9 @@ def parse_constant(container, tk, comment)
   # :method: or :attr: directives in +comment+.
 
   def parse_comment(container, tk, comment)
-    line_no = tk.line_no
     column  = tk.char_no
+    offset  = tk.seek
+    line_no = tk.line_no
 
     singleton = !!comment.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
 
@@ -776,7 +777,7 @@ def parse_comment(container, tk, comment)
       meth = RDoc::GhostMethod.new get_tkread, name
       meth.record_location @top_level
       meth.singleton = singleton
-      meth.offset    = column
+      meth.offset    = offset
       meth.line      = line_no
 
       meth.start_collecting_tokens
@@ -810,7 +811,7 @@ def parse_comment(container, tk, comment)
       # TODO authorize 'singleton-attr...'?
       att = RDoc::Attr.new get_tkread, name, rw, comment
       att.record_location @top_level
-      att.offset    = column
+      att.offset    = offset
       att.line      = line_no
 
       container.add_attribute att
@@ -906,8 +907,9 @@ def parse_meta_attr(context, single, tk, comment)
   # Parses a meta-programmed method
 
   def parse_meta_method(container, single, tk, comment)
-    line_no = tk.line_no
     column  = tk.char_no
+    offset  = tk.seek
+    line_no = tk.line_no
 
     start_collecting_tokens
     add_token tk
@@ -939,7 +941,7 @@ def parse_meta_method(container, single, tk, comment)
 
     meth = RDoc::MetaMethod.new get_tkread, name
     meth.record_location @top_level
-    meth.offset = column
+    meth.offset = offset
     meth.line   = line_no
     meth.singleton = singleton
 
@@ -993,8 +995,9 @@ def parse_method(container, single, tk, comment)
     added_container = nil
     meth = nil
     name = nil
-    line_no = tk.line_no
     column  = tk.char_no
+    offset  = tk.seek
+    line_no = tk.line_no
 
     start_collecting_tokens
     add_token tk
@@ -1086,7 +1089,7 @@ def parse_method(container, single, tk, comment)
     end
 
     meth.record_location @top_level
-    meth.offset = column
+    meth.offset = offset
     meth.line   = line_no
 
     meth.start_collecting_tokens

test/test_rdoc_parser_ruby.rb

@@ -801,7 +801,7 @@ def foo; end
     assert_equal %w[A::B A::d], RDoc::TopLevel.modules.map { |c| c.full_name }
 
     b = RDoc::TopLevel.modules.first
-    assert_equal 2, b.offset # HACK should be 10
+    assert_equal 10, b.offset
     assert_equal 2,  b.line
 
     # make sure method/alias was not added to enclosing class/module