scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-07 08:26:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: align tree-sitter output with other tools (#1859)

Browse source 
Use compact line number format matching read_file/search_files to:
- Reduce token usage in AI responses
- Simplify output parsing

Signed-off-by: Eric Wheeler <roo-code@z.ewheeler.org>
Co-authored-by: Eric Wheeler <roo-code@z.ewheeler.org>
This commit is contained in:
KJ7LNW 2025-03-24 10:59:18 -07:00 • committed by GitHub
parent 8ad4fff0d2
commit 953a9c777a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,6 @@ describe("Tree-sitter Service", () => {
expect(result).toContain("class TestClass")
expect(result).toContain("testMethod()")
expect(result).toContain("|----")
})
it("should handle parsing errors gracefully", async () => {

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

@ -55,7 +55,7 @@ export async function parseSourceCodeDefinitionsForFile(
// Parse the file if we have a parser for it
const definitions = await parseFile(filePath, languageParsers, rooIgnoreController)
if (definitions) {
return `${path.basename(filePath)}\n${definitions}`
return `# ${path.basename(filePath)}\n${definitions}`
}
return undefined
@ -90,7 +90,7 @@ export async function parseSourceCodeForDefinitionsTopLevel(
for (const file of allowedFilesToParse) {
const definitions = await parseFile(file, languageParsers, rooIgnoreController)
if (definitions) {
result += `${path.relative(dirPath, file).toPosix()}\n${definitions}\n`
result += `# ${path.relative(dirPath, file).toPosix()}\n${definitions}\n`
}
// else {
// filesWithoutDefinitions.push(file)
@ -177,10 +177,6 @@ async function parseFile(
return null
}
// Add a header with file information and definition count
// Make sure to normalize path separators to forward slashes for consistency
formattedOutput += `// File: ${path.basename(filePath).replace(/\\/g, "/")} (${captures.length} definitions)\n`
// Sort captures by their start position
captures.sort((a, b) => a.node.startPosition.row - b.node.startPosition.row)
@ -224,15 +220,10 @@ async function parseFile(
const lineKey = `${startLine}-${lines[startLine]}`
const nodeLineKey = `${nodeLine}-${lines[nodeLine]}`
// Add separator if there's a gap between captures
if (lastLine !== -1 && startLine > lastLine + 1) {
formattedOutput += "|| ||----\n"
}
// Always show the class definition line
if (name.includes("class") || (name.includes("name") && name.includes("class"))) {
if (!processedLines.has(lineKey)) {
formattedOutput += `│| ${startLine} - ${endLine} ||${lines[startLine]}\n`
formattedOutput += `${startLine}--${endLine} | ${lines[startLine]}\n`
processedLines.add(lineKey)
}
}
@ -243,7 +234,7 @@ async function parseFile(
// For function definitions, we need to show the actual line with the function/method name
// This handles the test case mocks where nodeLine is 2 (for "testMethod()")
if (!processedLines.has(nodeLineKey) && lines[nodeLine]) {
formattedOutput += `│| ${nodeLine} - ${node.endPosition.row} ||${lines[nodeLine]}\n`
formattedOutput += `${nodeLine}--${node.endPosition.row} | ${lines[nodeLine]}\n`
processedLines.add(nodeLineKey)
}
}
@ -256,7 +247,7 @@ async function parseFile(
!name.includes("method")
) {
if (!processedLines.has(lineKey)) {
formattedOutput += `│| ${startLine} - ${endLine} ||${lines[startLine]}\n`
formattedOutput += `${startLine}--${endLine} | ${lines[startLine]}\n`
processedLines.add(lineKey)
}
}
@ -270,22 +261,7 @@ async function parseFile(
}
if (formattedOutput.length > 0) {
// Create categorized summary of definitions
const classCount = formattedOutput.split("class").length - 1
const functionCount =
formattedOutput.split("function").length - 1 + (formattedOutput.split("method").length - 1)
const variableCount =
formattedOutput.split("const").length -
1 +
formattedOutput.split("let").length -
1 +
formattedOutput.split("var").length -
1
// Add a footer with a summary of definitions
const summary = `// Summary: ${classCount > 0 ? `${classCount} classes, ` : ""}${functionCount > 0 ? `${functionCount} functions/methods, ` : ""}${variableCount > 0 ? `${variableCount} variables` : ""}`
return `|----\n${formattedOutput}|----\n${summary}\n`
return formattedOutput
}
return null
}