@kitlangton/ghui 0.1.10 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@kitlangton/ghui",
-	"version": "0.1.10",
+	"version": "0.1.11",
 	"description": "Terminal UI for GitHub pull requests",
 	"type": "module",
 	"license": "MIT",

package/src/App.tsx

@@ -1024,7 +1024,7 @@ export const App = () => {
 			setDetailScrollOffset(0)
 			return
 		}
-		if (key.name === "p" && selectedPullRequest) {
+		if ((key.name === "d" || key.name === "p") && selectedPullRequest) {
 			openDiffView()
 			return
 		}
@@ -1041,7 +1041,7 @@ export const App = () => {
 			flashNotice(`Opened #${selectedPullRequest.number} in browser`)
 			return
 		}
-		if ((key.name === "d" || key.name === "D") && selectedPullRequest) {
+		if ((key.name === "s" || key.name === "S") && selectedPullRequest) {
 			const previousPullRequest = selectedPullRequest
 			const nextReviewStatus = selectedPullRequest.reviewStatus === "draft" ? "review" : "draft"
 			updatePullRequest(selectedPullRequest.url, (pullRequest) => ({

package/src/ui/FooterHints.tsx

@@ -104,33 +104,16 @@ export const FooterHints = ({
 				</>
 			) : null}
 			<span fg={colors.count}>r</span>
-			<span fg={colors.muted}>{hasError ? " retry  " : " ref  "}</span>
-			{hasSelection ? (
-				<>
-					<span fg={colors.count}>↑↓</span>
-					<span fg={colors.muted}> move  </span>
-				</>
-			) : null}
-			{hasSelection && detailFullView ? (
-				<>
-					<span fg={colors.count}>esc</span>
-					<span fg={colors.muted}> back  </span>
-				</>
-			) : hasSelection ? (
-				<>
-					<span fg={colors.count}>enter</span>
-					<span fg={colors.muted}> expand  </span>
-				</>
-			) : null}
+			<span fg={colors.muted}>{hasError ? " retry  " : " refresh  "}</span>
 			{hasSelection ? (
 				<>
+					<span fg={colors.count}>s</span>
+					<span fg={colors.muted}> state  </span>
 					<span fg={colors.count}>d</span>
-					<span fg={colors.muted}> draft  </span>
-					<span fg={colors.count}>p</span>
 					<span fg={colors.muted}> diff  </span>
 					<span fg={colors.count}>l</span>
 					<span fg={colors.muted}> labels  </span>
-					<span fg={colors.count}>M</span>
+					<span fg={colors.count}>m</span>
 					<span fg={colors.muted}> merge  </span>
 					<span fg={colors.count}>o</span>
 					<span fg={colors.muted}> open  </span>

package/src/ui/diff.ts

@@ -89,6 +89,41 @@ const patchFileName = (patch: string) => {
 	return nextLine ? unquoteDiffPath(nextLine.slice(4).trim()) : "diff"
 }
 
+const hunkHeaderPattern = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$/
+
+const formatHunkRange = (start: string, count: number) => `${start},${count}`
+
+const normalizeHunkLineCounts = (patch: string) => {
+	const lines = patch.split("\n")
+	const normalized = [...lines]
+
+	for (let index = 0; index < lines.length; index++) {
+		const match = lines[index]!.match(hunkHeaderPattern)
+		if (!match) continue
+
+		let oldCount = 0
+		let newCount = 0
+		for (let lineIndex = index + 1; lineIndex < lines.length; lineIndex++) {
+			const line = lines[lineIndex]!
+			if (line.startsWith("@@ ") || line.startsWith("diff --git ")) break
+
+			const prefix = line[0]
+			if (prefix === " ") {
+				oldCount += 1
+				newCount += 1
+			} else if (prefix === "-") {
+				oldCount += 1
+			} else if (prefix === "+") {
+				newCount += 1
+			}
+		}
+
+		normalized[index] = `@@ -${formatHunkRange(match[1]!, oldCount)} +${formatHunkRange(match[3]!, newCount)} @@${match[5]!}`
+	}
+
+	return normalized.join("\n")
+}
+
 export const splitPatchFiles = (patch: string): readonly DiffFilePatch[] => {
 	const trimmed = patch.trimEnd()
 	if (trimmed.length === 0) return []
@@ -101,7 +136,7 @@ export const splitPatchFiles = (patch: string): readonly DiffFilePatch[] => {
 	return matches.map((match, index) => {
 		const start = match.index ?? 0
 		const end = index + 1 < matches.length ? matches[index + 1]!.index ?? trimmed.length : trimmed.length
-		const filePatch = trimmed.slice(start, end).trimEnd()
+		const filePatch = normalizeHunkLineCounts(trimmed.slice(start, end).trimEnd())
 		const name = patchFileName(filePatch)
 		return { name, filetype: filetypeForPath(name), patch: filePatch }
 	})