Fixes case of hunks being missed by input hunk map for ai rebase

axosoft-ramint · axosoft-ramint · commit bfc908b32134 · 2025-06-16T16:57:24.000-07:00
diff --git a/src/plus/ai/aiProviderService.ts b/src/plus/ai/aiProviderService.ts
@@ -964,7 +964,7 @@ export class AIProviderService implements Disposable {
 
 				// let hunksByNumber= '';
 
-				for (const hunkHeader of diff.contents.matchAll(/@@ -\d+,\d+ \+\d+,\d+ @@(.*)$/gm)) {
+				for (const hunkHeader of diff.contents.matchAll(/@@ -\d+(?:,\d+)? \+\d+(?:,\d+)? @@(.*)$/gm)) {
 					hunkMap.push({ index: ++counter, hunkHeader: hunkHeader[0] });
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -964,7 +964,7 @@ export class AIProviderService implements Disposable {`
`964`	`964`
`965`	`965`	`// let hunksByNumber= '';`
`966`	`966`
`967`		`- for (const hunkHeader of diff.contents.matchAll(/@@ -\d+,\d+ \+\d+,\d+ @@(.*)$/gm)) {`
	`967`	`+ for (const hunkHeader of diff.contents.matchAll(/@@ -\d+(?:,\d+)? \+\d+(?:,\d+)? @@(.*)$/gm)) {`
`968`	`968`	`hunkMap.push({ index: ++counter, hunkHeader: hunkHeader[0] });`
`969`	`969`	`}`
`970`	`970`