mirror of
https://github.com/backnotprop/plannotator.git
synced 2026-09-14 14:17:26 +08:00
Michael Ramos
d06b1a337a
The two prose-annotation stores added in #981 carried no PR identity, so after an in-place PR switch they still rendered, counted, and exported against the new PR - leaking one PR's notes into another PR's agent feedback and GitHub/GitLab review body. Stamp each note with the active prUrl at creation (mirroring CodeAnnotation) and filter display/export/count to the active PR via a shared proseAnnotationMatchesPr helper. Notes are never discarded - the full arrays and the draft keep every PR's notes, so a switch back re-reveals them.
55 lines
2.1 KiB
TypeScript
55 lines
2.1 KiB
TypeScript
import type { CodeAnnotation, SelectedLineRange } from '@plannotator/ui/types';
|
|
|
|
/**
|
|
* True when an annotation belongs to the active PR + diff-scope (or carries no
|
|
* PR scope of its own). Centralizes the predicate that the diff surfaces use to
|
|
* keep annotations from one PR/diff-scope out of another after an in-place
|
|
* switch — previously duplicated inline across ReviewDiffPanel,
|
|
* projectFileAnnotations, and the file-comment projections.
|
|
*/
|
|
export function annotationMatchesPrScope(
|
|
a: CodeAnnotation,
|
|
prUrl: string | undefined,
|
|
prDiffScope: string | undefined,
|
|
): boolean {
|
|
return (
|
|
proseAnnotationMatchesPr(a, prUrl) &&
|
|
(!a.diffScope || !prDiffScope || a.diffScope === prDiffScope)
|
|
);
|
|
}
|
|
|
|
/**
|
|
* True when a prose annotation (PR description / PR comment note) belongs to the
|
|
* active PR, or carries no PR scope. Mirrors the prUrl half of
|
|
* {@link annotationMatchesPrScope} for the two prose stores, which have no diff
|
|
* scope of their own. Keeps notes made on one PR from rendering/exporting against
|
|
* another after an in-place switch — without discarding them (a switch back
|
|
* re-reveals them).
|
|
*/
|
|
export function proseAnnotationMatchesPr(
|
|
a: { prUrl?: string },
|
|
prUrl: string | undefined,
|
|
): boolean {
|
|
return !a.prUrl || !prUrl || a.prUrl === prUrl;
|
|
}
|
|
|
|
/** True when an annotation is file-scoped (whole-file comment, not a line/general one). */
|
|
export function isFileScopedAnnotation(a: CodeAnnotation): boolean {
|
|
return (a.scope ?? 'line') === 'file';
|
|
}
|
|
|
|
/**
|
|
* The diff line range an annotation anchors to, as a Pierre `SelectedLineRange`
|
|
* — used to replay a comment's selection as the controlled highlight when it's
|
|
* clicked. Normalizes endpoint order and maps our `'new'|'old'` side to Pierre's
|
|
* `'additions'|'deletions'`. Not meaningful for file-scoped comments (callers
|
|
* skip those via {@link isFileScopedAnnotation}).
|
|
*/
|
|
export function lineRangeForAnnotation(a: CodeAnnotation): SelectedLineRange {
|
|
return {
|
|
start: Math.min(a.lineStart, a.lineEnd),
|
|
end: Math.max(a.lineStart, a.lineEnd),
|
|
side: a.side === 'new' ? 'additions' : 'deletions',
|
|
};
|
|
}
|