@hydranium/glsp-server 1.0.0-next.318 → 1.0.0-next.319

package/lib/command/hydranium-glsp-command-stack.d.ts

@@ -6,12 +6,13 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { DefaultCommandStack, ModelState } from '@eclipse-glsp/server';
+import { type Command, DefaultCommandStack, ModelState } from '@eclipse-glsp/server';
 import { type ServerSharedServices } from '@hydranium/core';
 /**
  * GLSP's command stack with the diagram's dirty state read from the text store:
  * dirty while any document the diagram's client session has open differs from
- * its file, as the store last knew the file. Undo and redo are GLSP's.
+ * its file, as the store last knew the file. Undo and redo are GLSP's; a
+ * command whose every write was dropped is not pushed.
  *
  * GLSP's own answer counts the diagram's commands since its last save, so it
  * misses every change the diagram did not make: another client's unsaved edit
@@ -23,6 +24,16 @@ export declare class HydraniumGlspCommandStack extends DefaultCommandStack {
     protected readonly modelState: ModelState;
     protected readonly sharedServices: ServerSharedServices;
     get isDirty(): boolean;
+    /**
+     * Lifted from `@eclipse-glsp/server` 2.7.0's `DefaultCommandStack.execute`,
+     * pushing no entry for a recording command executed outside an operation
+     * whose write was dropped, or a `CompoundCommand` of only such commands at
+     * any depth: its undo would do nothing, and the user's next undo would be
+     * spent on it. A compound that also changed something is pushed, warning
+     * that its undo step leaves out what was dropped. The accompanying test
+     * pins upstream's source.
+     */
+    execute(command: Command): Promise<void>;
     /**
      * Lifted from `@eclipse-glsp/server` 2.7.0's `DefaultCommandStack.handleError`
      * without its `error` line: the failure is rethrown, and whoever ends it

package/lib/command/hydranium-glsp-command-stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-command-stack.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-command-stack.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAI5D;;;;;;;;;;GAUG;AACH,qBACa,yBAA0B,SAAQ,mBAAmB;IAC3C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAG,UAAU,CAAC;IACpB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,oBAAoB,CAAC;IAEpG,IAAa,OAAO,IAAI,OAAO,CAI9B;IAED;;;;OAIG;IACH,UAAmB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAIpD;CACH"}
+{"version":3,"file":"hydranium-glsp-command-stack.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-command-stack.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,OAAO,EAAmB,mBAAmB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACtG,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAM5D;;;;;;;;;;;GAWG;AACH,qBACa,yBAA0B,SAAQ,mBAAmB;IAC3C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAG,UAAU,CAAC;IACpB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,oBAAoB,CAAC;IAEpG,IAAa,OAAO,IAAI,OAAO,CAI9B;IAED;;;;;;;;OAQG;IACY,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BtD;IAED;;;;OAIG;IACH,UAAmB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAIpD;CACH"}

package/lib/command/hydranium-glsp-command-stack.js

@@ -15,13 +15,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DefaultCommandStack, ModelState } from '@eclipse-glsp/server';
+import { CompoundCommand, DefaultCommandStack, ModelState } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import { HydraniumTypes } from '../state/hydranium-shared-core-services.js';
+import { isCommandArray } from './hydranium-glsp-operation-command.js';
+import { HydraniumGlspRecordingCommand } from './hydranium-glsp-recording-command.js';
 /**
  * GLSP's command stack with the diagram's dirty state read from the text store:
  * dirty while any document the diagram's client session has open differs from
- * its file, as the store last knew the file. Undo and redo are GLSP's.
+ * its file, as the store last knew the file. Undo and redo are GLSP's; a
+ * command whose every write was dropped is not pushed.
  *
  * GLSP's own answer counts the diagram's commands since its last save, so it
  * misses every change the diagram did not make: another client's unsaved edit
@@ -37,6 +40,41 @@ let HydraniumGlspCommandStack = class HydraniumGlspCommandStack extends DefaultC
         const clientId = this.modelState.clientId;
         return textDocuments.openDocuments().some(open => open.clients.includes(clientId) && textDocuments.isDirty(open.uri));
     }
+    /**
+     * Lifted from `@eclipse-glsp/server` 2.7.0's `DefaultCommandStack.execute`,
+     * pushing no entry for a recording command executed outside an operation
+     * whose write was dropped, or a `CompoundCommand` of only such commands at
+     * any depth: its undo would do nothing, and the user's next undo would be
+     * spent on it. A compound that also changed something is pushed, warning
+     * that its undo step leaves out what was dropped. The accompanying test
+     * pins upstream's source.
+     */
+    async execute(command) {
+        try {
+            await command.execute();
+        }
+        catch (error) {
+            this.handleError(error);
+        }
+        const leaves = leavesOf(command);
+        const dropped = leaves.filter(leaf => leaf instanceof HydraniumGlspRecordingCommand && leaf.dropped).length;
+        if (dropped > 0 && dropped === leaves.length) {
+            return;
+        }
+        if (dropped > 0) {
+            this.logger.warn(`${dropped} of ${leaves.length} commands of a compound executed outside an operation had their write dropped, ` +
+                'so its undo step leaves them out; execute them in one operation to write and undo them as one');
+        }
+        // Clear the command list past the top (i.e. the old redo list)
+        this.commands = this.commands.slice(0, this.top + 1);
+        this.commands.push(command);
+        ++this.top;
+        // if the saveIndex points to the old redo list we can never reach a state again
+        // where save is not necessary. => ensure that `isDirty` always returns true
+        if (this.saveIndex >= this.top) {
+            this.saveIndex = -2;
+        }
+    }
     /**
      * Lifted from `@eclipse-glsp/server` 2.7.0's `DefaultCommandStack.handleError`
      * without its `error` line: the failure is rethrown, and whoever ends it
@@ -60,4 +98,13 @@ HydraniumGlspCommandStack = __decorate([
     injectable()
 ], HydraniumGlspCommandStack);
 export { HydraniumGlspCommandStack };
+/**
+ * The commands `command` executes: itself, or a `CompoundCommand`'s children
+ * at any depth, read from GLSP's protected `CompoundCommand.commands`, as the
+ * operation reads them.
+ */
+function leavesOf(command) {
+    const children = command instanceof CompoundCommand ? Reflect.get(command, 'commands') : undefined;
+    return isCommandArray(children) ? children.flatMap(leavesOf) : [command];
+}
 //# sourceMappingURL=hydranium-glsp-command-stack.js.map

package/lib/command/hydranium-glsp-command-stack.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-command-stack.js","sourceRoot":"","sources":["../../src/command/hydranium-glsp-command-stack.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;;;;;;;;;;AAElF,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAE5E;;;;;;;;;;GAUG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,mBAAmB;IACxB,UAAU,CAAc;IACD,cAAc,CAAwB;IAEpG,IAAa,OAAO;QACjB,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,aAAa,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC1C,OAAO,aAAa,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACzH,CAAC;IAED;;;;OAIG;IACgB,WAAW,CAAC,KAAc;QAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,MAAM,KAAK,CAAC;IACf,CAAC;CACH,CAAA;AAnByC;IAAtC,MAAM,CAAC,UAAU,CAAC;;6DAA4C;AACD;IAA7D,MAAM,CAAC,cAAc,CAAC,kBAAkB,CAAC;;iEAA0D;AAF1F,yBAAyB;IADrC,UAAU,EAAE;GACA,yBAAyB,CAoBrC"}
+{"version":3,"file":"hydranium-glsp-command-stack.js","sourceRoot":"","sources":["../../src/command/hydranium-glsp-command-stack.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;;;;;;;;;;AAElF,OAAO,EAAgB,eAAe,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEtG,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AAEtF;;;;;;;;;;;GAWG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,mBAAmB;IACxB,UAAU,CAAc;IACD,cAAc,CAAwB;IAEpG,IAAa,OAAO;QACjB,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,aAAa,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC1C,OAAO,aAAa,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACzH,CAAC;IAED;;;;;;;;OAQG;IACM,KAAK,CAAC,OAAO,CAAC,OAAgB;QACpC,IAAI,CAAC;YACF,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACvB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,YAAY,6BAA6B,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;QAC5G,IAAI,OAAO,GAAG,CAAC,IAAI,OAAO,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YAC5C,OAAO;QACV,CAAC;QACD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACb,GAAG,OAAO,OAAO,MAAM,CAAC,MAAM,iFAAiF;gBAC5G,+FAA+F,CACpG,CAAC;QACL,CAAC;QACD,+DAA+D;QAC/D,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,EAAE,IAAI,CAAC,GAAG,CAAC;QACX,gFAAgF;QAChF,4EAA4E;QAC5E,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;QACvB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACgB,WAAW,CAAC,KAAc;QAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,MAAM,KAAK,CAAC;IACf,CAAC;CACH,CAAA;AAxDyC;IAAtC,MAAM,CAAC,UAAU,CAAC;;6DAA4C;AACD;IAA7D,MAAM,CAAC,cAAc,CAAC,kBAAkB,CAAC;;iEAA0D;AAF1F,yBAAyB;IADrC,UAAU,EAAE;GACA,yBAAyB,CAyDrC;;AAED;;;;GAIG;AACH,SAAS,QAAQ,CAAC,OAAgB;IAC/B,MAAM,QAAQ,GAAY,OAAO,YAAY,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5G,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAC5E,CAAC"}

package/lib/command/hydranium-glsp-operation-command.d.ts

@@ -44,6 +44,7 @@ export interface OperationInternals {
     recordWrittenRoot(root: AstNode): void;
     recordDropped(current: AstNode | undefined): void;
     recordExecuted(step: OperationSideEffect): void;
+    isUndoingOrRedoing(): boolean;
     assertNotDuringUndoRedo(label: string): void;
     amendBefore(update: (before: AnyObject) => AnyObject): void;
 }
@@ -55,6 +56,21 @@ export interface OperationInternals {
 export declare function workingUriOfCopy(node: AstNode): string | undefined;
 /** The operation open on `state`, executing, undoing or redoing its side effects; `undefined` between operations. */
 export declare function openOperationOf(state: object): OperationInternals | undefined;
+/**
+ * How many operations an undo or redo skipped and applied, as one command-stack
+ * entry, a compound executed outside an operation, can undo several.
+ */
+export interface UndoRedoTally {
+    skipped: number;
+    applied: number;
+}
+/**
+ * The operations undone or redone on `state` since the last call, skipped and
+ * applied, for the handler that ran the undo or redo to tell the client: GLSP's
+ * command stack takes no answer from an undo, and moves past a skipped one as
+ * past any other.
+ */
+export declare function takeUndoRedoTally(state: object): UndoRedoTally;
 /** Run `operation` as {@link HydraniumGlspOperationCommand} describes. */
 export declare function runOperation<TSourceModel extends AnyObject>(operation: HydraniumGlspOperationCommand<TSourceModel>, create: () => MaybePromise<Command | undefined>): Promise<OperationOutcome>;
 /**
@@ -187,8 +203,9 @@ export declare class HydraniumGlspOperationCommand<TSourceModel extends AnyObjec
     /**
      * Resolve the transition onto the current model, run the commands' side
      * effects, then write once, gated on the versions the model was read at. A
-     * collision does nothing but warn; a transition with nothing left to apply,
-     * or one the model already holds, still runs the side effects.
+     * collision does nothing but warn; a transition with nothing left to
+     * apply, or one the model already holds, still runs the side effects. Either
+     * way the outcome is counted for {@link takeUndoRedoTally}.
      *
      * The caller holds `runExclusive`, which nothing here takes again.
      */
@@ -247,4 +264,6 @@ export declare class HydraniumGlspOperationCommand<TSourceModel extends AnyObjec
      */
     protected rebuildWorkingMultiReferences(working: AstNode): void;
 }
+/** Whether `value` is a list of commands, as a `CompoundCommand` holds its children. */
+export declare function isCommandArray(value: unknown): value is Command[];
 //# sourceMappingURL=hydranium-glsp-operation-command.d.ts.map

package/lib/command/hydranium-glsp-operation-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-operation-command.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-operation-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hydranium-glsp-operation-command.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-operation-command.ts"],"names":[],"mappings":"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"}

package/lib/command/hydranium-glsp-operation-command.js

@@ -26,6 +26,27 @@ const openOperations = new WeakMap();
 export function openOperationOf(state) {
     return openOperations.get(state);
 }
+/** The tally of each state's undo or redo, until {@link takeUndoRedoTally} reads it. */
+const undoRedoTallies = new WeakMap();
+function tallyOf(state) {
+    let tally = undoRedoTallies.get(state);
+    if (!tally) {
+        tally = { skipped: 0, applied: 0 };
+        undoRedoTallies.set(state, tally);
+    }
+    return tally;
+}
+/**
+ * The operations undone or redone on `state` since the last call, skipped and
+ * applied, for the handler that ran the undo or redo to tell the client: GLSP's
+ * command stack takes no answer from an undo, and moves past a skipped one as
+ * past any other.
+ */
+export function takeUndoRedoTally(state) {
+    const tally = undoRedoTallies.get(state) ?? { skipped: 0, applied: 0 };
+    undoRedoTallies.delete(state);
+    return tally;
+}
 /** Run `operation` as {@link HydraniumGlspOperationCommand} describes. */
 export function runOperation(operation, create) {
     return membersOf(operation).run(create);
@@ -110,6 +131,7 @@ export class HydraniumGlspOperationCommand {
                     this.before = update(this.before);
                 }
             },
+            isUndoingOrRedoing: () => this.undoingOrRedoing,
             assertNotDuringUndoRedo: label => {
                 if (this.undoingOrRedoing) {
                     throw new Error(`Recording command '${label}' executed during an undo or redo, which writes only the recorded transition, ` +
@@ -319,8 +341,9 @@ export class HydraniumGlspOperationCommand {
     /**
      * Resolve the transition onto the current model, run the commands' side
      * effects, then write once, gated on the versions the model was read at. A
-     * collision does nothing but warn; a transition with nothing left to apply,
-     * or one the model already holds, still runs the side effects.
+     * collision does nothing but warn; a transition with nothing left to
+     * apply, or one the model already holds, still runs the side effects. Either
+     * way the outcome is counted for {@link takeUndoRedoTally}.
      *
      * The caller holds `runExclusive`, which nothing here takes again.
      */
@@ -341,10 +364,12 @@ export class HydraniumGlspOperationCommand {
             }
             else if (outcome.status !== 'no-op' && outcome.status !== 'already-applied') {
                 this.modelState.logger.warn(`${direction === 'undo' ? 'Undo' : 'Redo'} of an operation skipped (${outcome.status}); a foreign edit changed a shared field`);
+                tallyOf(this.modelState).skipped++;
                 return;
             }
         }
         await this.undoOrRedoSideEffects(direction, merged);
+        tallyOf(this.modelState).applied++;
     }
     /**
      * Write `model` once through the state's write path, gated on the versions
@@ -485,7 +510,8 @@ export class HydraniumGlspOperationCommand {
         }
     }
 }
-function isCommandArray(value) {
+/** Whether `value` is a list of commands, as a `CompoundCommand` holds its children. */
+export function isCommandArray(value) {
     return Array.isArray(value) && value.every(element => typeof element === 'object' && element !== null && 'execute' in element);
 }
 //# sourceMappingURL=hydranium-glsp-operation-command.js.map

package/lib/command/hydranium-glsp-operation-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-operation-command.js","sourceRoot":"","sources":["../../src/command/hydranium-glsp-operation-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hydranium-glsp-operation-command.js","sourceRoot":"","sources":["../../src/command/hydranium-glsp-operation-command.ts"],"names":[],"mappings":"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"}

package/lib/command/hydranium-glsp-recording-command.d.ts

@@ -49,6 +49,13 @@ export declare class HydraniumGlspRecordingCommand<TSourceModel extends AnyObjec
     protected modelState: HydraniumGlspRecordingState<TSourceModel>;
     /** The operation this command opened, when it executed outside one. */
     protected ownOperation?: HydraniumGlspOperationCommand<TSourceModel>;
+    /** Backing field for {@link dropped}. */
+    protected _dropped: boolean;
+    /**
+     * Whether the operation this command opened, executing outside one, had its
+     * write dropped: the command changed nothing, and its undo does nothing.
+     */
+    get dropped(): boolean;
     constructor(modelState: HydraniumGlspRecordingState<TSourceModel>, 
     /** Human-readable label for the operation; appears in the timing-pair log line. */
     label: string, doExecute: () => MaybePromise<void>, 

package/lib/command/hydranium-glsp-recording-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-recording-command.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAC5F,OAAO,EAAE,6BAA6B,EAAiC,MAAM,uCAAuC,CAAC;AAErH;;;;;;;;;GASG;AACH,MAAM,MAAM,2BAA2B,CAAC,YAAY,SAAS,SAAS,IAAI,0BAA0B,CAAC,OAAO,EAAE,YAAY,CAAC,GACxH,cAAc,CAAC,YAAY,CAAC,CAAC;AAEhC;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,SAAS,CAAE,SAAQ,oBAAoB,CAAC,YAAY,CAAC;IAQ/G,mFAAmF;IACnF,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAEhC;uEACmE;IACnE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IACxD,0DAA0D;IAC1D,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAd3D,UAAkB,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC,CAAC;IAExE,uEAAuE;IACvE,SAAS,CAAC,YAAY,CAAC,EAAE,6BAA6B,CAAC,YAAY,CAAC,CAAC;IAErE,YACG,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC;IACrD,mFAAmF;IAChE,KAAK,EAAE,MAAM,EAChC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IACnC;uEACmE;IAChD,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC,aAAA;IACxD,0DAA0D;IACvC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC,aAAA,EAG1D;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CActC;IAED,sFAAsF;IACtF,UAAmB,UAAU,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI,CAE3D;IAED;;;OAGG;IACY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAInC;IAED,8DAA8D;IAC/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAInC;CACH"}
+{"version":3,"file":"hydranium-glsp-recording-command.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAC5F,OAAO,EAAE,6BAA6B,EAAiC,MAAM,uCAAuC,CAAC;AAErH;;;;;;;;;GASG;AACH,MAAM,MAAM,2BAA2B,CAAC,YAAY,SAAS,SAAS,IAAI,0BAA0B,CAAC,OAAO,EAAE,YAAY,CAAC,GACxH,cAAc,CAAC,YAAY,CAAC,CAAC;AAEhC;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,SAAS,CAAE,SAAQ,oBAAoB,CAAC,YAAY,CAAC;IAmB/G,mFAAmF;IACnF,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAEhC;uEACmE;IACnE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IACxD,0DAA0D;IAC1D,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAzB3D,UAAkB,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC,CAAC;IAExE,uEAAuE;IACvE,SAAS,CAAC,YAAY,CAAC,EAAE,6BAA6B,CAAC,YAAY,CAAC,CAAC;IAErE,yCAAyC;IACzC,SAAS,CAAC,QAAQ,UAAS;IAE3B;;;OAGG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,YACG,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC;IACrD,mFAAmF;IAChE,KAAK,EAAE,MAAM,EAChC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IACnC;uEACmE;IAChD,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC,aAAA;IACxD,0DAA0D;IACvC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC,aAAA,EAG1D;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAgBtC;IAED,sFAAsF;IACtF,UAAmB,UAAU,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI,CAE3D;IAED;;;OAGG;IACY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAInC;IAED,8DAA8D;IAC/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAInC;CACH"}

package/lib/command/hydranium-glsp-recording-command.js

@@ -31,6 +31,15 @@ export class HydraniumGlspRecordingCommand extends JsonRecordingCommand {
     redoAction;
     /** The operation this command opened, when it executed outside one. */
     ownOperation;
+    /** Backing field for {@link dropped}. */
+    _dropped = false;
+    /**
+     * Whether the operation this command opened, executing outside one, had its
+     * write dropped: the command changed nothing, and its undo does nothing.
+     */
+    get dropped() {
+        return this._dropped;
+    }
     constructor(modelState, 
     /** Human-readable label for the operation; appears in the timing-pair log line. */
     label, doExecute, 
@@ -48,7 +57,9 @@ export class HydraniumGlspRecordingCommand extends JsonRecordingCommand {
         const open = openOperationOf(this.modelState);
         if (!open) {
             const operation = new HydraniumGlspOperationCommand(this.modelState);
-            if ((await this.modelState.runExclusive(() => runOperation(operation, () => this))) === 'executed') {
+            const outcome = await this.modelState.runExclusive(() => runOperation(operation, () => this));
+            this._dropped = outcome === 'dropped';
+            if (outcome === 'executed') {
                 this.ownOperation = operation;
             }
             return;

package/lib/command/hydranium-glsp-recording-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-recording-command.js","sourceRoot":"","sources":["../../src/command/hydranium-glsp-recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAuC,oBAAoB,EAAqB,MAAM,sBAAsB,CAAC;AAGpH,OAAO,EAAE,6BAA6B,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAerH;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAO,6BAA8D,SAAQ,oBAAkC;IAS5F,KAAK;IAIL,UAAU;IAEV,UAAU;IAZhC,uEAAuE;IAC7D,YAAY,CAA+C;IAErE,YACG,UAAqD;IACrD,mFAAmF;IAChE,KAAa,EAChC,SAAmC;IACnC;uEACmE;IAChD,UAAqC;IACxD,0DAA0D;IACvC,UAAqC;QAExD,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;qBARV,KAAK;0BAIL,UAAU;0BAEV,UAAU;IAGhC,CAAC;IAEQ,KAAK,CAAC,OAAO;QACnB,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;YACT,MAAM,SAAS,GAAG,IAAI,6BAA6B,CAAe,IAAI,CAAC,UAAU,CAAC,CAAC;YACnF,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;gBAClG,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YACjC,CAAC;YACD,OAAO;QACV,CAAC;QACD,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC3E,MAAM,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,KAAK,oBAAoB,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC;QACrF,MAAM,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,KAAK,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7F,CAAC;IAED,sFAAsF;IACnE,UAAU,CAAC,SAAuB;QAClD,4BAA4B;IAC/B,CAAC;IAED;;;OAGG;IACM,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;QACnC,CAAC;IACJ,CAAC;IAED,8DAA8D;IACrD,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;QACnC,CAAC;IACJ,CAAC;CACH"}
+{"version":3,"file":"hydranium-glsp-recording-command.js","sourceRoot":"","sources":["../../src/command/hydranium-glsp-recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAuC,oBAAoB,EAAqB,MAAM,sBAAsB,CAAC;AAGpH,OAAO,EAAE,6BAA6B,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAerH;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAO,6BAA8D,SAAQ,oBAAkC;IAoB5F,KAAK;IAIL,UAAU;IAEV,UAAU;IAvBhC,uEAAuE;IAC7D,YAAY,CAA+C;IAErE,yCAAyC;IAC/B,QAAQ,GAAG,KAAK,CAAC;IAE3B;;;OAGG;IACH,IAAI,OAAO;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC;IACxB,CAAC;IAED,YACG,UAAqD;IACrD,mFAAmF;IAChE,KAAa,EAChC,SAAmC;IACnC;uEACmE;IAChD,UAAqC;IACxD,0DAA0D;IACvC,UAAqC;QAExD,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;qBARV,KAAK;0BAIL,UAAU;0BAEV,UAAU;IAGhC,CAAC;IAEQ,KAAK,CAAC,OAAO;QACnB,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;YACT,MAAM,SAAS,GAAG,IAAI,6BAA6B,CAAe,IAAI,CAAC,UAAU,CAAC,CAAC;YACnF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9F,IAAI,CAAC,QAAQ,GAAG,OAAO,KAAK,SAAS,CAAC;YACtC,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;gBAC1B,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YACjC,CAAC;YACD,OAAO;QACV,CAAC;QACD,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC3E,MAAM,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,KAAK,oBAAoB,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC;QACrF,MAAM,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,KAAK,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7F,CAAC;IAED,sFAAsF;IACnE,UAAU,CAAC,SAAuB;QAClD,4BAA4B;IAC/B,CAAC;IAED;;;OAGG;IACM,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;QACnC,CAAC;IACJ,CAAC;IAED,8DAA8D;IACrD,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;QACnC,CAAC;IACJ,CAAC;CACH"}

package/lib/command/hydranium-glsp-undo-redo-action-handler.d.ts

@@ -6,18 +6,75 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { type Action, UndoRedoActionHandler } from '@eclipse-glsp/server';
+import { type Action, Logger, MessageAction, UndoRedoActionHandler } from '@eclipse-glsp/server';
+import { type ServerSharedServices } from '@hydranium/core';
 import { type AstNode } from '@hydranium/langium';
+import { type MessageDefinition } from '@hydranium/protocol';
 import { type AbstractHydraniumGlspState } from '../state/abstract-hydranium-glsp-state.js';
+import { type UndoRedoDirection } from './hydranium-glsp-operation-command.js';
+/** An undo did nothing: another editor has since changed a field it would restore. */
+export declare const DIAGRAM_UNDO_SKIPPED: MessageDefinition<"Nothing was undone: another editor has since changed what this undo would restore.">;
+/** A redo did nothing: another editor has since changed a field it would reapply. */
+export declare const DIAGRAM_REDO_SKIPPED: MessageDefinition<"Nothing was redone: another editor has since changed what this redo would reapply.">;
+/**
+ * Part of an undo did nothing: of the operations one undo step undoes, as a
+ * compound executed outside an operation does, another editor has since
+ * changed a field some would restore, and the rest were undone.
+ */
+export declare const DIAGRAM_UNDO_PARTLY_SKIPPED: MessageDefinition<"Part of this undo was not applied: another editor has since changed some of what it would restore.">;
+/** Part of a redo did nothing, as {@link DIAGRAM_UNDO_PARTLY_SKIPPED} describes for an undo. */
+export declare const DIAGRAM_REDO_PARTLY_SKIPPED: MessageDefinition<"Part of this redo was not applied: another editor has since changed some of what it would reapply.">;
+/**
+ * An undo failed because another editor changed a field it writes while it
+ * ran. GLSP clears the undo history on every failed undo or redo, so the
+ * message says so: the next undo otherwise does nothing, unexplained.
+ */
+export declare const DIAGRAM_UNDO_FAILED: MessageDefinition<"Could not undo: another editor changed the same element meanwhile. The undo and redo history of this diagram was cleared.">;
+/** A redo failed as {@link DIAGRAM_UNDO_FAILED} describes for an undo. */
+export declare const DIAGRAM_REDO_FAILED: MessageDefinition<"Could not redo: another editor changed the same element meanwhile. The undo and redo history of this diagram was cleared.">;
+/**
+ * An undo failed for a reason of its own, a side effect that threw, say, and
+ * GLSP cleared the history as it does on every failed undo or redo. The
+ * reason goes in the message's details; the log has it in full.
+ */
+export declare const DIAGRAM_UNDO_ERROR: MessageDefinition<"Could not undo: an error occurred. The undo and redo history of this diagram was cleared.">;
+/** A redo failed as {@link DIAGRAM_UNDO_ERROR} describes for an undo. */
+export declare const DIAGRAM_REDO_ERROR: MessageDefinition<"Could not redo: an error occurred. The undo and redo history of this diagram was cleared.">;
 /**
  * GLSP's undo and redo handler inside the state's `runExclusive`. GLSP's
  * command stack moves its position before it undoes or redoes the entry, so
  * the boundary covers the whole action: taken around the undo or redo alone,
  * an undo arriving while an operation runs would move the position past an
  * entry it then cannot undo.
+ *
+ * An undo or redo a foreign edit skipped, whole or in part, tells the client,
+ * which otherwise sees nothing happen. One that fails ends here, as a message saying the
+ * history was cleared in place of GLSP's generic notice for a failed action:
+ * a dropped or conflicting one says another editor changed the element, and
+ * any but a dropped one, which its reconcile has logged, is logged here.
  */
 export declare class HydraniumGlspUndoRedoActionHandler extends UndoRedoActionHandler {
     protected readonly modelState: AbstractHydraniumGlspState<AstNode, unknown>;
+    protected readonly sharedServices: ServerSharedServices;
+    protected readonly logger: Logger;
     execute(action: Action): Promise<Action[]>;
+    protected undo(): Promise<Action[]>;
+    protected redo(): Promise<Action[]>;
+    /**
+     * Lifted from `@eclipse-glsp/server` 2.7.0's `UndoRedoActionHandler.undo`
+     * and `redo`, telling the client of a skip and ending a failure of the
+     * command stack's undo or redo, which flushes the history on any failure.
+     * A failed submit after it leaves the history whole and fails as upstream.
+     * The accompanying test pins upstream's source.
+     */
+    protected undoOrRedo(direction: UndoRedoDirection): Promise<Action[]>;
+    /**
+     * The message for an undo or redo that failed, logging a failure its
+     * reconcile has not. A conflict thrown rather than dropped, by a state that
+     * does not reconcile or a reconcile that could not read the text, is the
+     * same foreign edit as a dropped write and is told as one.
+     */
+    protected failure(direction: UndoRedoDirection, error: unknown): MessageAction;
+    protected render(message: MessageDefinition<string>): string;
 }
 //# sourceMappingURL=hydranium-glsp-undo-redo-action-handler.d.ts.map

package/lib/command/hydranium-glsp-undo-redo-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-undo-redo-action-handler.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-undo-redo-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,MAAM,EAAc,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAE5F;;;;;;GAMG;AACH,qBACa,kCAAmC,SAAQ,qBAAqB;IACtD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAG,0BAA0B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAExF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAElD;CACH"}
+{"version":3,"file":"hydranium-glsp-undo-redo-action-handler.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-undo-redo-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,aAAa,EAAsC,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACrI,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,iBAAiB,EAAiD,MAAM,qBAAqB,CAAC;AAE5G,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAG5F,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,uCAAuC,CAAC;AAElG,sFAAsF;AACtF,eAAO,MAAM,oBAAoB,yGAGhC,CAAC;AAEF,qFAAqF;AACrF,eAAO,MAAM,oBAAoB,yGAGhC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,yHAGvC,CAAC;AAEF,gGAAgG;AAChG,eAAO,MAAM,2BAA2B,yHAGvC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,gJAG/B,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,mBAAmB,gJAG/B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,gHAG9B,CAAC;AAEF,yEAAyE;AACzE,eAAO,MAAM,kBAAkB,gHAG9B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,qBACa,kCAAmC,SAAQ,qBAAqB;IACtD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAG,0BAA0B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,oBAAoB,CAAC;IACpF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAElD;IAED,UAAmB,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAE3C;IAED,UAAmB,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAE3C;IAED;;;;;;OAMG;IACH,UAAgB,UAAU,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA0B1E;IAED;;;;;OAKG;IACH,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,GAAG,aAAa,CAiB7E;IAED,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG,MAAM,CAE3D;CACH"}

package/lib/command/hydranium-glsp-undo-redo-action-handler.js

@@ -15,25 +15,140 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { ModelState, UndoRedoActionHandler } from '@eclipse-glsp/server';
+import { Logger, MessageAction, ModelState, RedoAction, UndoAction, UndoRedoActionHandler } from '@eclipse-glsp/server';
+import { defineMessage, describeError, isConflictError } from '@hydranium/protocol';
 import { inject, injectable } from 'inversify';
+import { HydraniumTypes } from '../state/hydranium-shared-core-services.js';
+import { isDiagramEditDroppedError, logActionFailure } from './diagram-edit-dropped-error.js';
+import { takeUndoRedoTally } from './hydranium-glsp-operation-command.js';
+/** An undo did nothing: another editor has since changed a field it would restore. */
+export const DIAGRAM_UNDO_SKIPPED = defineMessage('hydranium/glsp-server/diagram-undo-skipped', 'Nothing was undone: another editor has since changed what this undo would restore.');
+/** A redo did nothing: another editor has since changed a field it would reapply. */
+export const DIAGRAM_REDO_SKIPPED = defineMessage('hydranium/glsp-server/diagram-redo-skipped', 'Nothing was redone: another editor has since changed what this redo would reapply.');
+/**
+ * Part of an undo did nothing: of the operations one undo step undoes, as a
+ * compound executed outside an operation does, another editor has since
+ * changed a field some would restore, and the rest were undone.
+ */
+export const DIAGRAM_UNDO_PARTLY_SKIPPED = defineMessage('hydranium/glsp-server/diagram-undo-partly-skipped', 'Part of this undo was not applied: another editor has since changed some of what it would restore.');
+/** Part of a redo did nothing, as {@link DIAGRAM_UNDO_PARTLY_SKIPPED} describes for an undo. */
+export const DIAGRAM_REDO_PARTLY_SKIPPED = defineMessage('hydranium/glsp-server/diagram-redo-partly-skipped', 'Part of this redo was not applied: another editor has since changed some of what it would reapply.');
+/**
+ * An undo failed because another editor changed a field it writes while it
+ * ran. GLSP clears the undo history on every failed undo or redo, so the
+ * message says so: the next undo otherwise does nothing, unexplained.
+ */
+export const DIAGRAM_UNDO_FAILED = defineMessage('hydranium/glsp-server/diagram-undo-failed', 'Could not undo: another editor changed the same element meanwhile. The undo and redo history of this diagram was cleared.');
+/** A redo failed as {@link DIAGRAM_UNDO_FAILED} describes for an undo. */
+export const DIAGRAM_REDO_FAILED = defineMessage('hydranium/glsp-server/diagram-redo-failed', 'Could not redo: another editor changed the same element meanwhile. The undo and redo history of this diagram was cleared.');
+/**
+ * An undo failed for a reason of its own, a side effect that threw, say, and
+ * GLSP cleared the history as it does on every failed undo or redo. The
+ * reason goes in the message's details; the log has it in full.
+ */
+export const DIAGRAM_UNDO_ERROR = defineMessage('hydranium/glsp-server/diagram-undo-error', 'Could not undo: an error occurred. The undo and redo history of this diagram was cleared.');
+/** A redo failed as {@link DIAGRAM_UNDO_ERROR} describes for an undo. */
+export const DIAGRAM_REDO_ERROR = defineMessage('hydranium/glsp-server/diagram-redo-error', 'Could not redo: an error occurred. The undo and redo history of this diagram was cleared.');
 /**
  * GLSP's undo and redo handler inside the state's `runExclusive`. GLSP's
  * command stack moves its position before it undoes or redoes the entry, so
  * the boundary covers the whole action: taken around the undo or redo alone,
  * an undo arriving while an operation runs would move the position past an
  * entry it then cannot undo.
+ *
+ * An undo or redo a foreign edit skipped, whole or in part, tells the client,
+ * which otherwise sees nothing happen. One that fails ends here, as a message saying the
+ * history was cleared in place of GLSP's generic notice for a failed action:
+ * a dropped or conflicting one says another editor changed the element, and
+ * any but a dropped one, which its reconcile has logged, is logged here.
  */
 let HydraniumGlspUndoRedoActionHandler = class HydraniumGlspUndoRedoActionHandler extends UndoRedoActionHandler {
     modelState;
+    sharedServices;
+    logger;
     execute(action) {
         return this.modelState.runExclusive(() => super.execute(action));
     }
+    undo() {
+        return this.undoOrRedo('undo');
+    }
+    redo() {
+        return this.undoOrRedo('redo');
+    }
+    /**
+     * Lifted from `@eclipse-glsp/server` 2.7.0's `UndoRedoActionHandler.undo`
+     * and `redo`, telling the client of a skip and ending a failure of the
+     * command stack's undo or redo, which flushes the history on any failure.
+     * A failed submit after it leaves the history whole and fails as upstream.
+     * The accompanying test pins upstream's source.
+     */
+    async undoOrRedo(direction) {
+        const undo = direction === 'undo';
+        if (!(undo ? this.commandStack.canUndo() : this.commandStack.canRedo())) {
+            return [];
+        }
+        // A tally no handler read, as of an undo whose submit failed or that ran outside this handler, is not this one's.
+        takeUndoRedoTally(this.modelState);
+        try {
+            await (undo ? this.commandStack.undo() : this.commandStack.redo());
+        }
+        catch (error) {
+            return [this.failure(direction, error)];
+        }
+        const actions = await this.modelSubmissionHandler.submitModel(direction);
+        const { skipped, applied } = takeUndoRedoTally(this.modelState);
+        if (skipped === 0) {
+            return actions;
+        }
+        const message = applied === 0
+            ? undo
+                ? DIAGRAM_UNDO_SKIPPED
+                : DIAGRAM_REDO_SKIPPED
+            : undo
+                ? DIAGRAM_UNDO_PARTLY_SKIPPED
+                : DIAGRAM_REDO_PARTLY_SKIPPED;
+        return [MessageAction.create(this.render(message), { severity: 'WARNING' }), ...actions];
+    }
+    /**
+     * The message for an undo or redo that failed, logging a failure its
+     * reconcile has not. A conflict thrown rather than dropped, by a state that
+     * does not reconcile or a reconcile that could not read the text, is the
+     * same foreign edit as a dropped write and is told as one.
+     */
+    failure(direction, error) {
+        const undo = direction === 'undo';
+        if (isDiagramEditDroppedError(error)) {
+            return MessageAction.create(this.render(undo ? DIAGRAM_UNDO_FAILED : DIAGRAM_REDO_FAILED), { severity: 'ERROR' });
+        }
+        logActionFailure(this.logger, undo ? UndoAction.create() : RedoAction.create(), error);
+        if (isConflictError(error)) {
+            // The conflict's own message names the document, which the details carry.
+            return MessageAction.create(this.render(undo ? DIAGRAM_UNDO_FAILED : DIAGRAM_REDO_FAILED), {
+                severity: 'ERROR',
+                details: describeError(error)
+            });
+        }
+        return MessageAction.create(this.render(undo ? DIAGRAM_UNDO_ERROR : DIAGRAM_REDO_ERROR), {
+            severity: 'ERROR',
+            details: describeError(error)
+        });
+    }
+    render(message) {
+        return this.sharedServices.MessageRenderer.renderMessage(message);
+    }
 };
 __decorate([
     inject(ModelState),
     __metadata("design:type", Function)
 ], HydraniumGlspUndoRedoActionHandler.prototype, "modelState", void 0);
+__decorate([
+    inject(HydraniumTypes.SharedCoreServices),
+    __metadata("design:type", Object)
+], HydraniumGlspUndoRedoActionHandler.prototype, "sharedServices", void 0);
+__decorate([
+    inject(Logger),
+    __metadata("design:type", Logger)
+], HydraniumGlspUndoRedoActionHandler.prototype, "logger", void 0);
 HydraniumGlspUndoRedoActionHandler = __decorate([
     injectable()
 ], HydraniumGlspUndoRedoActionHandler);