12f0d9f · crush · git.iko.soy

git.iko.soy/crush

on main help sign in

perf(tools/view): avoid scanning entire file to count lines

12f0d9fChristian Rocha8 months ago

internal/agent/tools/view.go+13−27

compare with main

unifiedsplit

@@ -185,7 +185,7 @@ func NewViewTool(

185 }

186

187 // Read the file content

188− content, lineCount, err := readTextFile(filePath, params.Offset, params.Limit)

188+ content, hasMore, err := readTextFile(filePath, params.Offset, params.Limit)

189 if err != nil {

190 return fantasy.ToolResponse{}, fmt.Errorf("error reading file: %w", err)

191 }

@@ -195,11 +195,9 @@ func NewViewTool(

195

196 notifyLSPs(ctx, lspManager, filePath)

197 output := "<file>\n"

198− // Format the output with line numbers

199 output += addLineNumbers(content, params.Offset+1)

198 output += addLineNumbers(content, params.Offset+1)

200

199

201− // Add a note if the content was truncated

200+ if hasMore {

202− if lineCount > params.Offset+len(strings.Split(content, "\n")) {

203 output += fmt.Sprintf("\n\n(File has more lines. Use 'offset' parameter to read beyond line %d)",

201 output += fmt.Sprintf("\n\n(File has more lines. Use 'offset' parameter to read beyond line %d)",

204 params.Offset+len(strings.Split(content, "\n")))

202 params.Offset+len(strings.Split(content, "\n")))

205 }

203 }

@@ -251,38 +249,28 @@ func addLineNumbers(content string, startLine int) string {

251 return strings.Join(result, "\n")

249 return strings.Join(result, "\n")

252}

250}

253

251

254−func readTextFile(filePath string, offset, limit int) (string, int, error) {

252+func readTextFile(filePath string, offset, limit int) (string, bool, error) {

255 file, err := os.Open(filePath)

253 file, err := os.Open(filePath)

256 if err != nil {

254 if err != nil {

257− return "", 0, err

255+ return "", false, err

258 }

256 }

259 defer file.Close()

257 defer file.Close()

260

258

261− lineCount := 0

262−

263 scanner := NewLineScanner(file)

259 scanner := NewLineScanner(file)

264 if offset > 0 {

260 if offset > 0 {

261+ skipped := 0

265− for lineCount < offset && scanner.Scan() {

262+ for skipped < offset && scanner.Scan() {

266− lineCount++

263+ skipped++

267 }

264 }

268 if err = scanner.Err(); err != nil {

265 if err = scanner.Err(); err != nil {

269− return "", 0, err

266+ return "", false, err

270− }

271− }

272−

273− if offset == 0 {

274− _, err = file.Seek(0, io.SeekStart)

275− if err != nil {

276− return "", 0, err

277 }

267 }

278 }

268 }

279

269

280− // Pre-allocate slice with expected capacity

270+ // Pre-allocate slice with expected capacity.

281 lines := make([]string, 0, limit)

271 lines := make([]string, 0, limit)

282− lineCount = offset

283

272

284 for scanner.Scan() && len(lines) < limit {

273 for scanner.Scan() && len(lines) < limit {

285− lineCount++

286 lineText := scanner.Text()

274 lineText := scanner.Text()

287 if len(lineText) > MaxLineLength {

275 if len(lineText) > MaxLineLength {

288 lineText = lineText[:MaxLineLength] + "..."

276 lineText = lineText[:MaxLineLength] + "..."

@@ -290,16 +278,14 @@ func readTextFile(filePath string, offset, limit int) (string, int, error) {

290 lines = append(lines, lineText)

278 lines = append(lines, lineText)

291 }

279 }

292

280

293− // Continue scanning to get total line count

281+ // Peek one more line to determine if the file has more content.

294− for scanner.Scan() {

282+ hasMore := scanner.Scan()

295− lineCount++

296− }

297

283

298 if err := scanner.Err(); err != nil {

284 if err := scanner.Err(); err != nil {

299− return "", 0, err

285+ return "", false, err

300 }

286 }

301

287

302− return strings.Join(lines, "\n"), lineCount, nil

288+ return strings.Join(lines, "\n"), hasMore, nil

303}

289}

304

290

305func getImageMimeType(filePath string) (bool, string) {

291func getImageMimeType(filePath string) (bool, string) {