fix: diff shows line numbers for from

Author: kentcdodds

packages/workshop-app/app/routes/_app+/$exerciseNumber.tsx

@@ -34,7 +34,15 @@ export default function ExerciseNumberRoute() {
 					'No instructions yet...'
 				)}
 			</div>
-			<Link to="01/problem">Start</Link>
+			<div className="flex justify-center p-6">
+				<Link
+					to="01/problem"
+					prefetch="intent"
+					className="rounded border-2 border-green-500 bg-green-600 px-3 py-2 text-gray-100 hover:bg-green-500 focus:bg-green-500"
+				>
+					Start
+				</Link>
+			</div>
 		</div>
 	)
 }

packages/workshop-app/app/routes/_app+/$exerciseNumber_.$stepNumber.$type.tsx

@@ -285,11 +285,8 @@ export default function ExercisePartRoute() {
 							)}
 						</TabPanel>
 						<TabPanel hidden={tabIndex !== 3}>
-							<div>
-								<div className="prose whitespace-pre-wrap">
-									<Mdx code={data.diff.diffCode} />
-								</div>
-								<pre>{JSON.stringify(data, null, 2)}</pre>
+							<div className="prose whitespace-pre-wrap">
+								<Mdx code={data.diff.diffCode} />
 							</div>
 						</TabPanel>
 					</TabPanels>

packages/workshop-app/app/utils/diff.server.ts

@@ -43,7 +43,12 @@ function getFileCodeblocks(
 		const removedLineNumbers = []
 		const addedLineNumbers = []
 		const lines = []
-		const startLine = chunk.toFileRange.start
+		const startLine =
+			chunk.type === 'Chunk'
+				? chunk.fromFileRange.start
+				: chunk.type === 'CombinedChunk'
+				? chunk.fromFileRangeA.start
+				: 1
 		for (let lineNumber = 0; lineNumber < chunk.changes.length; lineNumber++) {
 			const change = chunk.changes[lineNumber]
 			if (!change) continue