fix: collect/export outputs 0-based linenos. fix checker.

This fixes the invalid offset warnings and invalid StartOffsets.
The checker has a --implheads option that allows relaxed comparisons,
because for rust sym.Content may contain extra implheads.

Author: Hoblovski

src/lang/check.py

@@ -5,13 +5,16 @@
     # 应当成功，尤其应当是 --zero_linebase（行号从 0 开始）
     $ python3 check.py --json lang.json --base . --zero_linebase
 
-"""
+检查 rust 项目
 
+    $ ./lang -d -v --no-need-comment collect rust ../../testdata/rust2 > rust2.json
+    $ python3 check.py --json lang.json --base . --zero_linebase --implheads
+"""
 import json
 import os
 import argparse
-from collections import defaultdict
 import sys
+from collections import defaultdict
 
 
 def trim_multiline(s, max_lines=5):
@@ -35,6 +38,7 @@ def verify_function_content(
     filter_files=None,
     filter_funcs=None,
     zero_linebase=False,
+    implheads=False,
 ):
     with open(json_path, "r", encoding="utf-8") as f:
         data = json.load(f)
@@ -72,7 +76,6 @@ def verify_function_content(
                 actual_bytes = content_bytes[start:end]
                 actual_content = safe_decode(actual_bytes)
 
-                # Line check
                 line_number = func["Line"]
                 content_str = safe_decode(content_bytes)
                 file_lines = content_str.splitlines()
@@ -85,12 +88,20 @@ def verify_function_content(
                 except IndexError:
                     actual_line_content = "<out of range>"
 
-                expected_line_start = (
-                    expected_content.splitlines()[0].strip() if expected_content else ""
-                )
-
-                offset_match = actual_content == expected_content
-                line_match = actual_line_content == expected_line_start
+                if implheads:
+                    offset_match = actual_content in expected_content
+                    line_match = any(
+                        line.strip() == actual_line_content.strip()
+                        for line in expected_content.splitlines()
+                    )
+                else:
+                    offset_match = actual_content == expected_content
+                    expected_line_start = (
+                        expected_content.splitlines()[0].strip()
+                        if expected_content
+                        else ""
+                    )
+                    line_match = actual_line_content == expected_line_start
 
                 print(f"[{module_name}/{package_name}] Checking function: {func_name}")
                 if not offset_match:
@@ -100,8 +111,13 @@ def verify_function_content(
                 if not line_match:
                     display_line_number = line_number if zero_linebase else line_number
                     print(f"  [Mismatch] Line {display_line_number} mismatch:")
-                    print(f"  Expected line: {expected_line_start}")
-                    print(f"  Actual line:   {actual_line_content}")
+                    print(f"  Expected line (from JSON content):")
+                    if implheads:
+                        print(f"    Any line in expected content matching actual line:")
+                    else:
+                        print(f"    {expected_line_start}")
+                    print(f"  Actual line:")
+                    print(f"    {actual_line_content}")
                 if not offset_match or not line_match:
                     errors[file_name].append(func_name)
                     if bail_on_error:
@@ -149,6 +165,11 @@ def verify_function_content(
         action="store_true",
         help="Line numbers in JSON are 0-based instead of 1-based",
     )
+    parser.add_argument(
+        "--implheads",
+        action="store_true",
+        help="Allow actual content to be a substring of expected content and lines to match any line",
+    )
 
     args = parser.parse_args()
     filter_files = set(args.filter_file.split(",")) if args.filter_file else None
@@ -161,4 +182,5 @@ def verify_function_content(
         filter_files=filter_files,
         filter_funcs=filter_funcs,
         zero_linebase=args.zero_linebase,
+        implheads=args.implheads,
     )

src/lang/collect/export.go

@@ -42,7 +42,7 @@ func (c *Collector) fileLine(loc Location) uniast.FileLine {
 	text := c.cli.GetFile(loc.URI).Text
 	return uniast.FileLine{
 		File:        rel,
-		Line:        loc.Range.Start.Line + 1,
+		Line:        loc.Range.Start.Line,
 		StartOffset: lsp.PositionOffset(text, loc.Range.Start),
 		EndOffset:   lsp.PositionOffset(text, loc.Range.End),
 	}

src/lang/lsp/lsp.go

@@ -98,7 +98,7 @@ type Location struct {
 }
 
 func (l Location) String() string {
-	return fmt.Sprintf("%s:%d:%d-%d:%d", l.URI, l.Range.Start.Line+1, l.Range.Start.Character+1, l.Range.End.Line+1, l.Range.End.Character+1)
+	return fmt.Sprintf("%s:%d:%d-%d:%d", l.URI, l.Range.Start.Line, l.Range.Start.Character, l.Range.End.Line, l.Range.End.Character)
 }
 
 var locationMarshalJSONInline = true

src/lang/lsp/lsp_test.go

@@ -1,11 +1,11 @@
 // Copyright 2025 CloudWeGo Authors
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     https://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/lang/lsp/utils.go

@@ -60,12 +60,12 @@ func RelativePostionWithLines(lines []int, textPos Position, pos Position) int {
 }
 
 func PositionOffset(text string, pos Position) int {
-	if pos.Line < 1 || pos.Character < 1 {
+	if pos.Line < 0 || pos.Character < 0 {
 		log.Error("invalid text position: %+v", pos)
 		return -1
 	}
 	lines := utils.CountLinesCached(text)
 	defer utils.PutCount(lines)
 
-	return RelativePostionWithLines(*lines, Position{Line: 1, Character: 1}, pos)
+	return RelativePostionWithLines(*lines, Position{Line: 0, Character: 0}, pos)
 }

src/lang/lsp/utils_test.go

@@ -30,43 +30,43 @@ func TestPositionOffset(t *testing.T) {
 		{
 			name:     "Single line text, position at start",
 			text:     "Hello, World!",
-			pos:      Position{Line: 1, Character: 1},
+			pos:      Position{Line: 0, Character: 0},
 			expected: 0,
 		},
 		{
 			name:     "Single line text, position at end",
 			text:     "Hello, World!",
-			pos:      Position{Line: 1, Character: 14},
+			pos:      Position{Line: 0, Character: 13},
 			expected: 13,
 		},
 		{
 			name:     "Multi-line text, position at start of first line",
 			text:     "Line 1\nLine 2\nLine 3",
-			pos:      Position{Line: 1, Character: 1},
+			pos:      Position{Line: 0, Character: 0},
 			expected: 0,
 		},
 		{
 			name:     "Multi-line text, position at end of first line",
 			text:     "Line 1\nLine 2\nLine 3",
-			pos:      Position{Line: 1, Character: 7},
+			pos:      Position{Line: 0, Character: 6},
 			expected: 6,
 		},
 		{
 			name:     "Multi-line text, position at start of second line",
 			text:     "Line 1\nLine 2\nLine 3",
-			pos:      Position{Line: 2, Character: 1},
+			pos:      Position{Line: 1, Character: 0},
 			expected: 7,
 		},
 		{
 			name:     "Multi-line text, position at end of last line",
 			text:     "Line 1\nLine 2\nLine 3",
-			pos:      Position{Line: 3, Character: 7},
+			pos:      Position{Line: 2, Character: 6},
 			expected: 20,
 		},
 		{
 			name:     "Empty text, position at start",
 			text:     "",
-			pos:      Position{Line: 1, Character: 1},
+			pos:      Position{Line: 0, Character: 0},
 			expected: 0,
 		},
 	}