Yichen Jiang
c313392bf8
The changes view gains a lens of All, Interface, Implementation, and Tests that spans the file tree above it, a switch that hides test files from the tree and the diff, and a viewed checkbox on each file header that collapses the file. The toolbar counts viewed files and V toggles the file being read. Marks are kept per Session, source, path, and change digest in browser storage, so a file that changes again reads as changed since viewed. All commits beside Submit review, and beside the base branch of the Branch scope, shows one commit or a Shift run of commits.
147 lines
7.1 KiB
TypeScript
147 lines
7.1 KiB
TypeScript
/** Rows of a file diff: numbering, side-by-side pairing, and unchanged lines between hunks. */
|
||
import { describe, expect, it } from 'vitest'
|
||
import type { ForgeDiffFile, ForgeDiffHunk } from '../src/types.ts'
|
||
import { drawnLines, hunkRows, matchesHunks, segmentsOf, splitRows, textLines } from '../src/client/diff-rows.ts'
|
||
|
||
/** Modified file whose hunks change lines 3–6 and 11 of its 13 new lines. */
|
||
const NEW_SIDE = ['a1', 'a2', 'a3', 'y', 'z', 'a5', 'a6', 'a7', 'a8', 'a9', 'a10', 't12', 't13']
|
||
const HUNKS: readonly ForgeDiffHunk[] = [
|
||
{ oldStart: 3, oldLines: 3, newStart: 3, newLines: 4, lines: [' a3', '-x', '+y', '+z', ' a5'] },
|
||
{ oldStart: 10, oldLines: 2, newStart: 11, newLines: 1, lines: [' a10', '-w'] },
|
||
]
|
||
|
||
function file(overrides: Partial<ForgeDiffFile> = {}): ForgeDiffFile {
|
||
return {
|
||
path: 'src/a.ts', previousPath: null, status: 'modified', binary: false, oversized: false, untracked: false, layer: 'implementation', digest: 'digest',
|
||
additions: 2, deletions: 2, hunks: HUNKS, ...overrides,
|
||
}
|
||
}
|
||
|
||
describe('hunkRows', () => {
|
||
it('numbers context lines on both sides, deletions on the old side, and additions on the new side', () => {
|
||
expect(hunkRows(HUNKS[0]!)).toEqual([
|
||
{ kind: 'context', old: 3, new: 3, text: 'a3' },
|
||
{ kind: 'del', old: 4, new: null, text: 'x' },
|
||
{ kind: 'add', old: null, new: 4, text: 'y' },
|
||
{ kind: 'add', old: null, new: 5, text: 'z' },
|
||
{ kind: 'context', old: 5, new: 6, text: 'a5' },
|
||
])
|
||
})
|
||
|
||
it('skips missing-newline markers, drops carriage returns, and reads an empty line as context', () => {
|
||
const hunk = { oldStart: 1, oldLines: 2, newStart: 1, newLines: 2, lines: ['-a\r', '\\ No newline at end of file', '+b\r', ''] }
|
||
expect(hunkRows(hunk)).toEqual([
|
||
{ kind: 'del', old: 1, new: null, text: 'a' },
|
||
{ kind: 'add', old: null, new: 1, text: 'b' },
|
||
{ kind: 'context', old: 2, new: 2, text: '' },
|
||
])
|
||
})
|
||
})
|
||
|
||
describe('splitRows', () => {
|
||
it('pairs each run of deletions with the additions after it and repeats context on both sides', () => {
|
||
const rows = hunkRows({ oldStart: 1, oldLines: 5, newStart: 1, newLines: 4, lines: [' c', '-d1', '-d2', '+a1', ' c2', '-d3', '+a2', '+a3', '+a4', '-d4'] })
|
||
const cells = splitRows(rows).map(({ left, right }) => [
|
||
left?.kind ?? null, left?.text ?? null, right?.kind ?? null, right?.text ?? null,
|
||
])
|
||
expect(cells).toEqual([
|
||
['context', 'c', 'context', 'c'],
|
||
['del', 'd1', 'add', 'a1'],
|
||
['del', 'd2', null, null],
|
||
['context', 'c2', 'context', 'c2'],
|
||
['del', 'd3', 'add', 'a2'],
|
||
[null, null, 'add', 'a3'],
|
||
[null, null, 'add', 'a4'],
|
||
['del', 'd4', null, null],
|
||
])
|
||
})
|
||
})
|
||
|
||
describe('textLines', () => {
|
||
it.each([
|
||
['a final line ending', 'a\nb\n', ['a', 'b']],
|
||
['no final line ending', 'a\nb', ['a', 'b']],
|
||
['CRLF endings', 'a\r\nb\r\n', ['a\r', 'b\r']],
|
||
['no text', '', []],
|
||
])('splits text with %s', (_label, text, lines) => {
|
||
expect(textLines(text)).toEqual(lines)
|
||
})
|
||
})
|
||
|
||
describe('matchesHunks', () => {
|
||
it('accepts the new side the hunks describe, carriage returns included', () => {
|
||
expect(matchesHunks(NEW_SIDE, HUNKS)).toBe(true)
|
||
expect(matchesHunks(['a\r', 'b\r'], [{ oldStart: 1, oldLines: 1, newStart: 1, newLines: 2, lines: [' a\r', '+b\r', '\\ No newline at end of file'] }])).toBe(true)
|
||
})
|
||
|
||
it('rejects text that changed after the diff was read', () => {
|
||
expect(matchesHunks(NEW_SIDE.with(4, 'Z'), HUNKS)).toBe(false)
|
||
expect(matchesHunks(NEW_SIDE.slice(0, 5), HUNKS)).toBe(false)
|
||
})
|
||
})
|
||
|
||
describe('segmentsOf', () => {
|
||
it('collapses the lines before, between, and after the hunks, the last of unknown length', () => {
|
||
expect(segmentsOf(file(), undefined, new Set([0, 1])).map(segment => segment.kind === 'gap' ? segment : segment.rows.length)).toEqual([
|
||
{ kind: 'gap', index: 0, count: 2 },
|
||
5,
|
||
{ kind: 'gap', index: 1, count: 4 },
|
||
2,
|
||
{ kind: 'gap', index: 2, count: null },
|
||
])
|
||
})
|
||
|
||
it('draws the expanded gaps from the new side with the old numbers they had', () => {
|
||
const [rows, ...rest] = segmentsOf(file(), NEW_SIDE, new Set([0, 1, 2]))
|
||
expect(rest).toEqual([])
|
||
if (rows?.kind !== 'rows') throw new Error('expected one run of rows')
|
||
expect(rows.rows.map(row => [row.old, row.new, row.text])).toEqual([
|
||
[1, 1, 'a1'], [2, 2, 'a2'],
|
||
[3, 3, 'a3'], [4, null, 'x'], [null, 4, 'y'], [null, 5, 'z'], [5, 6, 'a5'],
|
||
[6, 7, 'a6'], [7, 8, 'a7'], [8, 9, 'a8'], [9, 10, 'a9'],
|
||
[10, 11, 'a10'], [11, null, 'w'],
|
||
[12, 12, 't12'], [13, 13, 't13'],
|
||
])
|
||
})
|
||
|
||
it('keeps unexpanded gaps collapsed once the new side is known, and counts the lines after the last hunk', () => {
|
||
expect(segmentsOf(file(), NEW_SIDE, new Set([1])).map(segment => segment.kind === 'gap' ? segment : segment.rows.length)).toEqual([
|
||
{ kind: 'gap', index: 0, count: 2 },
|
||
11,
|
||
{ kind: 'gap', index: 2, count: 2 },
|
||
])
|
||
expect(segmentsOf(file(), NEW_SIDE.slice(0, 11), new Set()).at(-1)).toMatchObject({ kind: 'rows' })
|
||
})
|
||
|
||
it('maps lines around a hunk that only deletes to the old lines after the deletion', () => {
|
||
const deletion = file({ hunks: [{ oldStart: 5, oldLines: 2, newStart: 5, newLines: 0, lines: ['-d5', '-d6'] }] })
|
||
const [rows] = segmentsOf(deletion, ['b1', 'b2', 'b3', 'b4', 'b7'], new Set([0, 1]))
|
||
if (rows?.kind !== 'rows') throw new Error('expected one run of rows')
|
||
expect(rows.rows.map(row => [row.old, row.new, row.text])).toEqual([
|
||
[1, 1, 'b1'], [2, 2, 'b2'], [3, 3, 'b3'], [4, 4, 'b4'], [5, null, 'd5'], [6, null, 'd6'], [7, 5, 'b7'],
|
||
])
|
||
})
|
||
|
||
it('has nothing after the last hunk of a new or deleted file or of a hunk that reaches the end of the new side', () => {
|
||
const added = file({ status: 'added', hunks: [{ oldStart: 1, oldLines: 0, newStart: 1, newLines: 2, lines: ['+x', '+y'] }] })
|
||
expect(segmentsOf(added, undefined, new Set()).map(segment => segment.kind)).toEqual(['rows'])
|
||
const deleted = file({ status: 'deleted', hunks: [{ oldStart: 1, oldLines: 1, newStart: 1, newLines: 0, lines: ['-x'] }] })
|
||
expect(segmentsOf(deleted, undefined, new Set()).map(segment => segment.kind)).toEqual(['rows'])
|
||
const ending = file({ hunks: [{ oldStart: 4, oldLines: 1, newStart: 4, newLines: 1, lines: ['-a', '+b', '\\ No newline at end of file'] }] })
|
||
expect(segmentsOf(ending, undefined, new Set()).map(segment => segment.kind)).toEqual(['gap', 'rows'])
|
||
const oldEnding = file({ hunks: [{ oldStart: 4, oldLines: 1, newStart: 4, newLines: 1, lines: ['-a', '\\ No newline at end of file', '+b'] }] })
|
||
expect(segmentsOf(oldEnding, undefined, new Set()).map(segment => segment.kind)).toEqual(['gap', 'rows', 'gap'])
|
||
})
|
||
|
||
it('draws nothing for a file without hunks', () => {
|
||
expect(segmentsOf(file({ status: 'renamed', previousPath: 'old.ts', hunks: [] }), undefined, new Set())).toEqual([])
|
||
})
|
||
})
|
||
|
||
describe('drawnLines', () => {
|
||
it('counts the lines of every hunk except missing-newline markers', () => {
|
||
expect(drawnLines(file())).toBe(7)
|
||
expect(drawnLines(file({ hunks: [{ oldStart: 1, oldLines: 1, newStart: 1, newLines: 1, lines: ['-a', '\\ No newline at end of file', '+b'] }] }))).toBe(2)
|
||
})
|
||
})
|