@monaco-neovim-wasm/lib 0.1.22 → 0.1.24

package/dist/client/monacoNeovimClient.d.ts

@@ -60,6 +60,7 @@ export declare class MonacoNeovimClient {
     private ignoreSelectionSyncUntil;
     private acceptNvimBufLinesDuringDelegatedInsertUntil;
     private pendingModePull;
+    private suppressCursorRevealUntilMs;
     private debugLog;
     private nowMs;
     private sendImeText;

package/dist/monaco-neovim-wasm.es.js

@@ -394,7 +394,7 @@ function x(n) {
 function T(n) {
   return (typeof n == "string" ? n : "").startsWith("i");
 }
-function A(n) {
+function D(n) {
   const e = typeof n == "string" ? n : "";
   return e === "c" || e.startsWith("c");
 }
@@ -415,8 +415,8 @@ function oe(n) {
       if (typeof n.editor.hasTextFocus == "function" ? !!n.editor.hasTextFocus() : !1) return !0;
       const m = l.target;
       if (m && e.contains(m)) return !0;
-      const v = t.activeElement;
-      return !!(v && e.contains(v));
+      const S = t.activeElement;
+      return !!(S && e.contains(S));
     } catch {
       return !1;
     }
@@ -445,48 +445,48 @@ function oe(n) {
         n.exitDelegatedInsertMode("<Esc>");
         return;
       }
-      const _ = l.key;
-      (_ === "ArrowLeft" || _ === "ArrowRight" || _ === "ArrowUp" || _ === "ArrowDown" || _ === "Home" || _ === "End" || _ === "PageUp" || _ === "PageDown" || _ === "Tab" || _ === "Enter") && n.setDelegatedInsertReplayPossible(!1);
+      const v = l.key;
+      (v === "ArrowLeft" || v === "ArrowRight" || v === "ArrowUp" || v === "ArrowDown" || v === "Home" || v === "End" || v === "PageUp" || v === "PageDown" || v === "Tab" || v === "Enter") && n.setDelegatedInsertReplayPossible(!1);
     }
     if (!g && (l.key === "Backspace" || l.key === "Delete" || l.key === "Escape")) {
       if (!n.shouldHandleKey(l)) return;
-      const _ = n.translateKey(l);
-      if (!_) return;
+      const v = n.translateKey(l);
+      if (!v) return;
       s(l);
       try {
         l.preventDefault();
       } catch {
       }
-      if (n.isExitingInsertMode() && _ === "<Esc>") return;
-      n.isExitingInsertMode() ? n.appendPendingKeysAfterExit(_) : (n.sendInput(_), n.scheduleCursorRefresh(), x(m) && n.scheduleVisualSelectionRefresh());
+      if (n.isExitingInsertMode() && v === "<Esc>") return;
+      n.isExitingInsertMode() ? n.appendPendingKeysAfterExit(v) : (n.sendInput(v), n.scheduleCursorRefresh(), x(m) && n.scheduleVisualSelectionRefresh());
       return;
     }
     if (!g && !n.isExitingInsertMode() && (l.key === "ArrowLeft" || l.key === "ArrowRight" || l.key === "ArrowUp" || l.key === "ArrowDown" || l.key === "Home" || l.key === "End" || l.key === "PageUp" || l.key === "PageDown")) {
       if (!n.shouldHandleKey(l)) return;
-      const _ = n.translateKey(l);
-      if (!_) return;
+      const v = n.translateKey(l);
+      if (!v) return;
       s(l);
       try {
         l.preventDefault();
       } catch {
       }
-      n.isExitingInsertMode() ? n.appendPendingKeysAfterExit(_) : (n.sendInput(_), n.scheduleCursorRefresh(), x(m) && n.scheduleVisualSelectionRefresh());
+      n.isExitingInsertMode() ? n.appendPendingKeysAfterExit(v) : (n.sendInput(v), n.scheduleCursorRefresh(), x(m) && n.scheduleVisualSelectionRefresh());
       return;
     }
-    if (A(m) && !n.isDelegateInsertToMonaco() && !n.isExitingInsertMode() && !l.ctrlKey && !l.metaKey && typeof l.key == "string" && l.key.length === 1) {
-      const _ = /^[\x20-\x7E]$/.test(l.key);
-      if (!!!(l.altKey && _)) {
+    if (D(m) && !n.isDelegateInsertToMonaco() && !n.isExitingInsertMode() && !l.ctrlKey && !l.metaKey && typeof l.key == "string" && l.key.length === 1) {
+      const v = /^[\x20-\x7E]$/.test(l.key);
+      if (!!!(l.altKey && v)) {
         if (!n.shouldHandleKey(l)) return;
         s(l);
         return;
       }
     }
     if (!l.ctrlKey && !l.altKey && !l.metaKey) return;
-    const v = n.modifiedKeyName(l);
-    if (!v || !n.shouldHandleKey(l)) return;
+    const S = n.modifiedKeyName(l);
+    if (!S || !n.shouldHandleKey(l)) return;
     if (n.hasExplicitModAllowlist(g)) {
       if (!n.shouldForwardModifiedKeys(l, g)) return;
-    } else if (g || !l.ctrlKey || l.altKey || l.metaKey || v !== "f" && v !== "b" && v !== "d" && v !== "u" && v !== "e" && v !== "y" && v !== "v") return;
+    } else if (g || !l.ctrlKey || l.altKey || l.metaKey || S !== "f" && S !== "b" && S !== "d" && S !== "u" && S !== "e" && S !== "y" && S !== "v") return;
     const C = n.translateKey(l);
     if (C) {
       s(l);
@@ -525,13 +525,13 @@ function oe(n) {
       return;
     }
     const m = o(l.target);
-    if (T(g) && !A(g)) {
-      const v = typeof l.data == "string" ? l.data : "", C = !v && m && m.tagName === "TEXTAREA" && m.value ? String(m.value) : !v && m?.textContent ? String(m.textContent) : "", _ = v || C;
-      _ && n.sendImeText(_);
+    if (T(g) && !D(g)) {
+      const S = typeof l.data == "string" ? l.data : "", C = !S && m && m.tagName === "TEXTAREA" && m.value ? String(m.value) : !S && m?.textContent ? String(m.textContent) : "", v = S || C;
+      v && n.sendImeText(v);
     }
-    if (A(g)) {
-      const v = typeof l.data == "string" ? l.data : "", C = !v && m && m.tagName === "TEXTAREA" && m.value ? String(m.value) : !v && m?.textContent ? String(m.textContent) : "", _ = v || C;
-      _ && n.sendImeText(_);
+    if (D(g)) {
+      const S = typeof l.data == "string" ? l.data : "", C = !S && m && m.tagName === "TEXTAREA" && m.value ? String(m.value) : !S && m?.textContent ? String(m.textContent) : "", v = S || C;
+      v && n.sendImeText(v);
     }
     try {
       m && m.tagName === "TEXTAREA" ? m.value = "" : m && (m.textContent = "");
@@ -567,10 +567,10 @@ function oe(n) {
       l.preventDefault?.();
     } catch {
     }
-    const v = n.getLastMode();
-    if (T(v) && !n.isCompositionActive()) {
-      const C = typeof g.inputType == "string" ? String(g.inputType) : "", _ = !!g.isComposing, I = typeof g.data == "string" ? g.data : "";
-      if (!_ && !C.includes("Composition")) {
+    const S = n.getLastMode();
+    if (T(S) && !n.isCompositionActive()) {
+      const C = typeof g.inputType == "string" ? String(g.inputType) : "", v = !!g.isComposing, I = typeof g.data == "string" ? g.data : "";
+      if (!v && !C.includes("Composition")) {
         if (C === "insertText" || C === "insertReplacementText" || C === "insertFromDrop") {
           I && (n.armIgnoreNextInputEvent(g.target, 120, I), n.sendImeText(I));
           try {
@@ -605,9 +605,9 @@ function oe(n) {
         }
       }
     }
-    if (A(v) && !n.isCompositionActive()) {
-      const C = l, _ = typeof C.data == "string" ? C.data : "", I = typeof C.inputType == "string" ? String(C.inputType) : "";
-      !C.isComposing && !I.includes("Composition") && _ && n.sendImeText(_);
+    if (D(S) && !n.isCompositionActive()) {
+      const C = l, v = typeof C.data == "string" ? C.data : "", I = typeof C.inputType == "string" ? String(C.inputType) : "";
+      !C.isComposing && !I.includes("Composition") && v && n.sendImeText(v);
     }
   }, f = (l) => {
     if (!r(l)) return;
@@ -638,13 +638,13 @@ function oe(n) {
       return;
     }
     if (n.isCompositionActive()) return;
-    const v = n.getLastMode();
-    if (T(v) && !A(v)) {
-      const C = typeof g.data == "string" ? g.data : "", _ = !C && m?.tagName === "TEXTAREA" && m.value ? String(m.value) : !C && m?.textContent ? String(m.textContent) : "", I = C || _;
+    const S = n.getLastMode();
+    if (T(S) && !D(S)) {
+      const C = typeof g.data == "string" ? g.data : "", v = !C && m?.tagName === "TEXTAREA" && m.value ? String(m.value) : !C && m?.textContent ? String(m.textContent) : "", I = C || v;
       I && (n.armIgnoreNextInputEvent(g.target, 120, I), n.sendImeText(I));
     }
-    if (A(v)) {
-      const C = typeof g.data == "string" ? g.data : "", _ = !C && m?.tagName === "TEXTAREA" && m.value ? String(m.value) : !C && m?.textContent ? String(m.textContent) : "", I = C || _;
+    if (D(S)) {
+      const C = typeof g.data == "string" ? g.data : "", v = !C && m?.tagName === "TEXTAREA" && m.value ? String(m.value) : !C && m?.textContent ? String(m.textContent) : "", I = C || v;
       I && n.sendImeText(I);
     }
     try {
@@ -662,16 +662,16 @@ function oe(n) {
     } catch {
     }
   };
-  let y = !1, S = "left", R = null, w = "", M = null;
-  const N = (l) => `${l.shiftKey ? "S" : ""}${l.ctrlKey ? "C" : ""}${l.altKey ? "A" : ""}${l.metaKey ? "D" : ""}`, D = (l) => l.button === 1 ? "middle" : l.button === 2 ? "right" : "left", L = (l) => {
+  let y = !1, _ = "left", R = null, w = "", M = null;
+  const N = (l) => `${l.shiftKey ? "S" : ""}${l.ctrlKey ? "C" : ""}${l.altKey ? "A" : ""}${l.metaKey ? "D" : ""}`, A = (l) => l.button === 1 ? "middle" : l.button === 2 ? "right" : "left", L = (l) => {
     try {
-      const v = n.editor.getTargetAtClientPoint?.(l.clientX, l.clientY)?.position;
-      return v ? new b.Position(v.lineNumber, v.column) : null;
+      const S = n.editor.getTargetAtClientPoint?.(l.clientX, l.clientY)?.position;
+      return S ? new b.Position(S.lineNumber, S.column) : null;
     } catch {
       return null;
     }
   }, B = () => {
-    M = null, y && R && (n.setIgnoreSelectionSyncUntil(n.nowMs() + 200), n.sendNvimMouse(S, "drag", w, R));
+    M = null, y && R && (n.setIgnoreSelectionSyncUntil(n.nowMs() + 200), n.sendNvimMouse(_, "drag", w, R));
   }, V = (l) => {
     if (!r(l) || n.isDelegateInsertToMonaco() && !n.isExitingInsertMode() || n.isCompositionActive() || l.isComposing || l.button !== 0 && l.button !== 1 && l.button !== 2) return;
     const g = L(l);
@@ -685,7 +685,7 @@ function oe(n) {
         n.editor.focus();
       } catch {
       }
-      y = !0, S = D(l), w = N(l), R = g, M && (clearTimeout(M), M = null), n.setIgnoreSelectionSyncUntil(n.nowMs() + 250), n.sendNvimMouse(S, "press", w, g);
+      y = !0, _ = A(l), w = N(l), R = g, M && (clearTimeout(M), M = null), n.setIgnoreSelectionSyncUntil(n.nowMs() + 250), n.sendNvimMouse(_, "press", w, g);
     }
   }, W = (l) => {
     if (!y || !r(l) || n.isDelegateInsertToMonaco() && !n.isExitingInsertMode() || n.isCompositionActive() || l.isComposing) return;
@@ -712,7 +712,7 @@ function oe(n) {
         } catch {
         }
       }
-      M && (clearTimeout(M), M = null), w = N(l), R = m, n.setIgnoreSelectionSyncUntil(n.nowMs() + 250), n.sendNvimMouse(S, "release", w, m);
+      M && (clearTimeout(M), M = null), w = N(l), R = m, n.setIgnoreSelectionSyncUntil(n.nowMs() + 250), n.sendNvimMouse(_, "release", w, m);
     }
   }, ie = (l) => {
     if (r(l) && !(n.isDelegateInsertToMonaco() && !n.isExitingInsertMode())) {
@@ -743,8 +743,8 @@ function ae(n, e, t, i, s, r) {
   if (p.length <= 1)
     f = [`${c}${p[0] ?? ""}${u}`];
   else {
-    const h = `${c}${p[0] ?? ""}`, y = `${p[p.length - 1] ?? ""}${u}`, S = p.slice(1, -1);
-    f = [h, ...S, y];
+    const h = `${c}${p[0] ?? ""}`, y = `${p[p.length - 1] ?? ""}${u}`, _ = p.slice(1, -1);
+    f = [h, ..._, y];
   }
   n.splice(e, Math.max(0, i - e + 1), ...f);
 }
@@ -831,8 +831,8 @@ class le {
       if (!this.init.getBufHandle()) return { kind: "noop" };
       if (this.init.isCompositionActive() || e?.isComposing) return { kind: "noop" };
       if (!e?.changes?.length) return { kind: "noop" };
-      const D = this.init.getSyncModelFromMonaco();
-      return D === "always" ? (this.scheduleSyncBufferToNvim(), { kind: "syncToNvimScheduled" }) : D !== "never" ? (this.scheduleResync(), { kind: "resyncScheduled" }) : { kind: "noop" };
+      const A = this.init.getSyncModelFromMonaco();
+      return A === "always" ? (this.scheduleSyncBufferToNvim(), { kind: "syncToNvimScheduled" }) : A !== "never" ? (this.scheduleResync(), { kind: "resyncScheduled" }) : { kind: "noop" };
     }
     if (this.init.isApplyingFromNvim()) return { kind: "noop" };
     if (!this.init.isSessionRunning()) return { kind: "noop" };
@@ -870,11 +870,11 @@ class le {
       }
       return this.scheduleFlushPendingMonacoSync(), { kind: "delegatedInsertPatched", resetDotRepeat: !0, resetReplayPossible: !0 };
     }
-    const u = s.shadowLines[a] ?? "", d = s.shadowLines[c] ?? "", p = Math.max(0, o.startColumn - 1), f = Math.max(0, o.endColumn - 1), h = P(u, p), y = P(d, f), S = String(r.text ?? ""), R = S.length ? S.split(/\r?\n/) : [];
-    s.pendingBufEdits.push({ startRow: a, startColByte: h, endRow: c, endColByte: y, lines: R }), ae(s.shadowLines, a, p, c, f, S), s.pendingCursorSync = !0, this.scheduleFlushPendingMonacoSync();
-    const w = Math.max(0, Number(r.rangeLength ?? 0) || 0), M = a === c && !S.includes(`
+    const u = s.shadowLines[a] ?? "", d = s.shadowLines[c] ?? "", p = Math.max(0, o.startColumn - 1), f = Math.max(0, o.endColumn - 1), h = P(u, p), y = P(d, f), _ = String(r.text ?? ""), R = _.length ? _.split(/\r?\n/) : [];
+    s.pendingBufEdits.push({ startRow: a, startColByte: h, endRow: c, endColByte: y, lines: R }), ae(s.shadowLines, a, p, c, f, _), s.pendingCursorSync = !0, this.scheduleFlushPendingMonacoSync();
+    const w = Math.max(0, Number(r.rangeLength ?? 0) || 0), M = a === c && !_.includes(`
 `);
-    return { kind: "delegatedInsertPatched", dotRepeat: { deleted: w, text: S, simple: M }, resetDotRepeat: !M };
+    return { kind: "delegatedInsertPatched", dotRepeat: { deleted: w, text: _, simple: M }, resetDotRepeat: !M };
   }
   scheduleCursorSyncToNvim() {
     if (!this.init.isDelegateInsertToMonaco() || this.init.isExitingInsertMode()) return;
@@ -951,12 +951,12 @@ class le {
         this.init.setPendingResyncAfterComposition(!0);
         return;
       }
-      const f = p.model, h = Number(a), y = Number(c), S = Array.isArray(u) ? u.map((w) => String(w ?? "")) : null;
-      if (f && Number.isInteger(h) && Number.isInteger(y) && h >= 0 && y >= h && S)
+      const f = p.model, h = Number(a), y = Number(c), _ = Array.isArray(u) ? u.map((w) => String(w ?? "")) : null;
+      if (f && Number.isInteger(h) && Number.isInteger(y) && h >= 0 && y >= h && _)
         try {
           const w = d != null && i === d && this.init.editor.getModel() === f;
           if (w && this.init.isDelegateInsertToMonaco()) {
-            const M = this.computeLinePatch(f, h, y, S);
+            const M = this.computeLinePatch(f, h, y, _);
             let N = !1;
             try {
               N = f.getValueInRange(M.range) === M.text;
@@ -971,13 +971,13 @@ class le {
                 this.scheduleResync();
                 return;
               }
-              this.applyLinePatchToModel(f, h, y, S);
+              this.applyLinePatchToModel(f, h, y, _);
               try {
                 p.shadowLines = f.getLinesContent();
               } catch {
               }
             }
-          } else w ? (this.applyLinePatch(f, h, y, S), this.init.isDelegateInsertToMonaco() || this.init.scheduleCursorRefresh()) : w ? this.applyLinePatch(f, h, y, S) : this.applyLinePatchToModel(f, h, y, S);
+          } else w ? (this.applyLinePatch(f, h, y, _), this.init.isDelegateInsertToMonaco() || this.init.scheduleCursorRefresh()) : w ? this.applyLinePatch(f, h, y, _) : this.applyLinePatchToModel(f, h, y, _);
         } catch {
         }
       else
@@ -1488,15 +1488,15 @@ class de {
       return d.set(f, h), h;
     };
     for (let f = 0; f < r.length && c.length < u; f += 1) {
-      const h = r[f], y = Number(h?.l), S = Number(h?.s), R = Number(h?.e);
-      if (!Number.isFinite(y) || !Number.isFinite(S) || !Number.isFinite(R)) continue;
+      const h = r[f], y = Number(h?.l), _ = Number(h?.s), R = Number(h?.e);
+      if (!Number.isFinite(y) || !Number.isFinite(_) || !Number.isFinite(R)) continue;
       const w = y + 1;
       if (w < 1 || w > t.getLineCount()) continue;
-      const M = p(w), N = $(M, Math.max(0, S)) + 1, D = $(M, Math.max(0, R)) + 1;
-      if (D <= N) continue;
-      const L = `${y}:${S}:${R}`, B = !!(a && L === a), V = B ? "currentFindMatch" : "findMatch", W = B ? "currentFindMatchInline" : "findMatchInline";
+      const M = p(w), N = $(M, Math.max(0, _)) + 1, A = $(M, Math.max(0, R)) + 1;
+      if (A <= N) continue;
+      const L = `${y}:${_}:${R}`, B = !!(a && L === a), V = B ? "currentFindMatch" : "findMatch", W = B ? "currentFindMatchInline" : "findMatchInline";
       c.push({
-        range: new b.Range(w, N, w, D),
+        range: new b.Range(w, N, w, A),
         options: { className: V, inlineClassName: W }
       });
     }
@@ -2091,7 +2091,7 @@ function Z(n, e, t) {
   const o = r.getLineCount(), a = G(i, 1, o), c = r.getLineContent(a) ?? "", u = r.getLineMaxColumn(a), d = Math.max(0, Number(t) || 0), p = $(c, d), f = G(p + 1, 1, u);
   return { line: a, col: f };
 }
-class _e {
+class ve {
   init;
   constructor(e) {
     this.init = e;
@@ -2106,37 +2106,37 @@ class _e {
     if (t <= 0) return !1;
     const i = e ?? this.init.editor.getPosition();
     if (!i) return !1;
-    const s = Math.max(1, Number(this.init.editor.getOption(b.editor.EditorOption.lineHeight)) || 0), r = t * s;
-    if (r <= 0) return !1;
-    let o = 0;
+    let s = 0;
     try {
       const y = this.init.editor.getLayoutInfo();
-      o = Math.max(0, Number(y?.contentHeight ?? y?.height ?? 0) || 0);
+      s = Math.max(0, Number(y?.contentHeight ?? y?.height ?? 0) || 0);
     } catch {
     }
-    if (o <= 0) return !1;
-    const a = () => {
+    if (s <= 0) return !1;
+    const r = () => {
       try {
         this.init.editor.revealPositionInCenterIfOutsideViewport(i);
       } catch {
       }
     };
-    let c = null;
+    let o = null;
     try {
-      c = this.init.editor.getScrolledVisiblePosition(i);
+      o = this.init.editor.getScrolledVisiblePosition(i);
     } catch {
     }
-    if (!c) {
-      a();
+    if (!o) {
+      r();
       try {
-        c = this.init.editor.getScrolledVisiblePosition(i);
+        o = this.init.editor.getScrolledVisiblePosition(i);
       } catch {
       }
     }
-    if (!c || !Number.isFinite(c.top) || !Number.isFinite(c.height)) return !1;
-    const u = this.init.editor.getScrollTop(), d = c.top, p = c.top + c.height, f = Math.max(0, o - r);
+    if (!o || !Number.isFinite(o.top) || !Number.isFinite(o.height)) return !1;
+    const a = Math.max(1, Number(o.height) || 0), c = t * a;
+    if (c <= 0) return !1;
+    const u = this.init.editor.getScrollTop(), d = o.top, p = o.top + o.height, f = Math.max(0, s - c);
     let h = 0;
-    if (d < r ? h = d - r : p > f && (h = p - f), !h) return !1;
+    if (d < c ? h = d - c : p > f && (h = p - f), !h) return !1;
     try {
       this.init.editor.setScrollTop(Math.max(0, u + h));
     } catch {
@@ -2177,7 +2177,7 @@ class _e {
     if (!h) return !1;
     this.init.setSuppressCursorSync(!0);
     try {
-      const S = this.init.editor.getScrollTop(), R = Math.max(0, S + h * f * u);
+      const _ = this.init.editor.getScrollTop(), R = Math.max(0, _ + h * f * u);
       this.init.editor.setScrollTop(R);
     } catch {
     }
@@ -2194,27 +2194,28 @@ class _e {
     return this.init.setSuppressCursorSync(!1), y;
   }
   applyMonacoReveal(e) {
-    const t = typeof e.direction == "string" ? e.direction : "", i = !!e.resetCursor, s = this.init.editor.getPosition();
-    if (!s) return !1;
-    const r = s.lineNumber, o = Math.max(1, this.init.getUiRows() || this.init.getDefaultRows()), a = this.init.editor.getOption(b.editor.EditorOption.fontInfo), c = Math.max(1, Number(a?.lineHeight ?? 0) || 0);
+    const t = typeof e.direction == "string" ? e.direction : "", i = !!e.resetCursor, s = this.init.editor.getPosition(), r = Number(e.line), o = Number.isFinite(r) && r > 0 ? Math.floor(r) : s?.lineNumber ?? 0;
+    if (!o) return !1;
+    const a = Math.max(1, Math.floor(Number(s?.column ?? 1) || 1)), c = Math.max(1, this.init.getUiRows() || this.init.getDefaultRows()), u = this.init.editor.getOption(b.editor.EditorOption.fontInfo), d = Math.max(1, Number(u?.lineHeight ?? 0) || 0);
     this.init.setSuppressCursorSync(!0);
     try {
       if (t === "top") {
-        const u = this.init.editor.getTopForLineNumber(r);
-        this.init.editor.setScrollTop(u);
+        const p = this.init.editor.getTopForLineNumber(o);
+        this.init.editor.setScrollTop(p);
       } else if (t === "center")
-        this.init.editor.revealLineInCenter(r);
+        this.init.editor.revealLineInCenter(o);
       else if (t === "bottom") {
-        const u = this.init.editor.getTopForLineNumber(r), d = Math.max(0, u - (o - 1) * c);
-        this.init.editor.setScrollTop(d);
+        const p = this.init.editor.getTopForLineNumber(o), f = Math.max(0, p - (c - 1) * d);
+        this.init.editor.setScrollTop(f);
       }
       if (i) {
-        const u = this.init.editor.getModel();
-        if (u) {
-          const d = u.getLineContent(r) ?? "", p = /\S/.exec(d), f = p ? p.index + 1 : 1, h = u.validatePosition(new b.Position(r, f));
-          this.init.editor.setPosition(h), this.init.setLastCursorPos(h);
+        const p = this.init.editor.getModel();
+        if (p) {
+          const f = p.getLineContent(o) ?? "", h = /\S/.exec(f), y = h ? h.index + 1 : 1, _ = p.validatePosition(new b.Position(o, y));
+          this.init.editor.setPosition(_), this.init.setLastCursorPos(_);
         }
       }
+      this.applyScrolloff(new b.Position(o, a));
     } catch {
     }
     return this.init.setSuppressCursorSync(!1), i;
@@ -2251,7 +2252,7 @@ class _e {
     this.init.setLastCursorPos(p), this.init.setSuppressCursorSync(!1);
   }
 }
-class ve {
+class _e {
   init;
   delegateInsertToMonaco = !1;
   exitingInsertMode = !1;
@@ -2503,7 +2504,7 @@ class Me {
       return;
     }
     const s = this.init.getLastMode();
-    if (A(s) && !this.init.isCompositionActive() && !t.isComposing && !t.getModifierState?.("AltGraph") && !t.ctrlKey && !t.metaKey && typeof t.key == "string" && t.key.length === 1) {
+    if (D(s) && !this.init.isCompositionActive() && !t.isComposing && !t.getModifierState?.("AltGraph") && !t.ctrlKey && !t.metaKey && typeof t.key == "string" && t.key.length === 1) {
       const u = /^[\x20-\x7E]$/.test(t.key);
       if (!!!(t.altKey && u))
         return this.init.shouldHandleKey(t), void 0;
@@ -2616,9 +2617,9 @@ class Ie {
         if (!e.seedFromMonaco) return null;
         const h = this.init.editor.getModel();
         if (!h) return null;
-        const y = h.getValue(), S = String(y ?? "").replace(/\r\n?/g, `
+        const y = h.getValue(), _ = String(y ?? "").replace(/\r\n?/g, `
 `);
-        return S ? S.split(`
+        return _ ? _.split(`
 `) : null;
       }, r = this.init.getNextSeedLines(), o = (r && r.length ? r : null) ?? (e.seedLines && e.seedLines.length ? e.seedLines : null) ?? s();
       this.init.clearNextSeedLines();
@@ -2734,7 +2735,8 @@ function! s:reveal(direction, resetCursor) abort
     endif
     return
   endif
-  call rpcnotify(g:monaco_neovim_wasm_chan, 'monaco_reveal', { 'direction': a:direction, 'resetCursor': a:resetCursor })
+  " Send the Neovim cursor line to avoid races where Monaco cursor sync is delayed.
+  call rpcnotify(g:monaco_neovim_wasm_chan, 'monaco_reveal', { 'direction': a:direction, 'resetCursor': a:resetCursor, 'line': line('.') })
 endfunction
 
 nnoremap <silent> z<CR> <Cmd>call <SID>reveal('top', v:true)<CR>
@@ -3039,7 +3041,7 @@ local function get_selections(win)
 end
 
 return get_selections(...)
-`, De = `local api, fn = vim.api, vim.fn
+`, Ae = `local api, fn = vim.api, vim.fn
 
 local function get_visible_range(s, e)
   s = tonumber(s) or 1
@@ -3128,7 +3130,7 @@ end
 return run(...)
 
 `;
-class Ae {
+class De {
   init;
   constructor(e) {
     this.init = e;
@@ -4185,6 +4187,7 @@ class dt {
   ignoreSelectionSyncUntil = 0;
   acceptNvimBufLinesDuringDelegatedInsertUntil = 0;
   pendingModePull = !1;
+  suppressCursorRevealUntilMs = 0;
   debugLog(e) {
     if (this.opts.debug)
       try {
@@ -4334,7 +4337,7 @@ class dt {
       isSessionRunning: () => !!(this.session && this.session.isRunning()),
       getBufHandle: () => this.bufHandle,
       execLua: (i, s) => this.execLua(i, s),
-      luaScript: De,
+      luaScript: Ae,
       isStagingFrame: () => this.redraw.isStagingFrame(),
       markSearchRefresh: () => this.redraw.markSearchRefresh(),
       debugLog: (i) => this.debugLog(i)
@@ -4365,7 +4368,7 @@ class dt {
         this.lastMode = i;
       },
       onModeChange: this.opts.onModeChange
-    }), this.insertDelegation = new ve({
+    }), this.insertDelegation = new _e({
       editor: this.editor,
       nowMs: () => this.nowMs(),
       debugLog: (i) => this.debugLog(i),
@@ -4383,7 +4386,7 @@ class dt {
       getBufHandle: () => this.bufHandle,
       rpcCall: (i, s) => this.rpcCall(i, s),
       sendInput: (i) => this.sendInput(i)
-    }), this.viewport = new _e({
+    }), this.viewport = new ve({
       editor: this.editor,
       getUiRows: () => this.uiRows,
       getDefaultRows: () => this.opts.rows,
@@ -4478,7 +4481,7 @@ class dt {
       sendInput: (i) => this.sendInput(i),
       scheduleCursorRefresh: () => this.scheduleCursorRefresh(),
       scheduleVisualSelectionRefresh: () => this.visualSelection.scheduleRefresh()
-    }), this.mouse = new Ae({
+    }), this.mouse = new De({
       editor: this.editor,
       isSessionRunning: () => !!(this.session && this.session.isRunning()),
       getBufHandle: () => this.bufHandle,
@@ -4695,7 +4698,7 @@ class dt {
   }
   handleNotifyMonacoReveal(e) {
     const t = e?.[0];
-    t && typeof t == "object" && this.viewport.applyMonacoReveal(t) && !this.insertDelegation.isExitingInsertMode() && this.syncCursorToNvimNow(!0);
+    t && typeof t == "object" && (this.suppressCursorRevealUntilMs = this.nowMs() + 80, this.viewport.applyMonacoReveal(t) && !this.insertDelegation.isExitingInsertMode() && this.syncCursorToNvimNow(!0));
   }
   handleNotifyMonacoMoveCursor(e) {
     const t = e?.[0];
@@ -4856,7 +4859,7 @@ class dt {
     const i = typeof e == "string" ? e : "", s = t == null ? this.nvimBlocking : !!t, r = !!(i && i !== this.lastMode), o = s !== this.nvimBlocking;
     if (!r && !o) return;
     const a = this.lastMode;
-    if (r && (this.lastMode = i, A(i) && this.inputEventDeduper.clear(), this.setMonacoHighlightsSuppressed(!1)), this.nvimBlocking = s, this.insertDelegation.applyMode(this.lastMode), r && (this.cursor.applyCursorStyle(i), this.opts.onModeChange && this.opts.onModeChange(i), this.visualSelection.updateVisualSelection(i), T(a) && !T(i) && this.scheduleCursorRefresh()), r && x(a) && !x(i))
+    if (r && (this.lastMode = i, D(i) && this.inputEventDeduper.clear(), this.setMonacoHighlightsSuppressed(!1)), this.nvimBlocking = s, this.insertDelegation.applyMode(this.lastMode), r && (this.cursor.applyCursorStyle(i), this.opts.onModeChange && this.opts.onModeChange(i), this.visualSelection.updateVisualSelection(i), T(a) && !T(i) && this.scheduleCursorRefresh()), r && x(a) && !x(i))
       try {
         const c = this.editor.getPosition() ?? this.cursor.getLastCursorPos();
         c && !this.compositionActive && (this.suppressCursorSync = !0, this.editor.setSelection(new b.Selection(c.lineNumber, c.column, c.lineNumber, c.column)), this.suppressCursorSync = !1);
@@ -4968,10 +4971,10 @@ class dt {
     if (!(c && c.lineNumber === o.lineNumber && c.column === o.column)) {
       const d = this.nowMs(), p = a || this.visualSelection.shouldKeepSelection(d, 120);
       if (x(this.lastMode) || p) {
-        this.viewport.applyScrolloff(o) || this.editor.revealPositionInCenterIfOutsideViewport(o), this.requestSearchHighlightRefresh();
+        !this.viewport.applyScrolloff(o) && d > this.suppressCursorRevealUntilMs && this.editor.revealPositionInCenterIfOutsideViewport(o), this.requestSearchHighlightRefresh();
         return;
       }
-      this.suppressCursorSync = !0, this.editor.setPosition(o), this.viewport.applyScrolloff(o) || this.editor.revealPositionInCenterIfOutsideViewport(o), this.suppressCursorSync = !1;
+      this.suppressCursorSync = !0, this.editor.setPosition(o), !this.viewport.applyScrolloff(o) && d > this.suppressCursorRevealUntilMs && this.editor.revealPositionInCenterIfOutsideViewport(o), this.suppressCursorSync = !1;
     }
     this.requestSearchHighlightRefresh();
   }
@@ -5007,7 +5010,9 @@ class dt {
         } finally {
           this.suppressCursorSync = !1;
         }
-      this.visualSelection.deactivate(), this.viewport.applyScrolloff(o) || this.editor.revealPositionInCenterIfOutsideViewport(o);
+      this.visualSelection.deactivate();
+      const f = this.viewport.applyScrolloff(o), h = this.nowMs();
+      !f && h > this.suppressCursorRevealUntilMs && this.editor.revealPositionInCenterIfOutsideViewport(o);
     }
     this.requestSearchHighlightRefresh();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monaco-neovim-wasm/lib",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "private": false,
   "type": "module",
   "description": "Core library for running Neovim (WASM) behind Monaco via msgpack-RPC.",