luna/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3321 from rlavkvmflzk/fix/grep-windows-crlf-and-drive-letter

Browse Source 
fix(grep): handle Windows drive-letter paths and CRLF in parseOutput
This commit is contained in:
YeonGyu-Kim
2026-04-15 12:35:16 +09:00
committed by GitHub
parent e04b2ed726 b0b19f30b9
commit a47f898636
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/grep/cli.ts
+7 -4
View File
@@ -102,7 +102,8 @@ function parseOutput(output: string, filesOnly = false): GrepMatch[] {
const matches: GrepMatch[] = [] const matches: GrepMatch[] = []
const lines = output.split("\n") const lines = output.split("\n")
for (const line of lines) { for (let line of lines) {
line = line.replace(/\r$/, "")
if (!line.trim()) continue if (!line.trim()) continue
if (filesOnly) { if (filesOnly) {
@@ -115,7 +116,8 @@ function parseOutput(output: string, filesOnly = false): GrepMatch[] {
continue continue
} }
const match = line.match(/^(.+?):(\d+):(.*)$/) // Handle Windows drive-letter paths (e.g. C:\path\file.ts:42:content)
const match = line.match(/^([A-Za-z]:[\\\/].*?|.+?):(\d+):(.*)$/)
if (match) { if (match) {
matches.push({ matches.push({
file: match[1], file: match[1],
@@ -134,10 +136,11 @@ function parseCountOutput(output: string): CountResult[] {
const results: CountResult[] = [] const results: CountResult[] = []
const lines = output.split("\n") const lines = output.split("\n")
for (const line of lines) { for (let line of lines) {
line = line.replace(/\r$/, "")
if (!line.trim()) continue if (!line.trim()) continue
const match = line.match(/^(.+?):(\d+)$/) const match = line.match(/^([A-Za-z]:[\\\/].*?|.+?):(\d+)$/)
if (match) { if (match) {
results.push({ results.push({
file: match[1], file: match[1],