@parhelia/core 0.3.12767 → 0.3.12769

package/dist/editor/reviews/SuggestionDisplayPopover.js

@@ -6,18 +6,22 @@ import { useEditContext, useFieldsEditContext } from "../client/editContext";
 import { Popover, PopoverContent, PopoverTrigger, } from "../../components/ui/popover";
 import { formatDate } from "../utils";
 import { Button } from "../../components/ui/button";
-import { deleteSuggestedEdit, createOrUpdateSuggestedEdit, } from "../services/suggestedEditsService";
-import { cleanupPendingSuggestedEditOperations, waitForPendingSuggestedEditSave, } from "../client/operations";
+import { Alert, AlertDescription } from "../../components/ui/alert";
+import { deleteSuggestedEdit } from "../services/suggestedEditsService";
+import { cleanupPendingSuggestedEditOperations } from "../client/operations";
 import { Check, Lightbulb, X } from "lucide-react";
 import { DeleteIcon } from "../../components/ui/delete-icon";
 import { DiffView } from "./DiffView";
-import { createPatch, applyPatch } from "diff";
 import { SuggestionCommentThread } from "./SuggestionCommentThread";
 import { FeedbackContextHeader, getSuggestionContextSegments, } from "./FeedbackCard";
 import { getFeedbackAvatarClassName, useFeedbackAuthor, } from "./feedbackAvatar";
 import { Avatar } from "../../components/ui/avatar";
 import { FEEDBACK_TEXT_CLASS } from "./feedbackSidebarText";
 import { openCommentsFeedback } from "./openCommentsFeedback";
+import { markSuggestedEditRemoved } from "./suggestedEditState";
+import { applySuggestedEditPatch, replaceSuggestedEditCompletely, } from "./applySuggestedEditActions";
+import { getConflictingSuggestionPeers, getSuggestedEditItemLanguage, getSuggestedEditItemVersion, getSuggestionDisplayValue, getSuggestionSelectionKey, } from "./suggestionDisplayValue";
+import { applySuggestionPatchToValue } from "./suggestionPatch";
 export function SuggestionDisplayPopover({ suggestion, children, onSuggestionUpdated, }) {
     const editContext = useEditContext();
     const fieldsContext = useFieldsEditContext();
@@ -39,8 +43,8 @@ export function SuggestionDisplayPopover({ suggestion, children, onSuggestionUpd
             editContext.itemsRepository
                 .getItem({
                 id: suggestion.itemId,
-                language: suggestion.mainItemLanguage,
-                version: suggestion.mainItemVersion,
+                language: getSuggestedEditItemLanguage(suggestion),
+                version: getSuggestedEditItemVersion(suggestion),
             })
                 .then((loadedItem) => {
                 setItem(loadedItem);
@@ -57,8 +61,7 @@ export function SuggestionDisplayPopover({ suggestion, children, onSuggestionUpd
         if (!field)
             return;
         const currentValue = field.rawValue || "";
-        const patch = createPatch("field", suggestion.oldValue, suggestion.newValue);
-        const patchedCandidate = applyPatch(currentValue, patch);
+        const patchedCandidate = applySuggestionPatchToValue(currentValue, suggestion.oldValue, suggestion.newValue);
         if (patchedCandidate === false || typeof patchedCandidate !== "string") {
             setPatchPossible(false);
             setPatchWarning("Patch cannot be applied cleanly to current field value.");
@@ -74,6 +77,7 @@ export function SuggestionDisplayPopover({ suggestion, children, onSuggestionUpd
             return;
         }
         try {
+            markSuggestedEditRemoved(suggestion.id);
             await deleteSuggestedEdit(suggestion);
             // Clean up pending operations to prevent race conditions
             cleanupPendingSuggestedEditOperations(suggestion, editContext?.user);
@@ -117,37 +121,15 @@ export function SuggestionDisplayPopover({ suggestion, children, onSuggestionUpd
             return;
         setIsApplying(true);
         try {
-            await waitForPendingSuggestedEditSave(suggestion);
-            // Recalculate the patch immediately before applying
-            const field = item?.fields?.find((f) => f.id === suggestion.fieldId);
-            if (!field)
-                return;
-            const currentValue = field.rawValue || "";
-            const patch = createPatch("field", suggestion.oldValue, suggestion.newValue);
-            const patchedCandidate = applyPatch(currentValue, patch);
-            if (patchedCandidate === false || typeof patchedCandidate !== "string") {
+            const result = await applySuggestedEditPatch(suggestion, editContext);
+            if (result.type === "patch-conflict") {
                 setPatchWarning("Patch cannot be applied cleanly to current field value.");
                 return;
             }
-            await editContext.operations.editField({
-                field: {
-                    fieldId: suggestion.fieldId,
-                    item: {
-                        id: suggestion.itemId,
-                        language: suggestion.mainItemLanguage,
-                        version: suggestion.mainItemVersion,
-                    },
-                },
-                value: patchedCandidate,
-                rawValue: patchedCandidate,
-                forceMode: "edit",
-                refresh: "immediate",
-            });
-            // Update the suggestion status to "applied"
-            const updatedSuggestion = { ...suggestion, status: "applied" };
-            await createOrUpdateSuggestedEdit(updatedSuggestion);
-            onSuggestionUpdated?.();
-            setIsOpen(false);
+            if (result.type === "success") {
+                onSuggestionUpdated?.();
+                setIsOpen(false);
+            }
         }
         finally {
             setIsApplying(false);
@@ -158,25 +140,11 @@ export function SuggestionDisplayPopover({ suggestion, children, onSuggestionUpd
             return;
         setIsApplying(true);
         try {
-            await waitForPendingSuggestedEditSave(suggestion);
-            await editContext.operations.editField({
-                field: {
-                    fieldId: suggestion.fieldId,
-                    item: {
-                        id: suggestion.itemId,
-                        language: suggestion.mainItemLanguage,
-                        version: suggestion.mainItemVersion,
-                    },
-                },
-                value: suggestion.newValue,
-                rawValue: suggestion.newValue,
-                forceMode: "edit",
-                refresh: "immediate",
-            });
-            const updatedSuggestion = { ...suggestion, status: "applied" };
-            await createOrUpdateSuggestedEdit(updatedSuggestion);
-            onSuggestionUpdated?.();
-            setIsOpen(false);
+            const result = await replaceSuggestedEditCompletely(suggestion, editContext);
+            if (result.type === "success") {
+                onSuggestionUpdated?.();
+                setIsOpen(false);
+            }
         }
         finally {
             setIsApplying(false);
@@ -196,6 +164,44 @@ export function SuggestionDisplayPopover({ suggestion, children, onSuggestionUpd
         ? item.fields.find((f) => f.id === suggestion.fieldId)?.name || undefined
         : undefined;
     const contextSegments = getSuggestionContextSegments(suggestion, editContext?.currentItemDescriptor?.name, item ? item.name : undefined, fieldName);
+    const conflictDisplay = React.useMemo(() => {
+        if (!item || !suggestion.fieldId)
+            return undefined;
+        const field = item.fields?.find((candidate) => candidate.id === suggestion.fieldId);
+        if (!field)
+            return undefined;
+        const language = getSuggestedEditItemLanguage(suggestion);
+        const version = getSuggestedEditItemVersion(suggestion) ?? 0;
+        const selectionKey = getSuggestionSelectionKey({
+            itemId: suggestion.itemId,
+            language,
+            fieldId: suggestion.fieldId,
+        });
+        return getSuggestionDisplayValue({
+            repositoryValue: field.rawValue ?? "",
+            suggestedEdits: editContext?.suggestedEdits ?? [],
+            field: {
+                itemId: suggestion.itemId,
+                language,
+                version,
+                fieldId: suggestion.fieldId,
+                pageItemId: suggestion.mainItemId,
+                pageItemLanguage: suggestion.mainItemLanguage,
+                pageItemVersion: suggestion.mainItemVersion,
+            },
+            mode: "suggestions",
+            selectedVariantId: editContext?.suggestionVariantSelection[selectionKey],
+        });
+    }, [
+        editContext?.suggestedEdits,
+        editContext?.suggestionVariantSelection,
+        item,
+        suggestion,
+    ]);
+    const conflictPeers = React.useMemo(() => conflictDisplay
+        ? getConflictingSuggestionPeers(conflictDisplay.suggestions, suggestion.id)
+        : [], [conflictDisplay, suggestion.id]);
+    const isConflicting = conflictPeers.length > 0;
     return (_jsxs(Popover, { open: isOpen, onOpenChange: (open) => {
             setIsOpen(open);
             if (!open) {
@@ -206,7 +212,20 @@ export function SuggestionDisplayPopover({ suggestion, children, onSuggestionUpd
                                                         ? formatDate(new Date(suggestion.created))
                                                         : "" })] })] }), suggestion.status === "applied" && (_jsxs("div", { className: "text-feedback-green text-xs font-medium", children: ["\u2713 Applied", " ", suggestion.updatedBy ? `by ${suggestion.updatedBy}` : "", suggestion.updated
                                             ? ` on ${formatDate(new Date(suggestion.updated))}`
-                                            : ""] })), _jsxs("div", { className: "text-sm", children: [_jsx(DiffView, { oldText: suggestion.oldValue, newText: suggestion.newValue, ignoreFormatting: true, clipUnchanged: true, clipThreshold: 50, clipContext: 10 }), canApply && patchWarning && (_jsxs("div", { className: "text-feedback-red mt-2 text-xs", children: [patchWarning, _jsx("button", { className: "hover:text-feedback-red ml-2 cursor-pointer underline", onClick: handleReplaceCompletely, disabled: isApplying, children: "Click here to replace the field content completely." })] }))] }), canApply && !patchPossible && suggestion.status !== "applied" && (_jsx("div", { className: "border-t pt-3", children: _jsx(Button, { size: "sm", onClick: handleReplaceCompletely, disabled: isApplying, className: "w-full", children: isApplying ? "Applying..." : "Replace Field Content" }) })), (!editContext?.readonly || suggestionComments.length > 0) && (_jsx("div", { className: "border-t pt-3", children: _jsx(SuggestionCommentThread, { suggestion: suggestion, comments: suggestionComments, compact: true, constrainHeight: true }) })), deleteConfirm && (_jsxs("div", { className: "border-t pt-3", children: [_jsx("div", { className: "text-feedback-red mb-2 text-sm", children: "Are you sure you want to delete this suggestion?" }), _jsxs("div", { className: "flex gap-2", children: [_jsx(Button, { variant: "outline", size: "sm", onClick: () => setDeleteConfirm(false), children: "Cancel" }), _jsx(Button, { variant: "destructive", size: "sm", onClick: handleDelete, children: "Delete" })] })] })), !deleteConfirm && !editContext?.configuration?.forceFullscreen && (_jsx("div", { className: "border-t pt-3", children: _jsx(Button, { variant: "outline", size: "sm", onClick: () => {
+                                            : ""] })), isConflicting && suggestion.fieldId && (_jsx(Alert, { className: "mb-3", children: _jsxs(AlertDescription, { className: "flex items-center justify-between gap-3", children: [_jsxs("span", { children: ["Conflicts with ", conflictPeers.length, " other pending suggestion(s)."] }), _jsx(Button, { type: "button", size: "xs", variant: "outline", onClick: () => {
+                                                    const selectionKey = getSuggestionSelectionKey({
+                                                        itemId: suggestion.itemId,
+                                                        language: getSuggestedEditItemLanguage(suggestion),
+                                                        fieldId: suggestion.fieldId,
+                                                    });
+                                                    const variantId = conflictDisplay?.variants.some((variant) => variant.id === suggestion.id)
+                                                        ? suggestion.id
+                                                        : "merged";
+                                                    editContext?.setSuggestionVariantSelection((current) => ({
+                                                        ...current,
+                                                        [selectionKey]: variantId,
+                                                    }));
+                                                }, children: "Preview on page" })] }) })), _jsxs("div", { className: "text-sm", children: [_jsx(DiffView, { oldText: suggestion.oldValue, newText: suggestion.newValue, ignoreFormatting: true, clipUnchanged: true, clipThreshold: 50, clipContext: 10 }), canApply && patchWarning && (_jsxs("div", { className: "text-feedback-red mt-2 text-xs", children: [patchWarning, _jsx("button", { className: "hover:text-feedback-red ml-2 cursor-pointer underline", onClick: handleReplaceCompletely, disabled: isApplying, children: "Click here to replace the field content completely." })] }))] }), canApply && !patchPossible && suggestion.status !== "applied" && (_jsx("div", { className: "border-t pt-3", children: _jsx(Button, { size: "sm", onClick: handleReplaceCompletely, disabled: isApplying, className: "w-full", children: isApplying ? "Applying..." : "Replace Field Content" }) })), (!editContext?.readonly || suggestionComments.length > 0) && (_jsx("div", { className: "border-t pt-3", children: _jsx(SuggestionCommentThread, { suggestion: suggestion, comments: suggestionComments, compact: true, constrainHeight: true }) })), deleteConfirm && (_jsxs("div", { className: "border-t pt-3", children: [_jsx("div", { className: "text-feedback-red mb-2 text-sm", children: "Are you sure you want to delete this suggestion?" }), _jsxs("div", { className: "flex gap-2", children: [_jsx(Button, { variant: "outline", size: "sm", onClick: () => setDeleteConfirm(false), children: "Cancel" }), _jsx(Button, { variant: "destructive", size: "sm", onClick: handleDelete, children: "Delete" })] })] })), !deleteConfirm && !editContext?.configuration?.forceFullscreen && (_jsx("div", { className: "border-t pt-3", children: _jsx(Button, { variant: "outline", size: "sm", onClick: () => {
                                             setIsOpen(false);
                                             // Exit fullscreen mode if active
                                             if (editContext?.fullscreen) {
@@ -218,8 +237,8 @@ export function SuggestionDisplayPopover({ suggestion, children, onSuggestionUpd
                                                     fieldId: suggestion.fieldId,
                                                     item: {
                                                         id: suggestion.itemId,
-                                                        language: suggestion.mainItemLanguage,
-                                                        version: suggestion.mainItemVersion,
+                                                        language: getSuggestedEditItemLanguage(suggestion),
+                                                        version: getSuggestedEditItemVersion(suggestion),
                                                     },
                                                 }, false);
                                                 editContext?.select?.([suggestion.itemId]);

package/dist/editor/reviews/SuggestionDisplayPopover.js.map

@@ -1 +1 @@
-{"version":3,"file":"SuggestionDisplayPopover.js","sourceRoot":"","sources":["../../../src/editor/reviews/SuggestionDisplayPopover.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"SuggestionDisplayPopover.js","sourceRoot":"","sources":["../../../src/editor/reviews/SuggestionDisplayPopover.tsx"],"names":[],"mappings":"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"}

package/dist/editor/reviews/applySuggestedEditActions.d.ts

@@ -0,0 +1,21 @@
+import type { SuggestedEdit } from "../../types";
+import type { EditContextType } from "../client/editContext";
+type SuggestedEditActionResult = {
+    type: "success";
+    suggestion: SuggestedEdit;
+} | {
+    type: "conflict";
+    suggestion?: SuggestedEdit;
+} | {
+    type: "patch-conflict";
+} | {
+    type: "missing";
+} | {
+    type: "error";
+};
+export declare function sha256SuggestedEditFieldValue(value: string): Promise<string>;
+export declare function applySuggestedEditPatch(suggestion: SuggestedEdit, editContext: EditContextType): Promise<SuggestedEditActionResult>;
+export declare function applyRejectedSuggestedEditPatch(suggestion: SuggestedEdit, editContext: EditContextType): Promise<SuggestedEditActionResult>;
+export declare function replaceSuggestedEditCompletely(suggestion: SuggestedEdit, editContext: EditContextType): Promise<SuggestedEditActionResult>;
+export declare function rejectSuggestedEditAction(suggestion: SuggestedEdit, editContext: EditContextType): Promise<SuggestedEditActionResult>;
+export {};

package/dist/editor/reviews/applySuggestedEditActions.js

@@ -0,0 +1,242 @@
+import { enqueueSuggestedEditFieldTask } from "../client/suggestedEditFieldQueue";
+import { createOrUpdateSuggestedEdit } from "../services/suggestedEditsService";
+import { getPendingFieldSuggestions, getSuggestedEditItemLanguage, getSuggestedEditItemVersion, getSuggestionFieldIdentityKey, getSuggestionSelectionKey, } from "./suggestionDisplayValue";
+import { isSuggestedEditRemoved, upsertSuggestedEdit, } from "./suggestedEditState";
+import { applySuggestionPatchToValue } from "./suggestionPatch";
+function getActionKey(suggestion) {
+    return getSuggestionFieldIdentityKey({
+        itemId: suggestion.itemId,
+        language: getSuggestedEditItemLanguage(suggestion),
+        version: getSuggestedEditItemVersion(suggestion),
+        fieldId: suggestion.fieldId,
+    });
+}
+function findFreshSuggestion(editContext, id) {
+    return editContext.getCurrentSuggestedEdits().find((edit) => edit.id === id);
+}
+function upsertFromServer(editContext, suggestion, expectedNewValue) {
+    editContext.setSuggestedEdits((current) => upsertSuggestedEdit(current, suggestion, {
+        source: "save-ack",
+        expectedNewValue,
+    }));
+}
+export async function sha256SuggestedEditFieldValue(value) {
+    const bytes = new TextEncoder().encode(value);
+    const hash = await crypto.subtle.digest("SHA-256", bytes);
+    return Array.from(new Uint8Array(hash))
+        .map((byte) => byte.toString(16).padStart(2, "0"))
+        .join("");
+}
+async function persistRebasedSibling({ sibling, baseValue, editContext, }) {
+    let current = sibling;
+    let currentBase = baseValue;
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+        const rebased = currentBase === current.newValue
+            ? currentBase
+            : applySuggestionPatchToValue(currentBase, current.oldValue, current.newValue);
+        if (rebased === false || typeof rebased !== "string")
+            return false;
+        const subsumed = rebased === currentBase;
+        const candidate = subsumed
+            ? { ...current, status: "applied" }
+            : {
+                ...current,
+                oldValue: currentBase,
+                newValue: rebased,
+                updated: new Date().toISOString(),
+                updatedBy: editContext.user?.name || "unknown",
+            };
+        const result = await createOrUpdateSuggestedEdit(candidate, {
+            expectedUpdated: current.updated,
+            expectedFieldHash: await sha256SuggestedEditFieldValue(currentBase),
+        });
+        if (result.type === "success" && result.data) {
+            upsertFromServer(editContext, result.data, subsumed ? current.newValue : rebased);
+            return true;
+        }
+        if (result.type !== "conflict")
+            return false;
+        if (result.suggestion)
+            upsertFromServer(editContext, result.suggestion);
+        if (result.suggestion?.status !== "pending" ||
+            typeof result.fieldValue !== "string") {
+            return true;
+        }
+        current = result.suggestion;
+        currentBase = result.fieldValue;
+    }
+    return false;
+}
+async function rebaseSiblingSuggestions({ appliedEdit, newFieldValue, fieldItem, editContext, }) {
+    const itemId = fieldItem?.id ?? appliedEdit.itemId;
+    const itemLanguage = fieldItem?.language ?? getSuggestedEditItemLanguage(appliedEdit);
+    const itemVersion = fieldItem?.version ?? getSuggestedEditItemVersion(appliedEdit);
+    const siblings = getPendingFieldSuggestions(editContext.getCurrentSuggestedEdits(), {
+        fieldId: appliedEdit.fieldId,
+        itemId,
+        language: itemLanguage,
+        version: itemVersion,
+        pageItemId: appliedEdit.mainItemId,
+        pageItemLanguage: appliedEdit.mainItemLanguage,
+        pageItemVersion: appliedEdit.mainItemVersion > 0
+            ? appliedEdit.mainItemVersion
+            : undefined,
+    }).filter((candidate) => candidate.id !== appliedEdit.id && !isSuggestedEditRemoved(candidate.id));
+    let failures = 0;
+    for (const sibling of siblings) {
+        const fresh = findFreshSuggestion(editContext, sibling.id);
+        if (!fresh ||
+            fresh.status !== "pending" ||
+            isSuggestedEditRemoved(fresh.id)) {
+            continue;
+        }
+        try {
+            if (!(await persistRebasedSibling({
+                sibling: fresh,
+                baseValue: newFieldValue,
+                editContext,
+            }))) {
+                failures += 1;
+            }
+        }
+        catch (error) {
+            failures += 1;
+            console.warn("Failed to rebase sibling suggestion", error);
+        }
+    }
+    const selectionKey = getSuggestionSelectionKey({
+        itemId,
+        language: itemLanguage,
+        fieldId: appliedEdit.fieldId,
+    });
+    editContext.setSuggestionVariantSelection((current) => {
+        if (!(selectionKey in current))
+            return current;
+        const next = { ...current };
+        delete next[selectionKey];
+        return next;
+    });
+    if (failures > 0) {
+        editContext.showErrorToast({
+            summary: "Some suggestions could not be rebased",
+            details: "They remain available as conflict variants.",
+        });
+    }
+}
+async function applyOrReplaceSuggestedEdit({ suggestion, editContext, replace, allowRejected, }) {
+    return enqueueSuggestedEditFieldTask(getActionKey(suggestion), async () => {
+        const fresh = findFreshSuggestion(editContext, suggestion.id);
+        const canApplyFreshSuggestion = fresh?.status === "pending" ||
+            (allowRejected && fresh?.status === "rejected");
+        if (!fresh ||
+            !canApplyFreshSuggestion ||
+            isSuggestedEditRemoved(fresh.id)) {
+            editContext.showErrorToast({
+                summary: "Suggestion is no longer pending",
+            });
+            return { type: "missing" };
+        }
+        const itemDescriptor = {
+            id: fresh.itemId,
+            language: getSuggestedEditItemLanguage(fresh),
+            version: getSuggestedEditItemVersion(fresh),
+        };
+        const field = await editContext.itemsRepository.getField({
+            item: itemDescriptor,
+            fieldId: fresh.fieldId,
+        });
+        if (!field)
+            return { type: "missing" };
+        const resolvedItemDescriptor = field.descriptor?.item ?? itemDescriptor;
+        const currentValue = field.rawValue || "";
+        const patchedCandidate = replace
+            ? fresh.newValue
+            : applySuggestionPatchToValue(currentValue, fresh.oldValue, fresh.newValue);
+        if (patchedCandidate === false || typeof patchedCandidate !== "string") {
+            return { type: "patch-conflict" };
+        }
+        await editContext.operations.editField({
+            field: { fieldId: fresh.fieldId, item: resolvedItemDescriptor },
+            value: patchedCandidate,
+            rawValue: patchedCandidate,
+            forceMode: "edit",
+            refresh: "immediate",
+        });
+        const result = await createOrUpdateSuggestedEdit({ ...fresh, status: "applied" }, { expectedUpdated: fresh.updated });
+        let actionResult;
+        if (result.type === "success" && result.data) {
+            upsertFromServer(editContext, result.data, fresh.newValue);
+            actionResult = { type: "success", suggestion: result.data };
+        }
+        else if (result.type === "conflict") {
+            if (result.suggestion)
+                upsertFromServer(editContext, result.suggestion);
+            actionResult = { type: "conflict", suggestion: result.suggestion };
+        }
+        else {
+            editContext.showErrorToast({
+                summary: result.summary ||
+                    "Suggestion was applied but its status could not be saved",
+                details: result.details,
+            });
+            actionResult = { type: "error" };
+        }
+        await rebaseSiblingSuggestions({
+            appliedEdit: fresh,
+            newFieldValue: patchedCandidate,
+            fieldItem: resolvedItemDescriptor,
+            editContext,
+        });
+        return actionResult;
+    });
+}
+export function applySuggestedEditPatch(suggestion, editContext) {
+    return applyOrReplaceSuggestedEdit({
+        suggestion,
+        editContext,
+        replace: false,
+        allowRejected: false,
+    });
+}
+export function applyRejectedSuggestedEditPatch(suggestion, editContext) {
+    return applyOrReplaceSuggestedEdit({
+        suggestion,
+        editContext,
+        replace: false,
+        allowRejected: true,
+    });
+}
+export function replaceSuggestedEditCompletely(suggestion, editContext) {
+    return applyOrReplaceSuggestedEdit({
+        suggestion,
+        editContext,
+        replace: true,
+        allowRejected: false,
+    });
+}
+export function rejectSuggestedEditAction(suggestion, editContext) {
+    return enqueueSuggestedEditFieldTask(getActionKey(suggestion), async () => {
+        const fresh = findFreshSuggestion(editContext, suggestion.id);
+        if (!fresh ||
+            fresh.status !== "pending" ||
+            isSuggestedEditRemoved(fresh.id)) {
+            return { type: "missing" };
+        }
+        const result = await createOrUpdateSuggestedEdit({ ...fresh, status: "rejected" }, { expectedUpdated: fresh.updated });
+        if (result.type === "success" && result.data) {
+            upsertFromServer(editContext, result.data, fresh.newValue);
+            return { type: "success", suggestion: result.data };
+        }
+        if (result.type === "conflict") {
+            if (result.suggestion)
+                upsertFromServer(editContext, result.suggestion);
+            return { type: "conflict", suggestion: result.suggestion };
+        }
+        editContext.showErrorToast({
+            summary: result.summary || "Failed to reject suggestion",
+            details: result.details,
+        });
+        return { type: "error" };
+    });
+}
+//# sourceMappingURL=applySuggestedEditActions.js.map

package/dist/editor/reviews/applySuggestedEditActions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"applySuggestedEditActions.js","sourceRoot":"","sources":["../../../src/editor/reviews/applySuggestedEditActions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,2BAA2B,EAC3B,6BAA6B,EAC7B,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAShE,SAAS,YAAY,CAAC,UAAyB;IAC7C,OAAO,6BAA6B,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,QAAQ,EAAE,4BAA4B,CAAC,UAAU,CAAC;QAClD,OAAO,EAAE,2BAA2B,CAAC,UAAU,CAAC;QAChD,OAAO,EAAE,UAAU,CAAC,OAAO;KAC5B,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,WAA4B,EAAE,EAAU;IACnE,OAAO,WAAW,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,gBAAgB,CACvB,WAA4B,EAC5B,UAAyB,EACzB,gBAAyB;IAEzB,WAAW,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,EAAE,CACxC,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE;QACvC,MAAM,EAAE,UAAU;QAClB,gBAAgB;KACjB,CAAC,CACH,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,KAAa;IAC/D,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC1D,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;SACpC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SACjD,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,EACnC,OAAO,EACP,SAAS,EACT,WAAW,GAKZ;IACC,IAAI,OAAO,GAAG,OAAO,CAAC;IACtB,IAAI,WAAW,GAAG,SAAS,CAAC;IAE5B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,OAAO,GACX,WAAW,KAAK,OAAO,CAAC,QAAQ;YAC9B,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,2BAA2B,CACzB,WAAW,EACX,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,QAAQ,CACjB,CAAC;QACR,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,OAAO,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAEnE,MAAM,QAAQ,GAAG,OAAO,KAAK,WAAW,CAAC;QACzC,MAAM,SAAS,GAAkB,QAAQ;YACvC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE;YACnC,CAAC,CAAC;gBACE,GAAG,OAAO;gBACV,QAAQ,EAAE,WAAW;gBACrB,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBACjC,SAAS,EAAE,WAAW,CAAC,IAAI,EAAE,IAAI,IAAI,SAAS;aAC/C,CAAC;QACN,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,SAAS,EAAE;YAC1D,eAAe,EAAE,OAAO,CAAC,OAAO;YAChC,iBAAiB,EAAE,MAAM,6BAA6B,CAAC,WAAW,CAAC;SACpE,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAC7C,gBAAgB,CACd,WAAW,EACX,MAAM,CAAC,IAAI,EACX,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CACtC,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU;YAAE,OAAO,KAAK,CAAC;QAC7C,IAAI,MAAM,CAAC,UAAU;YAAE,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACxE,IACE,MAAM,CAAC,UAAU,EAAE,MAAM,KAAK,SAAS;YACvC,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ,EACrC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC;QAC5B,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,EACtC,WAAW,EACX,aAAa,EACb,SAAS,EACT,WAAW,GAMZ;IACC,MAAM,MAAM,GAAG,SAAS,EAAE,EAAE,IAAI,WAAW,CAAC,MAAM,CAAC;IACnD,MAAM,YAAY,GAChB,SAAS,EAAE,QAAQ,IAAI,4BAA4B,CAAC,WAAW,CAAC,CAAC;IACnE,MAAM,WAAW,GACf,SAAS,EAAE,OAAO,IAAI,2BAA2B,CAAC,WAAW,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,0BAA0B,CACzC,WAAW,CAAC,wBAAwB,EAAE,EACtC;QACE,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,MAAM;QACN,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,WAAW;QACpB,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;QAC9C,eAAe,EACb,WAAW,CAAC,eAAe,GAAG,CAAC;YAC7B,CAAC,CAAC,WAAW,CAAC,eAAe;YAC7B,CAAC,CAAC,SAAS;KAChB,CACF,CAAC,MAAM,CACN,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,EAAE,KAAK,WAAW,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC,CAC3E,CAAC;IAEF,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,mBAAmB,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3D,IACE,CAAC,KAAK;YACN,KAAK,CAAC,MAAM,KAAK,SAAS;YAC1B,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC,EAChC,CAAC;YACD,SAAS;QACX,CAAC;QACD,IAAI,CAAC;YACH,IACE,CAAC,CAAC,MAAM,qBAAqB,CAAC;gBAC5B,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,aAAa;gBACxB,WAAW;aACZ,CAAC,CAAC,EACH,CAAC;gBACD,QAAQ,IAAI,CAAC,CAAC;YAChB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,QAAQ,IAAI,CAAC,CAAC;YACd,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAAG,yBAAyB,CAAC;QAC7C,MAAM;QACN,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAC,CAAC;IACH,WAAW,CAAC,6BAA6B,CAAC,CAAC,OAAO,EAAE,EAAE;QACpD,IAAI,CAAC,CAAC,YAAY,IAAI,OAAO,CAAC;YAAE,OAAO,OAAO,CAAC;QAC/C,MAAM,IAAI,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QACjB,WAAW,CAAC,cAAc,CAAC;YACzB,OAAO,EAAE,uCAAuC;YAChD,OAAO,EAAE,6CAA6C;SACvD,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,2BAA2B,CAAC,EACzC,UAAU,EACV,WAAW,EACX,OAAO,EACP,aAAa,GAMd;IACC,OAAO,6BAA6B,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,KAAK,IAAI,EAAE;QACxE,MAAM,KAAK,GAAG,mBAAmB,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAC9D,MAAM,uBAAuB,GAC3B,KAAK,EAAE,MAAM,KAAK,SAAS;YAC3B,CAAC,aAAa,IAAI,KAAK,EAAE,MAAM,KAAK,UAAU,CAAC,CAAC;QAClD,IACE,CAAC,KAAK;YACN,CAAC,uBAAuB;YACxB,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC,EAChC,CAAC;YACD,WAAW,CAAC,cAAc,CAAC;gBACzB,OAAO,EAAE,iCAAiC;aAC3C,CAAC,CAAC;YACH,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7B,CAAC;QAED,MAAM,cAAc,GAAG;YACrB,EAAE,EAAE,KAAK,CAAC,MAAM;YAChB,QAAQ,EAAE,4BAA4B,CAAC,KAAK,CAAC;YAC7C,OAAO,EAAE,2BAA2B,CAAC,KAAK,CAAC;SAC5C,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC;YACvD,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;QACH,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAEvC,MAAM,sBAAsB,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,IAAI,cAAc,CAAC;QACxE,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC1C,MAAM,gBAAgB,GAAG,OAAO;YAC9B,CAAC,CAAC,KAAK,CAAC,QAAQ;YAChB,CAAC,CAAC,2BAA2B,CACzB,YAAY,EACZ,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,QAAQ,CACf,CAAC;QACN,IAAI,gBAAgB,KAAK,KAAK,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACvE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;QACpC,CAAC;QAED,MAAM,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC;YACrC,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAE;YAC/D,KAAK,EAAE,gBAAgB;YACvB,QAAQ,EAAE,gBAAgB;YAC1B,SAAS,EAAE,MAAM;YACjB,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAC9C,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAC/B,EAAE,eAAe,EAAE,KAAK,CAAC,OAAO,EAAE,CACnC,CAAC;QACF,IAAI,YAAuC,CAAC;QAC5C,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAC7C,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC3D,YAAY,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9D,CAAC;aAAM,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACtC,IAAI,MAAM,CAAC,UAAU;gBAAE,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YACxE,YAAY,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;QACrE,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,cAAc,CAAC;gBACzB,OAAO,EACL,MAAM,CAAC,OAAO;oBACd,0DAA0D;gBAC5D,OAAO,EAAE,MAAM,CAAC,OAAO;aACxB,CAAC,CAAC;YACH,YAAY,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACnC,CAAC;QAED,MAAM,wBAAwB,CAAC;YAC7B,WAAW,EAAE,KAAK;YAClB,aAAa,EAAE,gBAAgB;YAC/B,SAAS,EAAE,sBAAsB;YACjC,WAAW;SACZ,CAAC,CAAC;QACH,OAAO,YAAY,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,UAAyB,EACzB,WAA4B;IAE5B,OAAO,2BAA2B,CAAC;QACjC,UAAU;QACV,WAAW;QACX,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,KAAK;KACrB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,UAAyB,EACzB,WAA4B;IAE5B,OAAO,2BAA2B,CAAC;QACjC,UAAU;QACV,WAAW;QACX,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,UAAyB,EACzB,WAA4B;IAE5B,OAAO,2BAA2B,CAAC;QACjC,UAAU;QACV,WAAW;QACX,OAAO,EAAE,IAAI;QACb,aAAa,EAAE,KAAK;KACrB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,UAAyB,EACzB,WAA4B;IAE5B,OAAO,6BAA6B,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,KAAK,IAAI,EAAE;QACxE,MAAM,KAAK,GAAG,mBAAmB,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAC9D,IACE,CAAC,KAAK;YACN,KAAK,CAAC,MAAM,KAAK,SAAS;YAC1B,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC,EAChC,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7B,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAC9C,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,EAChC,EAAE,eAAe,EAAE,KAAK,CAAC,OAAO,EAAE,CACnC,CAAC;QACF,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAC7C,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC3D,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QACtD,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,IAAI,MAAM,CAAC,UAAU;gBAAE,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YACxE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;QAC7D,CAAC;QACD,WAAW,CAAC,cAAc,CAAC;YACzB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,6BAA6B;YACxD,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/editor/reviews/feedbackScrollTarget.d.ts

@@ -4,6 +4,8 @@ import type { FieldDescriptor, ItemDescriptor } from "../pageModel";
 export type SuggestionRangeData = {
     oldRanges: Array<[number, number]>;
     newRanges: Array<[number, number]>;
+    oldAnchorOffsets: number[];
+    newAnchorOffsets: number[];
     oldText: string;
     newText: string;
 };
@@ -16,4 +18,5 @@ export declare function getCommentScrollIntoViewTarget(comment: Comment): Scroll
 export declare function getSuggestedEditFieldDescriptor(suggestion: SuggestedEdit): FieldDescriptor;
 export declare function getSuggestedEditItemDescriptor(suggestion: SuggestedEdit): ItemDescriptor;
 export declare function getSuggestionRangeData(oldValue: string | null | undefined, newValue: string | null | undefined): SuggestionRangeData;
+export declare function getSuggestionDisplayRanges(rangeData: SuggestionRangeData, value: "old" | "new"): Array<[number, number]>;
 export declare function getSuggestedEditScrollIntoViewTarget(suggestion: SuggestedEdit): ScrollIntoViewTarget;

package/dist/editor/reviews/feedbackScrollTarget.js

@@ -1,5 +1,6 @@
 import * as DiffLib from "diff";
 import { COMMENT_TRANSIENT_ELEMENT_KEY, } from "./commentTransientSelection";
+import { getSuggestedEditItemLanguage, getSuggestedEditItemVersion, } from "./suggestionDisplayValue";
 export function getCommentTextRangeKey(comment) {
     return `comment:${comment.id}`;
 }
@@ -70,8 +71,8 @@ export function getSuggestedEditFieldDescriptor(suggestion) {
 export function getSuggestedEditItemDescriptor(suggestion) {
     return {
         id: suggestion.itemId,
-        language: suggestion.mainItemLanguage,
-        version: suggestion.mainItemVersion,
+        language: getSuggestedEditItemLanguage(suggestion),
+        version: getSuggestedEditItemVersion(suggestion),
     };
 }
 export function getSuggestionRangeData(oldValue, newValue) {
@@ -81,6 +82,8 @@ export function getSuggestionRangeData(oldValue, newValue) {
         return {
             oldRanges: [],
             newRanges: [],
+            oldAnchorOffsets: [],
+            newAnchorOffsets: [],
             oldText,
             newText,
         };
@@ -88,15 +91,19 @@ export function getSuggestionRangeData(oldValue, newValue) {
     const diffResult = DiffLib.diffChars(oldText, newText);
     const oldChangeRanges = [];
     const newChangeRanges = [];
+    const oldAnchorOffsets = [];
+    const newAnchorOffsets = [];
     let positionInOld = 0;
     let positionInNew = 0;
     for (const part of diffResult) {
         if (part.removed) {
             oldChangeRanges.push([positionInOld, positionInOld + part.value.length]);
+            newAnchorOffsets.push(positionInNew);
             positionInOld += part.value.length;
         }
         else if (part.added) {
             newChangeRanges.push([positionInNew, positionInNew + part.value.length]);
+            oldAnchorOffsets.push(positionInOld);
             positionInNew += part.value.length;
         }
         else {
@@ -107,10 +114,21 @@ export function getSuggestionRangeData(oldValue, newValue) {
     return {
         oldRanges: mergeRanges(oldChangeRanges),
         newRanges: mergeRanges(newChangeRanges),
+        oldAnchorOffsets,
+        newAnchorOffsets,
         oldText,
         newText,
     };
 }
+export function getSuggestionDisplayRanges(rangeData, value) {
+    const changeRanges = value === "old" ? rangeData.oldRanges : rangeData.newRanges;
+    const anchorOffsets = value === "old" ? rangeData.oldAnchorOffsets : rangeData.newAnchorOffsets;
+    const uncoveredAnchorOffsets = Array.from(new Set(anchorOffsets)).filter((offset) => !changeRanges.some(([start, end]) => offset >= start && offset <= end));
+    return [
+        ...changeRanges,
+        ...uncoveredAnchorOffsets.map((offset) => [offset, offset]),
+    ].sort(([leftStart], [rightStart]) => leftStart - rightStart);
+}
 export function getSuggestedEditScrollIntoViewTarget(suggestion) {
     const fallbackField = getSuggestedEditFieldDescriptor(suggestion);
     const textRangeKey = getSuggestedEditTextRangeKey(suggestion);