Merge branch dev into published

Author: PEZ

CHANGELOG.md

@@ -4,10 +4,13 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.486] - 2025-02-16
+
+- Fix: [Rewrapping to or from a Set introduces imbalance](https://github.com/BetterThanTomorrow/calva/issues/2726)
+
 ## [2.0.485] - 2025-01-27
 
-- Fix: [Stop considering a clj-kondo config as a valid project to start LSP processes](https://github.com/
-BetterThanTomorrow/calva/issues/2712)
+- Fix: [Stop considering a clj-kondo config as a valid project to start LSP processes](https://github.com/BetterThanTomorrow/calva/issues/2712)
 - Bump deps.clj to v1.12.0.1495-2
 
 ## [2.0.484] - 2025-01-26

package-lock.json

@@ -3,7 +3,7 @@
   "displayName": "Calva: Clojure & ClojureScript Interactive Programming",
   "description": "Integrated REPL, formatter, Paredit, and more. Powered by cider-nrepl and clojure-lsp.",
   "icon": "assets/calva.png",
-  "version": "2.0.485",
+  "version": "2.0.486",
   "publisher": "betterthantomorrow",
   "author": {
     "name": "Better Than Tomorrow",
@@ -848,7 +848,7 @@
           },
           "calva.enableJSCompletions": {
             "type": "boolean",
-            "description": "Should Calva use suitible and bring you JavaScript completions? This is an experimental cider-nrepl feature. Disable if completions start to throw errors.",
+            "description": "Should Calva use suitable and bring you JavaScript completions? This is an experimental cider-nrepl feature. Disable if completions start to throw errors.",
             "default": true
           },
           "calva.autoOpenREPLWindow": {
@@ -863,7 +863,7 @@
           },
           "calva.autoOpenResultOutputDestination": {
             "type": "boolean",
-            "markdownDescription": "Automatically open the the Jack-in Terminal on Jack-in or Connect.",
+            "markdownDescription": "Automatically open the the result output destination on Jack-in or Connect.",
             "default": true
           },
           "calva.autoOpenInspector": {

package.json

@@ -287,6 +287,57 @@ export interface EditableDocument {
   getSelectionText: () => string;
 }
 
+// An editing transaction - array of ModelEdit - shifts the selection(s)
+// to compensate for insertions or deletions to their left.
+// Here we predict how edits will affect selections.
+const selectionsAfterEdits = (function () {
+  const decodeChangeRange = function (edit): [any, any] {
+    return [edit.args[0], edit.args[2].length - (edit.args[1] - edit.args[0])];
+  };
+  const decodeDeleteRange = function (edit): [any, any] {
+    return [edit.args[0], 0 - edit.args[1]];
+  };
+  const decodeInsertString = function (edit): [any, any] {
+    return [edit.args[0] + edit.args[1].length, edit.args[1].length];
+  };
+  const bump = function (n, [point, delta]) {
+    return n != undefined ? (n > point ? n + delta : n) : undefined;
+  };
+  return function (edits, selections: ModelEditSelection[]) {
+    // The ModelEdit array is in order by end-of-doc to start.
+    // Traverse it, bumping selections
+    // according to the growth or shrinkage of each edit.
+    let monotonicallyDecreasing = -1; // check edit order
+    let retSelections: ModelEditSelection[] = [...selections];
+    for (let ic = 0; ic < edits.length; ic++) {
+      const affected: [any, any] =
+        edits[ic].editFn == 'deleteRange'
+          ? decodeDeleteRange(edits[ic])
+          : edits[ic].editFn == 'changeRange'
+          ? decodeChangeRange(edits[ic])
+          : decodeInsertString(edits[ic]);
+      const [point, delta] = affected;
+      if (monotonicallyDecreasing != -1 && point >= monotonicallyDecreasing) {
+        console.error(
+          'Edits not back-to-front. Inference of resulting selection might be inaccurate'
+        ); // TBD take the time to sort? or should commands emit edits in back-to-front order?
+      }
+      monotonicallyDecreasing = point;
+      if (delta != 0) {
+        retSelections = retSelections.map(function (s: ModelEditSelection) {
+          return new ModelEditSelection(
+            bump(s.end, affected),
+            bump(s.active, affected),
+            bump(s.start, affected),
+            bump(s.end, affected)
+          );
+        });
+      }
+    }
+    return retSelections;
+  };
+})();
+
 /** The underlying model for the REPL readline. */
 export class LineInputModel implements EditableModel {
   /** How many characters in the line endings of the text of this model? */
@@ -536,8 +587,12 @@ export class LineInputModel implements EditableModel {
   edit(edits: ModelEdit<ModelEditFunction>[], options: ModelEditOptions): Thenable<boolean> {
     return new Promise((resolve, reject) => {
       this.editTextNow(edits, options);
-      if (this.document && options.selections) {
-        this.document.selections = options.selections;
+      if (this.document) {
+        if (options.selections) {
+          this.document.selections = options.selections;
+        } else {
+          this.document.selections = selectionsAfterEdits(edits, this.document.selections);
+        }
       }
       resolve(true);
     });

src/cursor-doc/model.ts

@@ -708,8 +708,7 @@ export async function wrapSexpr(
  * - For each cursor, find the offsets/ranges for its containing list's open/close tokens.
  * - Make 2 ModelEdits for each token's replacement +  1 Selection; record the offset change.
  * - Dedupe each edit (as multi cursors could be in the same list).
- * - Then, reposition the edits and selections by the preceding edits' offset changes.
- * - Finally, apply the edits and update the selections.
+ * - Finally, apply the edits.
  *
  * @param doc
  * @param open
@@ -723,37 +722,23 @@ export function rewrapSexpr(
   close: string,
   selections = [doc.selections[0]]
 ) {
-  const edits: { type: 'open' | 'close'; change: number; edit: ModelEdit<'changeRange'> }[] = [],
-    newSelections = _.clone(selections).map((s) => ({ selection: s, change: 0 }));
+  const edits: ModelEdit<'changeRange'>[] = [];
 
   selections.forEach((sel, index) => {
     const { active } = sel;
     const cursor = doc.getTokenCursor(active);
     if (cursor.backwardList()) {
       cursor.backwardUpList();
-      const oldOpenStart = cursor.offsetStart;
+      const openStart = cursor.offsetStart;
       const oldOpenLength = cursor.getToken().raw.length;
-      const oldOpenEnd = oldOpenStart + oldOpenLength;
+      const oldOpenEnd = openStart + oldOpenLength;
       if (cursor.forwardSexp()) {
-        const oldCloseStart = cursor.offsetStart - close.length;
-        const oldCloseEnd = cursor.offsetStart;
-        const openChange = open.length - oldOpenLength;
+        const closeStart = cursor.offsetStart - close.length;
+        const closeEnd = cursor.offsetStart;
         edits.push(
-          {
-            edit: new ModelEdit('changeRange', [oldCloseStart, oldCloseEnd, close]),
-            change: 0,
-            type: 'close',
-          },
-          {
-            edit: new ModelEdit('changeRange', [oldOpenStart, oldOpenEnd, open]),
-            change: openChange,
-            type: 'open',
-          }
+          new ModelEdit('changeRange', [closeStart, closeEnd, close]),
+          new ModelEdit('changeRange', [openStart, oldOpenEnd, open])
         );
-        newSelections[index] = {
-          selection: new ModelEditSelection(active),
-          change: openChange,
-        };
       }
     }
   });
@@ -762,39 +747,12 @@ export function rewrapSexpr(
   // the same lists, which will result in attempting to delete the same ranges twice. So we dedupe.
   const uniqEdits = _.uniqWith(edits, _.isEqual);
 
-  // for both edits and new selections, get the offset by which to move each based on prior edits
-  function getOffset(cursorOffset: number) {
-    return _(uniqEdits)
-      .filter((x) => {
-        const [xStart] = x.edit.args;
-        return xStart < cursorOffset;
-      })
-      .map(({ change }) => change)
-      .sum();
-  }
-
+  // edit needs the ModelEdit array in order from end-of-doc to start
   const editsToApply = _(uniqEdits)
-    // First, importantly, sort by list open char offset
-    .sortBy((e) => e.edit.args[0])
-    // now, let's iterate thru each cursor and adjust their positions if earlier chars are delete/added
-    .map((e) => {
-      const [oldStart, oldEnd, text] = e.edit.args;
-      const offset = getOffset(oldStart);
-      const newStart = oldStart + offset;
-      const newEnd = oldEnd + offset;
-      return { ...e.edit, args: [newStart, newEnd, text] as const };
-    })
+    .sortBy((e) => -e.args[0])
     .value();
-  const selectionsToApply = newSelections.map(({ selection }) => {
-    const { active } = selection;
-    const newSel = selection.clone();
-    const offset = getOffset(active);
-    newSel.reposition(offset);
-    return newSel;
-  });
-
   return doc.model.edit(editsToApply, {
-    selections: selectionsToApply,
+    //skipFormat: selections.length > 1, // reformat-as-you-type works with only 1 selection
   });
 }