scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tree sitter to output 1-based line numbers (#2236)

Browse source
This commit is contained in:
Matt Rubens 2025-04-02 16:29:52 -05:00 • committed by GitHub
parent 42f7465666
commit 24a46698f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/services/tree-sitter/__tests__/index.test.ts
View file

@ -309,7 +309,7 @@ export const CheckboxExample = () => (
// Verify function found and correctly parsed
expect(result).toContain("jsx-arrow.tsx")
expect(result).toContain("4--14 |")
expect(result).toContain("5--15 |")
// Verify line count
const capture = mockQuery.captures.mock.results[0].value[0]

12
src/services/tree-sitter/__tests__/markdownIntegration.test.ts
View file

@ -36,10 +36,10 @@ describe("Markdown Integration Tests", () => {
// Check the result
expect(result).toBeDefined()
expect(result).toContain("# test.md")
expect(result).toContain("0--4 | # Main Header")
expect(result).toContain("5--9 | ## Section 1")
expect(result).toContain("10--14 | ### Subsection 1.1")
expect(result).toContain("15--19 | ## Section 2")
expect(result).toContain("1--5 | # Main Header")
expect(result).toContain("6--10 | ## Section 1")
expect(result).toContain("11--15 | ### Subsection 1.1")
expect(result).toContain("16--20 | ## Section 2")
})
it("should handle markdown files with no headers", async () => {
@ -93,7 +93,7 @@ describe("Markdown Integration Tests", () => {
// Check the result
expect(result).toBeDefined()
expect(result).toContain("# mixed-headers.md")
expect(result).toContain("0--3 | # ATX Header")
expect(result).toContain("4--8 | Setext Header")
expect(result).toContain("1--4 | # ATX Header")
expect(result).toContain("5--9 | Setext Header")
})
})

6
src/services/tree-sitter/index.ts
View file

@ -275,13 +275,13 @@ function processCaptures(captures: any[], lines: string[], minComponentLines: nu
// Add component name to output regardless of HTML filtering
if (!processedLines.has(lineKey) && componentName) {
formattedOutput += `${startLine}--${endLine} | ${lines[startLine]}\n`
formattedOutput += `${startLine + 1}--${endLine + 1} | ${lines[startLine]}\n`
processedLines.add(lineKey)
}
}
// For other component definitions
else if (isNotHtmlElement(startLineContent)) {
formattedOutput += `${startLine}--${endLine} | ${lines[startLine]}\n`
formattedOutput += `${startLine + 1}--${endLine + 1} | ${lines[startLine]}\n`
processedLines.add(lineKey)
// If this is part of a larger definition, include its non-HTML context
@ -294,7 +294,7 @@ function processCaptures(captures: any[], lines: string[], minComponentLines: nu
// Add the full range first
const rangeKey = `${node.parent.startPosition.row}-${contextEnd}`
if (!processedLines.has(rangeKey)) {
formattedOutput += `${node.parent.startPosition.row}--${contextEnd} | ${lines[node.parent.startPosition.row]}\n`
formattedOutput += `${node.parent.startPosition.row + 1}--${contextEnd + 1} | ${lines[node.parent.startPosition.row]}\n`
processedLines.add(rangeKey)
}
}