prreviewbuddy 0.36.4 → 0.36.10

package/CHANGELOG.md

@@ -1,5 +1,59 @@
 # Changelog
 
+## 0.36.10
+
+**Syntax highlighting in the file viewer.** Code opened in the review is now coloured by language:
+Ruby, JavaScript, TypeScript, JSX, TSX, JSON, YAML, Markdown, HTML, CSS, SCSS, SQL, Python, Java,
+Kotlin, Go, Rust, shell scripts, Dockerfiles and Terraform. Added, deleted and cited lines keep
+their shading, with the colours inside it. Other files show as plain text, as before.
+
+Colouring loads in the background once the review opens, and only for the languages that review
+changed, so a file usually opens already coloured. When it isn't ready yet, the text shows straight
+away and the colour follows. A very long line is coloured as far as it is shown, and in full once you
+press Show full line.
+
+## 0.36.9
+
+A file opened from the review guide, an issue, a question or a KISS finding now joins onto the link
+that opened it, the way a row in the Files tab already did. The file name and its code read as one
+card, and the file name stays exactly where it was when the code opens.
+
+## 0.36.8
+
+**Expand the file viewer.** A new Expand button beside Open in VS Code makes a file's code as tall
+as the review column allows, with the review path and Ask panel left where they are. Collapse
+returns it to its usual size, and the line you were reading stays in view both ways. The button
+only appears when the file is longer than the viewer.
+
+An open file row and its code now read as one card, joined with no gap between them.
+
+The first press of **Show more of this file** on a file opened from its row now shows more. It
+used to ask for the 600 lines already on screen and change nothing.
+
+## 0.36.7
+
+**Step between the changes in a file.** The file viewer now has Previous and Next beside the
+version caption, with a count such as `2 of 6`. A replaced line and its removal count as one
+change. Next goes to the first change below where you are, including the line a finding opened
+you on, and brings a change outside the lines on screen into view. A removed block is shown by its
+marker and stays collapsed.
+
+## 0.36.6
+
+A very long line in the file viewer, such as minified code or generated data, is now cut short
+after 1,000 characters with a **Show full line** control beside it. Opening a file no longer lays
+out tens of thousands of characters at once. The whole line is still there, one click away.
+
+## 0.36.5
+
+**The file viewer shows where lines were removed.** A file could say `+9 −1` while the viewer only
+ever shaded the nine, because it shows the file as reviewed and a removed line is not in it. Now a
+small `− 1 deleted line` marker sits exactly where the removal happened, and clicking it shows the
+old lines in place, above whatever replaced them. It is still the whole file rather than a diff.
+
+If the recorded change for a file cannot be read reliably, the viewer says `change details
+unavailable` and marks nothing, rather than shading lines in the wrong place.
+
 ## 0.36.4
 
 The search box and filters on the reviews list now sit over the list itself, sharing its column,

package/dist/server.js

@@ -6158,7 +6158,8 @@ function windowOnto(content, workspace, path, options, source, sourceSha, checko
 	const all = content.split("\n");
 	if (all.length > 0 && all[all.length - 1] === "") all.pop();
 	const totalLines = all.length;
-	const added = addedLinesFor(workspace, path);
+	const changes = changesFor(workspace, path);
+	const known = changes.state === "known" ? changes.changes : NO_CHANGES;
 	const steps = Math.max(0, Math.floor(options.expand ?? 0));
 	const span = steps > 0 ? 600 * steps : options.line ? 25 : 600;
 	let from = 1;
@@ -6174,7 +6175,10 @@ function windowOnto(content, workspace, path, options, source, sourceSha, checko
 		from,
 		to,
 		lines: all.slice(from - 1, to),
-		addedLines: added.filter((n) => n >= from && n <= to),
+		addedLines: known.addedLines.filter((n) => n >= from && n <= to),
+		deletions: known.deletions.filter((block) => block.beforeLine >= from && block.beforeLine <= to || to === totalLines && block.beforeLine === totalLines + 1),
+		changes: changes.state,
+		changeAnchors: changeAnchors(known),
 		truncated: from > 1 || to < totalLines,
 		source,
 		...sourceSha ? { sourceSha } : {},
@@ -6182,34 +6186,153 @@ function windowOnto(content, workspace, path, options, source, sourceSha, checko
 	};
 }
 /**
-* Which lines of the *current* file this change added, from the patch we already hold.
+* One anchor per run of changed rows, as the rows are drawn.
+*
+* Grouped by what sits next to what on screen rather than by kind, so a replacement (a marker
+* directly above its green lines) is one change and not two. Each item gets a position in drawing
+* order: a marker before line n is 2n - 1 and line n itself is 2n. Two items are one run when
+* nothing is drawn between them, which is a step of 1, or a step of 2 between two added lines.
+* A step of 2 between two markers has an unchanged line between them.
+*/
+function changeAnchors(changes) {
+	const items = [...changes.deletions.map((block) => ({
+		key: 2 * block.beforeLine - 1,
+		line: block.beforeLine,
+		deletion: true
+	})), ...changes.addedLines.map((line) => ({
+		key: 2 * line,
+		line,
+		deletion: false
+	}))].sort((a, b) => a.key - b.key);
+	const anchors = [];
+	let previous;
+	for (const item of items) {
+		const step = previous ? item.key - previous.key : Infinity;
+		if (!(step === 1 || step === 2 && !item.deletion && !previous.deletion)) anchors.push({
+			line: item.line,
+			deletion: item.deletion
+		});
+		previous = item;
+	}
+	return anchors;
+}
+var NO_CHANGES = {
+	addedLines: [],
+	deletions: [],
+	additions: 0,
+	deletionCount: 0
+};
+/**
+* What this change did to one file, from the patch we already hold.
 *
 * Read out of the stored change set rather than by running git again: the review describes one
 * specific state of the working tree, and a second `git diff` could answer about a different one.
+*
+* The parsed totals are checked against numstat, which git produced in a separate invocation. When
+* they disagree nothing is marked at all, because a position that might be wrong is worse than
+* no position.
 */
-function addedLinesFor(workspace, path) {
+function changesFor(workspace, path) {
 	const file = workspace.changeSet.data.files.find((entry) => entry.name === path);
-	if (!file?.patch) return [];
-	return addedLinesFromPatch(file.patch);
-}
-var HUNK = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/;
-function addedLinesFromPatch(patch) {
-	const added = [];
-	let lineNumber = 0;
-	for (const line of patch.split("\n")) {
-		const hunk = HUNK.exec(line);
-		if (hunk) {
-			lineNumber = Number(hunk[1]);
-			continue;
+	if (!file) return {
+		state: "known",
+		changes: NO_CHANGES
+	};
+	if (!file.patch) return file.additions + file.deletions === 0 ? {
+		state: "known",
+		changes: NO_CHANGES
+	} : {
+		state: "unavailable",
+		reason: "no-patch"
+	};
+	const changes = parsePatch(file.patch);
+	if (!changes) return {
+		state: "unavailable",
+		reason: "malformed"
+	};
+	if (changes.additions !== file.additions || changes.deletionCount !== file.deletions) return {
+		state: "unavailable",
+		reason: "count-mismatch"
+	};
+	return {
+		state: "known",
+		changes
+	};
+}
+var HUNK = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
+/**
+* One file's patch, read once into everything the viewer marks.
+*
+* Each hunk body is consumed by the counts in its header rather than by looking at first
+* characters, because inside a hunk `+++ x` is an added line reading `++ x`, not a file header.
+* Skipping it by prefix dropped the line and shifted every number after it.
+*
+* A zero count in the header names the line *before* the range, so `+9,0` means "between new lines
+* 9 and 10" and the cursor starts at 10.
+*
+* `null` when the body does not match its header: a stray line, or a patch that stops mid-hunk.
+*/
+function parsePatch(patch) {
+	const addedLines = [];
+	const deletions = [];
+	let deletionCount = 0;
+	const lines = patch.split("\n");
+	if (lines[lines.length - 1] === "") lines.pop();
+	let i = 0;
+	while (i < lines.length && !HUNK.test(lines[i])) i += 1;
+	while (i < lines.length) {
+		const header = HUNK.exec(lines[i]);
+		if (!header) return null;
+		i += 1;
+		const oldCount = header[2] === void 0 ? 1 : Number(header[2]);
+		const newCount = header[4] === void 0 ? 1 : Number(header[4]);
+		let oldLine = oldCount === 0 ? Number(header[1]) + 1 : Number(header[1]);
+		let newLine = newCount === 0 ? Number(header[3]) + 1 : Number(header[3]);
+		let oldLeft = oldCount;
+		let newLeft = newCount;
+		let open = null;
+		while (oldLeft > 0 || newLeft > 0) {
+			if (i >= lines.length) return null;
+			const line = lines[i];
+			i += 1;
+			const mark = line[0];
+			if (mark === "\\") continue;
+			if (mark === " " && oldLeft > 0 && newLeft > 0) {
+				open = null;
+				oldLine += 1;
+				newLine += 1;
+				oldLeft -= 1;
+				newLeft -= 1;
+			} else if (mark === "+" && newLeft > 0) {
+				open = null;
+				addedLines.push(newLine);
+				newLine += 1;
+				newLeft -= 1;
+			} else if (mark === "-" && oldLeft > 0) {
+				if (!open) {
+					open = {
+						beforeLine: newLine,
+						lines: []
+					};
+					deletions.push(open);
+				}
+				open.lines.push({
+					oldLine,
+					text: line.slice(1)
+				});
+				deletionCount += 1;
+				oldLine += 1;
+				oldLeft -= 1;
+			} else return null;
 		}
-		if (lineNumber === 0) continue;
-		if (line.startsWith("+++")) continue;
-		if (line.startsWith("+")) {
-			added.push(lineNumber);
-			lineNumber += 1;
-		} else if (line.startsWith("-") || line.startsWith("\\")) {} else lineNumber += 1;
+		while (i < lines.length && lines[i].startsWith("\\")) i += 1;
 	}
-	return added;
+	return {
+		addedLines,
+		deletions,
+		additions: addedLines.length,
+		deletionCount
+	};
 }
 //#endregion
 //#region ../../packages/review-harness/src/workspace/editor.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prreviewbuddy",
-  "version": "0.36.4",
+  "version": "0.36.10",
   "description": "Review a branch or pull request in an isolated checkout, from your terminal, with the coding agent you already have installed.",
   "license": "UNLICENSED",
   "homepage": "https://prreviewbuddy.com",

package/static/{chunk-IsizPYbz.js → chunk-2cPIwDyu.js}

@@ -1,4 +1,4 @@
-import"./chunk-CQfKfv79.js";import{n as e}from"./chunk-DsF7k-Jl.js";import{H as t,K as n,U as r,a as i,c as a,s as o,v as s,w as c,x as l,y as u}from"./chunk-CeiETtR3.js";import{p as d}from"./chunk-DqZGGQx6.js";import{t as f}from"./chunk-Dy-Kn_BL.js";import{f as p}from"./chunk-B80S6zbH.js";var m=(function(){var t=e(function(e,t,n,r){for(n||={},r=e.length;r--;n[e[r]]=t);return n},`o`),n=[1,4],r=[1,14],i=[1,12],a=[1,13],o=[6,7,8],s=[1,20],c=[1,18],l=[1,19],u=[6,7,11],d=[1,6,13,14],f=[1,23],p=[1,24],m=[1,6,7,11,13,14],h={trace:e(function(){},`trace`),yy:{},symbols_:{error:2,start:3,ishikawa:4,spaceLines:5,SPACELINE:6,NL:7,ISHIKAWA:8,document:9,stop:10,EOF:11,statement:12,SPACELIST:13,TEXT:14,$accept:0,$end:1},terminals_:{2:`error`,6:`SPACELINE`,7:`NL`,8:`ISHIKAWA`,11:`EOF`,13:`SPACELIST`,14:`TEXT`},productions_:[0,[3,1],[3,2],[5,1],[5,2],[5,2],[4,2],[4,3],[10,1],[10,1],[10,1],[10,2],[10,2],[9,3],[9,2],[12,2],[12,1],[12,1],[12,1]],performAction:e(function(e,t,n,r,i,a,o){var s=a.length-1;switch(i){case 6:case 7:return r;case 15:r.addNode(a[s-1].length,a[s].trim());break;case 16:r.addNode(0,a[s].trim())}},`anonymous`),table:[{3:1,4:2,5:3,6:[1,5],8:n},{1:[3]},{1:[2,1]},{4:6,6:[1,7],7:[1,8],8:n},{6:r,7:[1,10],9:9,12:11,13:i,14:a},t(o,[2,3]),{1:[2,2]},t(o,[2,4]),t(o,[2,5]),{1:[2,6],6:r,12:15,13:i,14:a},{6:r,9:16,12:11,13:i,14:a},{6:s,7:c,10:17,11:l},t(u,[2,18],{14:[1,21]}),t(u,[2,16]),t(u,[2,17]),{6:s,7:c,10:22,11:l},{1:[2,7],6:r,12:15,13:i,14:a},t(d,[2,14],{7:f,11:p}),t(m,[2,8]),t(m,[2,9]),t(m,[2,10]),t(u,[2,15]),t(d,[2,13],{7:f,11:p}),t(m,[2,11]),t(m,[2,12])],defaultActions:{2:[2,1],6:[2,2]},parseError:e(function(e,t){if(t.recoverable)this.trace(e);else{var n=Error(e);throw n.hash=t,n}},`parseError`),parse:e(function(t){var n=this,r=[0],i=[],a=[null],o=[],s=this.table,c=``,l=0,u=0,d=0,f=2,p=1,m=o.slice.call(arguments,1),h=Object.create(this.lexer),g={yy:{}};for(var _ in this.yy)Object.prototype.hasOwnProperty.call(this.yy,_)&&(g.yy[_]=this.yy[_]);h.setInput(t,g.yy),g.yy.lexer=h,g.yy.parser=this,h.yylloc===void 0&&(h.yylloc={});var v=h.yylloc;o.push(v);var y=h.options&&h.options.ranges;this.parseError=typeof g.yy.parseError==`function`?g.yy.parseError:Object.getPrototypeOf(this).parseError;function b(e){r.length-=2*e,a.length-=e,o.length-=e}e(b,`popStack`);function x(){var e=i.pop()||h.lex()||p;return typeof e!=`number`&&(e instanceof Array&&(i=e,e=i.pop()),e=n.symbols_[e]||e),e}e(x,`lex`);for(var S,C,w,T,E,D={},O,k,A,j;;){if(w=r[r.length-1],this.defaultActions[w]?T=this.defaultActions[w]:(S??=x(),T=s[w]&&s[w][S]),T===void 0||!T.length||!T[0]){var M=``;for(O in j=[],s[w])this.terminals_[O]&&O>f&&j.push(`'`+this.terminals_[O]+`'`);M=h.showPosition?`Parse error on line `+(l+1)+`:
+import{n as e}from"./chunk-DsF7k-Jl.js";import"./chunk-BWjKdrB5.js";import{H as t,K as n,U as r,a as i,c as a,s as o,v as s,w as c,x as l,y as u}from"./chunk-CN9Gw02i.js";import{p as d}from"./chunk-DJ4Pz6CG.js";import{t as f}from"./chunk-Dy-Kn_BL.js";import{f as p}from"./chunk-BeqgAIrQ.js";var m=(function(){var t=e(function(e,t,n,r){for(n||={},r=e.length;r--;n[e[r]]=t);return n},`o`),n=[1,4],r=[1,14],i=[1,12],a=[1,13],o=[6,7,8],s=[1,20],c=[1,18],l=[1,19],u=[6,7,11],d=[1,6,13,14],f=[1,23],p=[1,24],m=[1,6,7,11,13,14],h={trace:e(function(){},`trace`),yy:{},symbols_:{error:2,start:3,ishikawa:4,spaceLines:5,SPACELINE:6,NL:7,ISHIKAWA:8,document:9,stop:10,EOF:11,statement:12,SPACELIST:13,TEXT:14,$accept:0,$end:1},terminals_:{2:`error`,6:`SPACELINE`,7:`NL`,8:`ISHIKAWA`,11:`EOF`,13:`SPACELIST`,14:`TEXT`},productions_:[0,[3,1],[3,2],[5,1],[5,2],[5,2],[4,2],[4,3],[10,1],[10,1],[10,1],[10,2],[10,2],[9,3],[9,2],[12,2],[12,1],[12,1],[12,1]],performAction:e(function(e,t,n,r,i,a,o){var s=a.length-1;switch(i){case 6:case 7:return r;case 15:r.addNode(a[s-1].length,a[s].trim());break;case 16:r.addNode(0,a[s].trim())}},`anonymous`),table:[{3:1,4:2,5:3,6:[1,5],8:n},{1:[3]},{1:[2,1]},{4:6,6:[1,7],7:[1,8],8:n},{6:r,7:[1,10],9:9,12:11,13:i,14:a},t(o,[2,3]),{1:[2,2]},t(o,[2,4]),t(o,[2,5]),{1:[2,6],6:r,12:15,13:i,14:a},{6:r,9:16,12:11,13:i,14:a},{6:s,7:c,10:17,11:l},t(u,[2,18],{14:[1,21]}),t(u,[2,16]),t(u,[2,17]),{6:s,7:c,10:22,11:l},{1:[2,7],6:r,12:15,13:i,14:a},t(d,[2,14],{7:f,11:p}),t(m,[2,8]),t(m,[2,9]),t(m,[2,10]),t(u,[2,15]),t(d,[2,13],{7:f,11:p}),t(m,[2,11]),t(m,[2,12])],defaultActions:{2:[2,1],6:[2,2]},parseError:e(function(e,t){if(t.recoverable)this.trace(e);else{var n=Error(e);throw n.hash=t,n}},`parseError`),parse:e(function(t){var n=this,r=[0],i=[],a=[null],o=[],s=this.table,c=``,l=0,u=0,d=0,f=2,p=1,m=o.slice.call(arguments,1),h=Object.create(this.lexer),g={yy:{}};for(var _ in this.yy)Object.prototype.hasOwnProperty.call(this.yy,_)&&(g.yy[_]=this.yy[_]);h.setInput(t,g.yy),g.yy.lexer=h,g.yy.parser=this,h.yylloc===void 0&&(h.yylloc={});var v=h.yylloc;o.push(v);var y=h.options&&h.options.ranges;this.parseError=typeof g.yy.parseError==`function`?g.yy.parseError:Object.getPrototypeOf(this).parseError;function b(e){r.length-=2*e,a.length-=e,o.length-=e}e(b,`popStack`);function x(){var e=i.pop()||h.lex()||p;return typeof e!=`number`&&(e instanceof Array&&(i=e,e=i.pop()),e=n.symbols_[e]||e),e}e(x,`lex`);for(var S,C,w,T,E,D={},O,k,A,j;;){if(w=r[r.length-1],this.defaultActions[w]?T=this.defaultActions[w]:(S??=x(),T=s[w]&&s[w][S]),T===void 0||!T.length||!T[0]){var M=``;for(O in j=[],s[w])this.terminals_[O]&&O>f&&j.push(`'`+this.terminals_[O]+`'`);M=h.showPosition?`Parse error on line `+(l+1)+`:
 `+h.showPosition()+`
 Expecting `+j.join(`, `)+`, got '`+(this.terminals_[S]||S)+`'`:`Parse error on line `+(l+1)+`: Unexpected `+(S==p?`end of input`:`'`+(this.terminals_[S]||S)+`'`),this.parseError(M,{text:h.match,token:this.terminals_[S]||S,line:h.yylineno,loc:v,expected:j})}if(T[0]instanceof Array&&T.length>1)throw Error(`Parse Error: multiple actions possible at state: `+w+`, token: `+S);switch(T[0]){case 1:r.push(S),a.push(h.yytext),o.push(h.yylloc),r.push(T[1]),S=null,C?(S=C,C=null):(u=h.yyleng,c=h.yytext,l=h.yylineno,v=h.yylloc,d>0&&d--);break;case 2:if(k=this.productions_[T[1]][1],D.$=a[a.length-k],D._$={first_line:o[o.length-(k||1)].first_line,last_line:o[o.length-1].last_line,first_column:o[o.length-(k||1)].first_column,last_column:o[o.length-1].last_column},y&&(D._$.range=[o[o.length-(k||1)].range[0],o[o.length-1].range[1]]),E=this.performAction.apply(D,[c,u,l,g.yy,T[1],a,o].concat(m)),E!==void 0)return E;k&&(r=r.slice(0,-1*k*2),a=a.slice(0,-1*k),o=o.slice(0,-1*k)),r.push(this.productions_[T[1]][0]),a.push(D.$),o.push(D._$),A=s[r[r.length-2]][r[r.length-1]],r.push(A);break;case 3:return!0}}return!0},`parse`)};h.lexer=(function(){return{EOF:1,parseError:e(function(e,t){if(this.yy.parser)this.yy.parser.parseError(e,t);else throw Error(e)},`parseError`),setInput:e(function(e,t){return this.yy=t||this.yy||{},this._input=e,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match=``,this.conditionStack=[`INITIAL`],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},`setInput`),input:e(function(){var e=this._input[0];return this.yytext+=e,this.yyleng++,this.offset++,this.match+=e,this.matched+=e,e.match(/(?:\r\n?|\n).*/g)?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),e},`input`),unput:e(function(e){var t=e.length,n=e.split(/(?:\r\n?|\n)/g);this._input=e+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-t),this.offset-=t;var r=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),n.length-1&&(this.yylineno-=n.length-1);var i=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:n?(n.length===r.length?this.yylloc.first_column:0)+r[r.length-n.length].length-n[0].length:this.yylloc.first_column-t},this.options.ranges&&(this.yylloc.range=[i[0],i[0]+this.yyleng-t]),this.yyleng=this.yytext.length,this},`unput`),more:e(function(){return this._more=!0,this},`more`),reject:e(function(){if(this.options.backtrack_lexer)this._backtrack=!0;else return this.parseError(`Lexical error on line `+(this.yylineno+1)+`. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).
 `+this.showPosition(),{text:``,token:null,line:this.yylineno});return this},`reject`),less:e(function(e){this.unput(this.match.slice(e))},`less`),pastInput:e(function(){var e=this.matched.substr(0,this.matched.length-this.match.length);return(e.length>20?`...`:``)+e.substr(-20).replace(/\n/g,``)},`pastInput`),upcomingInput:e(function(){var e=this.match;return e.length<20&&(e+=this._input.substr(0,20-e.length)),(e.substr(0,20)+(e.length>20?`...`:``)).replace(/\n/g,``)},`upcomingInput`),showPosition:e(function(){var e=this.pastInput(),t=Array(e.length+1).join(`-`);return e+this.upcomingInput()+`