@monaco-neovim-wasm/lib 0.1.9 → 0.1.10

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

@@ -12,8 +12,8 @@ class U {
     if (t instanceof Uint8Array ? e = t : t instanceof ArrayBuffer || t instanceof SharedArrayBuffer ? e = new Uint8Array(t) : e = new Uint8Array(t), !e.byteLength) return !0;
     const i = Atomics.load(this.ctrl, 0), s = Atomics.load(this.ctrl, 1), n = s >= i ? s - i : this.capacity - (i - s), r = this.capacity - n - 1;
     if (e.byteLength > r) return !1;
-    const a = this.capacity - s;
-    return e.byteLength <= a ? (this.data.set(e, s), Atomics.store(this.ctrl, 1, (s + e.byteLength) % this.capacity)) : (this.data.set(e.subarray(0, a), s), this.data.set(e.subarray(a), 0), Atomics.store(this.ctrl, 1, e.byteLength - a)), Atomics.notify(this.ctrl, 1), !0;
+    const l = this.capacity - s;
+    return e.byteLength <= l ? (this.data.set(e, s), Atomics.store(this.ctrl, 1, (s + e.byteLength) % this.capacity)) : (this.data.set(e.subarray(0, l), s), this.data.set(e.subarray(l), 0), Atomics.store(this.ctrl, 1, e.byteLength - l)), Atomics.notify(this.ctrl, 1), !0;
   }
 }
 const R = 262144;
@@ -167,7 +167,7 @@ class te {
     return this.workerExitCode;
   }
   async start(t) {
-    const { cols: e, rows: i, wasmPath: s, runtimePath: n, env: r, files: a } = t;
+    const { cols: e, rows: i, wasmPath: s, runtimePath: n, env: r, files: l } = t;
     if (this.inputMode = t.inputMode ?? this.init.inputMode, this.inputMode === "shared" && !X())
       throw new Error('SharedArrayBuffer is required for inputMode="shared"; serve with COOP/COEP so crossOriginIsolated is true, or use inputMode="message" with the asyncify worker.');
     const c = this.worker;
@@ -181,7 +181,7 @@ class te {
       runtimePath: String(n ?? ""),
       inputBuffer: this.sharedInput?.buffer ?? null,
       env: r ?? void 0,
-      files: a ?? void 0
+      files: l ?? void 0
     };
     try {
       this.worker.postMessage(h, []);
@@ -221,8 +221,8 @@ class te {
         return;
       }
       if (this.workerExited) {
-        const a = this.workerExitCode;
-        s(new Error(a != null ? `nvim exited (${a})` : "nvim exited"));
+        const l = this.workerExitCode;
+        s(new Error(l != null ? `nvim exited (${l})` : "nvim exited"));
         return;
       }
       const n = this.reqId++;
@@ -308,8 +308,8 @@ class te {
     if (e === "exit") {
       const i = t, s = i.code, n = i.lastStderr;
       if (this.workerExited = !0, this.workerExitCode = s, this.pending.size) {
-        const r = n ? `: ${n.trim()}` : "", a = new Error(`nvim exited (${s})${r}`);
-        this.pending.forEach((c) => c.reject(a)), this.pending.clear();
+        const r = n ? `: ${n.trim()}` : "", l = new Error(`nvim exited (${s})${r}`);
+        this.pending.forEach((c) => c.reject(l)), this.pending.clear();
       }
       try {
         this.init.handlers.onExit?.(s, n);
@@ -360,18 +360,18 @@ class te {
       } else {
         let e = 0, i = 0;
         for (let r = this.inputQueueHead; r < this.inputQueue.length; r += 1) {
-          const a = this.inputQueue[r];
-          if (a?.byteLength) {
-            if (i > 0 && e + a.byteLength > 262144) break;
-            e += a.byteLength, i += 1;
+          const l = this.inputQueue[r];
+          if (l?.byteLength) {
+            if (i > 0 && e + l.byteLength > 262144) break;
+            e += l.byteLength, i += 1;
           }
         }
         if (i <= 0 || e <= 0) return;
         const s = new Uint8Array(e);
         let n = 0;
         for (let r = 0; r < i; r += 1) {
-          const a = this.inputQueue[this.inputQueueHead + r];
-          s.set(a, n), n += a.byteLength;
+          const l = this.inputQueue[this.inputQueueHead + r];
+          s.set(l, n), n += l.byteLength;
         }
         this.inputQueueHead += i, this.inputQueuedBytes -= e, this.postStdin(s);
       }
@@ -697,7 +697,7 @@ local function get_selections(win)
 end
 
 return get_selections(...)
-`, ae = `
+`, le = `
 local api, fn = vim.api, vim.fn
 
 local function get_visible_range(s, e)
@@ -786,7 +786,7 @@ end
 
 return run(...)
 `;
-class le {
+class ae {
   editor;
   opts;
   session = null;
@@ -1086,8 +1086,8 @@ class le {
         const r = await this.rpcCall("nvim_exec_lua", [i, s]);
         return this.execLuaAvailable = !0, r;
       } catch (r) {
-        const a = r?.message || String(r);
-        if (a.includes("Invalid method") && a.includes("nvim_exec_lua"))
+        const l = r?.message || String(r);
+        if (l.includes("Invalid method") && l.includes("nvim_exec_lua"))
           this.execLuaAvailable = !1;
         else
           throw r;
@@ -1176,8 +1176,8 @@ end)(unpack(_A))`;
   }
   computeGridSize() {
     try {
-      const t = this.editor.getLayoutInfo(), e = Math.max(0, Number(t?.contentWidth ?? t?.width ?? 0) || 0), i = Math.max(0, Number(t?.contentHeight ?? t?.height ?? 0) || 0), s = this.editor.getOption(g.editor.EditorOption.fontInfo), n = Math.max(1, Number(s?.typicalHalfwidthCharacterWidth ?? s?.maxDigitWidth ?? 0) || 0), r = Math.max(1, Number(s?.lineHeight ?? 0) || 0), a = Math.max(this.opts.minCols, Math.floor(e / n)), c = Math.max(this.opts.minRows, Math.floor(i / r));
-      if (Number.isFinite(a) && Number.isFinite(c) && a > 0 && c > 0) return { cols: a, rows: c };
+      const t = this.editor.getLayoutInfo(), e = Math.max(0, Number(t?.contentWidth ?? t?.width ?? 0) || 0), i = Math.max(0, Number(t?.contentHeight ?? t?.height ?? 0) || 0), s = this.editor.getOption(g.editor.EditorOption.fontInfo), n = Math.max(1, Number(s?.typicalHalfwidthCharacterWidth ?? s?.maxDigitWidth ?? 0) || 0), r = Math.max(1, Number(s?.lineHeight ?? 0) || 0), l = Math.max(this.opts.minCols, Math.floor(e / n)), c = Math.max(this.opts.minRows, Math.floor(i / r));
+      if (Number.isFinite(l) && Number.isFinite(c) && l > 0 && c > 0) return { cols: l, rows: c };
     } catch {
     }
     return { cols: this.opts.cols, rows: this.opts.rows };
@@ -1220,9 +1220,9 @@ end)(unpack(_A))`;
     const e = this.editor.getModel();
     if (!e) return;
     const i = this.editor.getSelection(), n = (i && !i.isEmpty() ? i.getStartPosition() : null) ?? this.editor.getPosition() ?? this.lastCursorPos ?? new g.Position(1, 1), r = String(t).split(/\r?\n/);
-    let a = n.lineNumber, c = n.column;
-    r.length <= 1 ? c += Array.from(r[0] ?? "").length : (a += r.length - 1, c = 1 + Array.from(r[r.length - 1] ?? "").length);
-    const h = e.validatePosition(new g.Position(a, c)), f = this.editor.getPosition() ?? this.lastCursorPos ?? n;
+    let l = n.lineNumber, c = n.column;
+    r.length <= 1 ? c += Array.from(r[0] ?? "").length : (l += r.length - 1, c = 1 + Array.from(r[r.length - 1] ?? "").length);
+    const h = e.validatePosition(new g.Position(l, c)), f = this.editor.getPosition() ?? this.lastCursorPos ?? n;
     this.optimisticCursorPrevPos = f, this.optimisticCursorPos = h, this.optimisticCursorUntil = (typeof performance < "u" && performance.now ? performance.now() : Date.now()) + 120, this.lastCursorPos = h, !this.compositionActive && (this.suppressCursorSync = !0, this.editor.setPosition(h), this.suppressCursorSync = !1);
   }
   positionPreedit() {
@@ -1349,7 +1349,7 @@ end)(unpack(_A))`;
             await this.execLua(this.opts.startupLua, []);
           } catch {
           }
-        const t = await this.rpcCall("nvim_get_current_buf", []), e = S(t) ?? 1;
+        const t = await this.rpcCall("nvim_get_current_buf", []), e = x(t) ?? 1;
         if (this.bufHandle = e, await this.rpcCall("nvim_buf_attach", [e, !0, {}]) !== !0) throw new Error("nvim_buf_attach failed");
         this.ensureActiveState(), this.opts.syncTabstop && this.syncTabstopFromMonaco();
         const s = await this.rpcCall("nvim_buf_get_lines", [e, 0, -1, !1]);
@@ -1359,8 +1359,8 @@ end)(unpack(_A))`;
         try {
           const r = this.ensureActiveState();
           if (r) {
-            const a = await this.rpcCall("nvim_buf_get_name", [e]);
-            r.name = typeof a == "string" ? a : "", r.name && this.buffersByName.set(r.name, e);
+            const l = await this.rpcCall("nvim_buf_get_name", [e]);
+            r.name = typeof l == "string" ? l : "", r.name && this.buffersByName.set(r.name, e);
             try {
               const c = await this.rpcCall("nvim_buf_get_option", [e, "filetype"]);
               r.filetype = typeof c == "string" ? c : "";
@@ -1435,11 +1435,11 @@ end)(unpack(_A))`;
     if (t === "monaco_cursor") {
       const [i, s] = e, n = B(this.editor, Number(i), Number(s));
       if (this.delegateInsertToMonaco) {
-        const r = this.editor.getModel(), a = r ? r.validatePosition(new g.Position(n.line, n.col)) : new g.Position(n.line, n.col);
-        this.lastCursorPos = a;
+        const r = this.editor.getModel(), l = r ? r.validatePosition(new g.Position(n.line, n.col)) : new g.Position(n.line, n.col);
+        this.lastCursorPos = l;
         return;
       }
-      this.updateCursor(n.line, n.col), I(this.lastMode) && this.scheduleVisualSelectionRefresh();
+      this.updateCursor(n.line, n.col), v(this.lastMode) && this.scheduleVisualSelectionRefresh();
       return;
     }
     if (t === "monaco_mode") {
@@ -1453,7 +1453,7 @@ end)(unpack(_A))`;
       return;
     }
     if (t === "nvim_buf_lines_event") {
-      const [i, s, n, r, a] = e, c = S(i);
+      const [i, s, n, r, l] = e, c = x(i);
       if (!c) return;
       const h = this.bufHandle != null && c === this.bufHandle ? this.ensureActiveState() : this.buffers.get(c) ?? null;
       if (!h) return;
@@ -1461,27 +1461,27 @@ end)(unpack(_A))`;
         this.pendingResyncAfterComposition = !0;
         return;
       }
-      const f = h.model, l = Number(n), u = Number(r), d = Array.isArray(a) ? a.map((p) => String(p ?? "")) : null;
-      if (f && Number.isInteger(l) && Number.isInteger(u) && l >= 0 && u >= l && d)
+      const f = h.model, a = Number(n), u = Number(r), d = Array.isArray(l) ? l.map((p) => String(p ?? "")) : null;
+      if (f && Number.isInteger(a) && Number.isInteger(u) && a >= 0 && u >= a && d)
         try {
           const p = this.bufHandle != null && c === this.bufHandle && this.editor.getModel() === f;
           if (p && this.delegateInsertToMonaco) {
-            const y = this.computeLinePatch(f, l, u, d);
+            const y = this.computeLinePatch(f, a, u, d);
             let b = !1;
             try {
               b = f.getValueInRange(y.range) === y.text;
             } catch {
             }
             if (!b) {
-              const w = typeof performance < "u" && performance.now ? performance.now() : Date.now();
-              if (h.pendingFullSync || h.pendingBufEdits.length || w < this.ignoreNvimBufLinesUntil) return;
-              this.applyLinePatchToModel(f, l, u, d);
+              const S = typeof performance < "u" && performance.now ? performance.now() : Date.now();
+              if (h.pendingFullSync || h.pendingBufEdits.length || S < this.ignoreNvimBufLinesUntil) return;
+              this.applyLinePatchToModel(f, a, u, d);
               try {
                 h.shadowLines = f.getLinesContent();
               } catch {
               }
             }
-          } else p ? this.applyLinePatch(f, l, u, d) : this.applyLinePatchToModel(f, l, u, d);
+          } else p ? this.applyLinePatch(f, a, u, d) : this.applyLinePatchToModel(f, a, u, d);
         } catch {
         }
       else
@@ -1490,9 +1490,9 @@ end)(unpack(_A))`;
           this.bufHandle != null && c === this.bufHandle && this.editor.getModel() === f ? this.applyBuffer(y) : this.setModelText(f, y);
         } catch {
         }
-      this.bufHandle != null && c === this.bufHandle && I(this.lastMode) && this.scheduleVisualSelectionRefresh();
+      this.bufHandle != null && c === this.bufHandle && v(this.lastMode) && this.scheduleVisualSelectionRefresh();
     } else if (t === "nvim_buf_detach_event") {
-      const i = S(e?.[0]);
+      const i = x(e?.[0]);
       if (i && this.buffers.has(i)) {
         const s = this.buffers.get(i);
         if (s.name && this.buffersByName.delete(s.name), s.createdModel)
@@ -1506,12 +1506,12 @@ end)(unpack(_A))`;
     } else t === "redraw" && this.handleRedraw(e);
   }
   computeLinePatch(t, e, i, s) {
-    const n = t.getLineCount(), r = Math.min(e, n), a = Math.min(i, n), c = new g.Position(n, t.getLineMaxColumn(n)), f = a >= n && s.length === 0 && r > 0 ? new g.Position(r, t.getLineMaxColumn(r)) : r < n ? new g.Position(r + 1, 1) : c, l = a < n ? new g.Position(a + 1, 1) : c;
+    const n = t.getLineCount(), r = Math.min(e, n), l = Math.min(i, n), c = new g.Position(n, t.getLineMaxColumn(n)), f = l >= n && s.length === 0 && r > 0 ? new g.Position(r, t.getLineMaxColumn(r)) : r < n ? new g.Position(r + 1, 1) : c, a = l < n ? new g.Position(l + 1, 1) : c;
     let u = s.join(`
 `);
     return e >= n && i >= n && s.length > 0 && (u = `
 ${u}`), i < n && s.length > 0 && (u += `
-`), { range: new g.Range(f.lineNumber, f.column, l.lineNumber, l.column), text: u };
+`), { range: new g.Range(f.lineNumber, f.column, a.lineNumber, a.column), text: u };
   }
   applyLinePatch(t, e, i, s) {
     const n = this.lastCursorPos ?? this.editor.getPosition() ?? new g.Position(1, 1), r = this.computeLinePatch(t, e, i, s);
@@ -1520,10 +1520,10 @@ ${u}`), i < n && s.length > 0 && (u += `
     } catch {
     }
     if (this.suppressCursorSync = !0, this.applyingFromNvim = !0, t.applyEdits([{ range: r.range, text: r.text }]), this.applyingFromNvim = !1, n && this.editor.setPosition(n), this.suppressCursorSync = !1, this.delegateInsertToMonaco) {
-      const a = this.getActiveState();
-      if (a && a.model === t)
+      const l = this.getActiveState();
+      if (l && l.model === t)
         try {
-          a.shadowLines = t.getLinesContent();
+          l.shadowLines = t.getLinesContent();
         } catch {
         }
     }
@@ -1597,7 +1597,7 @@ ${u}`), i < n && s.length > 0 && (u += `
       this.cmdlineEl.textContent = this.cmdlineTextRaw, this.cmdlineCursorByte = null;
       return;
     }
-    const e = this.cmdlineTextRaw, i = Math.max(0, Math.min(Number(t) || 0, k(e))), s = Math.max(0, Math.min(e.length, v(e, i)));
+    const e = this.cmdlineTextRaw, i = Math.max(0, Math.min(Number(t) || 0, k(e))), s = Math.max(0, Math.min(e.length, w(e, i)));
     this.cmdlineCursorByte = i, this.cmdlineEl.textContent = `${e.slice(0, s)}▏${e.slice(s)}`;
   }
   setMessage(t) {
@@ -1633,8 +1633,8 @@ ${u}`), i < n && s.length > 0 && (u += `
         n.style.padding = "2px 10px", n.style.display = "flex", n.style.gap = "10px", n.style.justifyContent = "space-between", n.style.background = i === e ? "rgba(255,255,255,0.12)" : "transparent";
         const r = document.createElement("span");
         r.textContent = s.word ?? "";
-        const a = document.createElement("span");
-        a.style.opacity = "0.7", a.textContent = s.menu ?? s.kind ?? "", n.appendChild(r), n.appendChild(a), this.popupEl.appendChild(n);
+        const l = document.createElement("span");
+        l.style.opacity = "0.7", l.textContent = s.menu ?? s.kind ?? "", n.appendChild(r), n.appendChild(l), this.popupEl.appendChild(n);
       }
       this.popupEl.style.display = "block";
     }
@@ -1662,10 +1662,10 @@ ${u}`), i < n && s.length > 0 && (u += `
       } catch {
       }
       if (i === "wrappedLine" && (e === "down" || e === "up")) {
-        const a = e === "down" ? "cursorDown" : "cursorUp";
+        const l = e === "down" ? "cursorDown" : "cursorUp";
         for (let c = 0; c < s; c += 1)
           try {
-            this.editor.trigger("monaco-neovim-wasm", a, null);
+            this.editor.trigger("monaco-neovim-wasm", l, null);
           } catch {
           }
         return !0;
@@ -1694,7 +1694,7 @@ ${u}`), i < n && s.length > 0 && (u += `
     } catch {
     }
     if (r <= 0) return !1;
-    const a = () => {
+    const l = () => {
       try {
         this.editor.revealPositionInCenterIfOutsideViewport(i);
       } catch {
@@ -1706,16 +1706,16 @@ ${u}`), i < n && s.length > 0 && (u += `
     } catch {
     }
     if (!c) {
-      a();
+      l();
       try {
         c = this.editor.getScrolledVisiblePosition(i);
       } catch {
       }
     }
     if (!c || !Number.isFinite(c.top) || !Number.isFinite(c.height)) return !1;
-    const h = this.editor.getScrollTop(), f = c.top, l = c.top + c.height, u = Math.max(0, r - n);
+    const h = this.editor.getScrollTop(), f = c.top, a = c.top + c.height, u = Math.max(0, r - n);
     let d = 0;
-    if (f < n ? d = f - n : l > u && (d = l - u), !d) return !1;
+    if (f < n ? d = f - n : a > u && (d = a - u), !d) return !1;
     try {
       this.editor.setScrollTop(Math.max(0, h + d));
     } catch {
@@ -1723,10 +1723,10 @@ ${u}`), i < n && s.length > 0 && (u += `
     return !0;
   }
   applyMonacoScroll(t) {
-    const e = typeof t.by == "string" ? t.by : "", i = typeof t.direction == "string" ? t.direction : "", s = Math.max(1, Number(t.value ?? 1) || 1), n = !!t.moveCursor, r = typeof t.cursorBy == "string" ? t.cursorBy : "wrappedLine", a = Math.max(3, this.uiRows || this.opts.rows), c = this.editor.getOption(g.editor.EditorOption.fontInfo), h = Math.max(1, Number(c?.lineHeight ?? 0) || 0), f = Math.max(1, a - 2), l = Math.max(1, Math.floor(f / 2));
+    const e = typeof t.by == "string" ? t.by : "", i = typeof t.direction == "string" ? t.direction : "", s = Math.max(1, Number(t.value ?? 1) || 1), n = !!t.moveCursor, r = typeof t.cursorBy == "string" ? t.cursorBy : "wrappedLine", l = Math.max(3, this.uiRows || this.opts.rows), c = this.editor.getOption(g.editor.EditorOption.fontInfo), h = Math.max(1, Number(c?.lineHeight ?? 0) || 0), f = Math.max(1, l - 2), a = Math.max(1, Math.floor(f / 2));
     let u = s;
     if (e === "page") u = f * s;
-    else if (e === "halfPage") u = l * s;
+    else if (e === "halfPage") u = a * s;
     else if (e === "line") u = s;
     else return !1;
     const d = i === "up" ? -1 : i === "down" ? 1 : 0;
@@ -1752,7 +1752,7 @@ ${u}`), i < n && s.length > 0 && (u += `
   applyMonacoReveal(t) {
     const e = typeof t.direction == "string" ? t.direction : "", i = !!t.resetCursor, s = this.editor.getPosition();
     if (!s) return !1;
-    const n = s.lineNumber, r = Math.max(1, this.uiRows || this.opts.rows), a = this.editor.getOption(g.editor.EditorOption.fontInfo), c = Math.max(1, Number(a?.lineHeight ?? 0) || 0);
+    const n = s.lineNumber, r = Math.max(1, this.uiRows || this.opts.rows), l = this.editor.getOption(g.editor.EditorOption.fontInfo), c = Math.max(1, Number(l?.lineHeight ?? 0) || 0);
     this.suppressCursorSync = !0;
     try {
       if (e === "top") {
@@ -1767,7 +1767,7 @@ ${u}`), i < n && s.length > 0 && (u += `
       if (i) {
         const h = this.editor.getModel();
         if (h) {
-          const f = h.getLineContent(n) ?? "", l = /\S/.exec(f), u = l ? l.index + 1 : 1, d = h.validatePosition(new g.Position(n, u));
+          const f = h.getLineContent(n) ?? "", a = /\S/.exec(f), u = a ? a.index + 1 : 1, d = h.validatePosition(new g.Position(n, u));
           this.editor.setPosition(d), this.lastCursorPos = d;
         }
       }
@@ -1788,23 +1788,23 @@ ${u}`), i < n && s.length > 0 && (u += `
     } catch {
     }
     n = Math.max(1, Math.min(n, i.getLineCount())), r = Math.max(1, Math.min(r, i.getLineCount())), r < n && (r = n);
-    let a = n;
+    let l = n;
     if (e === "top")
-      a = n + (s - 1);
+      l = n + (s - 1);
     else if (e === "middle")
-      a = Math.floor((n + r) / 2);
+      l = Math.floor((n + r) / 2);
     else if (e === "bottom")
-      a = r - (s - 1);
+      l = r - (s - 1);
     else
       return;
-    a = Math.max(n, Math.min(r, a));
-    const c = i.getLineContent(a) ?? "", h = /\S/.exec(c), f = h ? h.index + 1 : 1, l = i.validatePosition(new g.Position(a, f));
+    l = Math.max(n, Math.min(r, l));
+    const c = i.getLineContent(l) ?? "", h = /\S/.exec(c), f = h ? h.index + 1 : 1, a = i.validatePosition(new g.Position(l, f));
     this.suppressCursorSync = !0;
     try {
-      this.editor.setPosition(l);
+      this.editor.setPosition(a);
     } catch {
     }
-    this.lastCursorPos = l, this.suppressCursorSync = !1;
+    this.lastCursorPos = a, this.suppressCursorSync = !1;
   }
   syncTabstopFromMonaco() {
     const t = this.editor.getModel();
@@ -1838,17 +1838,17 @@ ${u}`), i < n && s.length > 0 && (u += `
           continue;
         }
         if (i === "cmdline_show") {
-          const r = n[0], a = Math.max(0, Number(n[1] ?? 0) || 0), c = typeof n[2] == "string" ? n[2] : "", h = typeof n[3] == "string" ? n[3] : "", f = Math.max(0, Number(n[4] ?? 0) || 0), l = h || c || "", u = " ".repeat(f), d = N(r), m = `${u}${l}${d}`;
+          const r = n[0], l = Math.max(0, Number(n[1] ?? 0) || 0), c = typeof n[2] == "string" ? n[2] : "", h = typeof n[3] == "string" ? n[3] : "", f = Math.max(0, Number(n[4] ?? 0) || 0), a = h || c || "", u = " ".repeat(f), d = N(r), m = `${u}${a}${d}`;
           this.setCmdline(m);
-          const p = k(`${u}${l}`), y = k(d);
+          const p = k(`${u}${a}`), y = k(d);
           this.cmdlineCursorOffsetBytes = p, this.cmdlineCursorContentBytes = y;
-          const b = a <= y ? this.cmdlineCursorOffsetBytes + a : a;
+          const b = l <= y ? this.cmdlineCursorOffsetBytes + l : l;
           this.setCmdlineCursor(b), this.scheduleSearchHighlightRefresh();
           continue;
         }
         if (i === "cmdline_pos") {
-          const r = Math.max(0, Number(n[0] ?? 0) || 0), a = this.cmdlineCursorOffsetBytes > 0 && r <= this.cmdlineCursorContentBytes ? this.cmdlineCursorOffsetBytes + r : r;
-          this.setCmdlineCursor(a), this.scheduleSearchHighlightRefresh();
+          const r = Math.max(0, Number(n[0] ?? 0) || 0), l = this.cmdlineCursorOffsetBytes > 0 && r <= this.cmdlineCursorContentBytes ? this.cmdlineCursorOffsetBytes + r : r;
+          this.setCmdlineCursor(l), this.scheduleSearchHighlightRefresh();
           continue;
         }
         if (i === "msg_clear") {
@@ -1856,7 +1856,7 @@ ${u}`), i < n && s.length > 0 && (u += `
           continue;
         }
         if (i === "msg_show") {
-          const r = typeof n[0] == "string" ? n[0] : "", a = n[1], c = !!n[2], h = !!n[4], f = N(a);
+          const r = typeof n[0] == "string" ? n[0] : "", l = n[1], c = !!n[2], h = !!n[4], f = N(l);
           if (r === "empty" && !f) {
             this.setMessage(null);
             continue;
@@ -1874,8 +1874,8 @@ ${u}`), i < n && s.length > 0 && (u += `
           continue;
         }
         if (i === "msg_showmode" || i === "msg_showcmd" || i === "msg_ruler") {
-          const r = n[0], a = N(r);
-          this.setMessage(a || null);
+          const r = n[0], l = N(r);
+          this.setMessage(l || null);
           continue;
         }
         if (i === "popupmenu_hide") {
@@ -1883,8 +1883,8 @@ ${u}`), i < n && s.length > 0 && (u += `
           continue;
         }
         if (i === "popupmenu_show") {
-          const r = n[0], a = Number(n[1] ?? -1), c = be(r);
-          this.setPopupmenu(c, Number.isFinite(a) ? a : -1);
+          const r = n[0], l = Number(n[1] ?? -1), c = be(r);
+          this.setPopupmenu(c, Number.isFinite(l) ? l : -1);
           continue;
         }
         if (i === "popupmenu_select") {
@@ -1902,47 +1902,59 @@ ${u}`), i < n && s.length > 0 && (u += `
   initTextInputListeners() {
     const t = this.editor.getDomNode();
     if (!t) return;
-    const e = (l) => {
+    const e = (a) => {
       try {
-        l.stopImmediatePropagation?.();
+        a.stopImmediatePropagation?.();
       } catch {
       }
       try {
-        l.stopPropagation();
+        a.stopPropagation();
       } catch {
       }
-    }, i = (l) => {
+    }, i = (a) => {
       try {
-        const u = l;
+        const u = a;
         return !u || typeof u.tagName != "string" || u.tagName !== "TEXTAREA" || !u.classList?.contains?.("inputarea") ? null : u;
       } catch {
         return null;
       }
-    }, s = (l) => {
-      if (this.compositionActive || l.isComposing || l.getModifierState?.("AltGraph")) return;
-      if (x(this.lastMode) && !this.delegateInsertToMonaco && !this.exitingInsertMode && !l.ctrlKey && !l.metaKey && typeof l.key == "string" && l.key.length === 1) {
-        const p = /^[\x20-\x7E]$/.test(l.key);
-        if (!!!(l.altKey && p)) {
-          if (!this.opts.shouldHandleKey(l)) return;
-          e(l);
+    }, s = (a) => {
+      if (this.compositionActive || a.isComposing || a.getModifierState?.("AltGraph")) return;
+      const u = this.delegateInsertToMonaco && !this.exitingInsertMode;
+      if (!u && (a.key === "Backspace" || a.key === "Delete" || a.key === "Escape")) {
+        if (!this.opts.shouldHandleKey(a)) return;
+        const p = this.opts.translateKey(a);
+        if (!p) return;
+        e(a);
+        try {
+          a.preventDefault();
+        } catch {
+        }
+        this.exitingInsertMode ? this.pendingKeysAfterExit += p : this.sendInput(p);
+        return;
+      }
+      if (M(this.lastMode) && !this.delegateInsertToMonaco && !this.exitingInsertMode && !a.ctrlKey && !a.metaKey && typeof a.key == "string" && a.key.length === 1) {
+        const p = /^[\x20-\x7E]$/.test(a.key);
+        if (!!!(a.altKey && p)) {
+          if (!this.opts.shouldHandleKey(a)) return;
+          e(a);
           return;
         }
       }
-      if (!l.ctrlKey && !l.altKey && !l.metaKey) return;
-      const u = this.modifiedKeyName(l);
-      if (!u || !this.opts.shouldHandleKey(l)) return;
-      const d = this.delegateInsertToMonaco && !this.exitingInsertMode;
-      if (this.hasExplicitModAllowlist(d)) {
-        if (!this.shouldForwardModifiedKeys(l, d)) return;
-      } else if (d || !l.ctrlKey || l.altKey || l.metaKey || u !== "f" && u !== "b" && u !== "d" && u !== "u" && u !== "e" && u !== "y" && u !== "v") return;
-      const m = this.opts.translateKey(l);
+      if (!a.ctrlKey && !a.altKey && !a.metaKey) return;
+      const d = this.modifiedKeyName(a);
+      if (!d || !this.opts.shouldHandleKey(a)) return;
+      if (this.hasExplicitModAllowlist(u)) {
+        if (!this.shouldForwardModifiedKeys(a, u)) return;
+      } else if (u || !a.ctrlKey || a.altKey || a.metaKey || d !== "f" && d !== "b" && d !== "d" && d !== "u" && d !== "e" && d !== "y" && d !== "v") return;
+      const m = this.opts.translateKey(a);
       if (m) {
-        e(l);
+        e(a);
         try {
-          l.preventDefault();
+          a.preventDefault();
         } catch {
         }
-        this.exitingInsertMode ? (this.debugLog(`keydown(capture) buffer: key=${JSON.stringify(l.key)} code=${JSON.stringify(l.code)} mods=${l.ctrlKey ? "C" : ""}${l.altKey ? "A" : ""}${l.metaKey ? "D" : ""}${l.shiftKey ? "S" : ""} -> ${m}`), this.pendingKeysAfterExit += m) : (d && this.flushPendingMonacoSync(), this.debugLog(`keydown(capture) send: key=${JSON.stringify(l.key)} code=${JSON.stringify(l.code)} mods=${l.ctrlKey ? "C" : ""}${l.altKey ? "A" : ""}${l.metaKey ? "D" : ""}${l.shiftKey ? "S" : ""} -> ${m}`), this.sendInput(m));
+        this.exitingInsertMode ? (this.debugLog(`keydown(capture) buffer: key=${JSON.stringify(a.key)} code=${JSON.stringify(a.code)} mods=${a.ctrlKey ? "C" : ""}${a.altKey ? "A" : ""}${a.metaKey ? "D" : ""}${a.shiftKey ? "S" : ""} -> ${m}`), this.pendingKeysAfterExit += m) : (u && this.flushPendingMonacoSync(), this.debugLog(`keydown(capture) send: key=${JSON.stringify(a.key)} code=${JSON.stringify(a.code)} mods=${a.ctrlKey ? "C" : ""}${a.altKey ? "A" : ""}${a.metaKey ? "D" : ""}${a.shiftKey ? "S" : ""} -> ${m}`), this.sendInput(m));
       }
     }, n = () => {
       if (this.compositionActive = !0, this.debugLog(`compositionstart delegateInsert=${this.delegateInsertToMonaco} mode=${JSON.stringify(this.lastMode)}`), this.delegateInsertToMonaco) {
@@ -1950,14 +1962,14 @@ ${u}`), i < n && s.length > 0 && (u += `
         return;
       }
       this.setPreedit("");
-    }, r = (l) => {
-      if (this.compositionActive = !1, this.setPreedit(null), this.debugLog(`compositionend delegateInsert=${this.delegateInsertToMonaco} mode=${JSON.stringify(this.lastMode)} data=${JSON.stringify(l.data ?? "")}`), this.delegateInsertToMonaco) {
+    }, r = (a) => {
+      if (this.compositionActive = !1, this.setPreedit(null), this.debugLog(`compositionend delegateInsert=${this.delegateInsertToMonaco} mode=${JSON.stringify(this.lastMode)} data=${JSON.stringify(a.data ?? "")}`), this.delegateInsertToMonaco) {
         this.scheduleCursorSyncToNvim();
         return;
       }
-      const u = l.target;
-      if (x(this.lastMode)) {
-        const d = typeof l.data == "string" ? l.data : "", m = !d && u?.value ? String(u.value) : "", p = d || m;
+      const u = a.target;
+      if (M(this.lastMode)) {
+        const d = typeof a.data == "string" ? a.data : "", m = !d && u?.value ? String(u.value) : "", p = d || m;
         p && this.sendCmdlineImeText(p);
       }
       try {
@@ -1966,17 +1978,17 @@ ${u}`), i < n && s.length > 0 && (u += `
       } catch {
       }
       this.pendingResyncAfterComposition && (this.pendingResyncAfterComposition = !1, this.scheduleResync());
-    }, a = (l) => {
+    }, l = (a) => {
       if (this.compositionActive || (this.compositionActive = !0), this.delegateInsertToMonaco) return;
-      const u = i(l.target), d = typeof l.data == "string" ? l.data : u?.value ? String(u.value) : "";
+      const u = i(a.target), d = typeof a.data == "string" ? a.data : u?.value ? String(u.value) : "";
       this.setPreedit(d || "");
-    }, c = (l) => {
-      i(l.target) && (this.delegateInsertToMonaco && !this.exitingInsertMode || e(l));
-    }, h = (l) => {
-      const u = i(l.target);
+    }, c = (a) => {
+      i(a.target) && (this.delegateInsertToMonaco && !this.exitingInsertMode || e(a));
+    }, h = (a) => {
+      const u = i(a.target);
       if (!u || this.delegateInsertToMonaco && !this.exitingInsertMode) return;
-      e(l);
-      const d = l;
+      e(a);
+      const d = a;
       if (this.ignoreNextInputEvent) {
         this.ignoreNextInputEvent = !1;
         try {
@@ -1986,7 +1998,7 @@ ${u}`), i < n && s.length > 0 && (u += `
         return;
       }
       if (!this.compositionActive) {
-        if (x(this.lastMode)) {
+        if (M(this.lastMode)) {
           const m = typeof d.data == "string" ? d.data : "", p = !m && u?.value ? String(u.value) : "", y = m || p;
           y && this.sendCmdlineImeText(y);
         }
@@ -1995,13 +2007,13 @@ ${u}`), i < n && s.length > 0 && (u += `
         } catch {
         }
       }
-    }, f = (l) => {
-      if (!i(l.target) || this.delegateInsertToMonaco && !this.exitingInsertMode) return;
-      e(l);
-      const u = l.clipboardData?.getData("text/plain") ?? "";
-      u && (l.preventDefault(), this.ignoreNextInputEvent = !0, this.pasteText(u));
+    }, f = (a) => {
+      if (!i(a.target) || this.delegateInsertToMonaco && !this.exitingInsertMode) return;
+      e(a);
+      const u = a.clipboardData?.getData("text/plain") ?? "";
+      u && (a.preventDefault(), this.ignoreNextInputEvent = !0, this.pasteText(u));
       try {
-        l.target?.value && (l.target.value = "");
+        a.target?.value && (a.target.value = "");
       } catch {
       }
     };
@@ -2012,7 +2024,7 @@ ${u}`), i < n && s.length > 0 && (u += `
       _(t, "input", h, !0),
       _(t, "paste", f, !0),
       _(t, "compositionstart", n, !0),
-      _(t, "compositionupdate", a, !0),
+      _(t, "compositionupdate", l, !0),
       _(t, "compositionend", r, !0)
     );
   }
@@ -2120,7 +2132,7 @@ ${u}`), i < n && s.length > 0 && (u += `
         } catch {
         }
         e = Math.max(1, Math.min(e, t.getLineCount())), i = Math.max(1, Math.min(i, t.getLineCount()));
-        const s = await this.execLua(ae, [e, i]);
+        const s = await this.execLua(le, [e, i]);
         this.applySearchHighlights(s, t);
       } catch {
       }
@@ -2137,7 +2149,7 @@ ${u}`), i < n && s.length > 0 && (u += `
       this.clearSearchHighlights();
       return;
     }
-    const n = Array.isArray(i.matches) ? i.matches : [], r = i.current && typeof i.current == "object" ? i.current : null, a = r && Number.isFinite(Number(r.l)) ? `${Number(r.l)}:${Number(r.s)}:${Number(r.e)}` : null, c = [], h = 2e3, f = /* @__PURE__ */ new Map(), l = (u) => {
+    const n = Array.isArray(i.matches) ? i.matches : [], r = i.current && typeof i.current == "object" ? i.current : null, l = r && Number.isFinite(Number(r.l)) ? `${Number(r.l)}:${Number(r.s)}:${Number(r.e)}` : null, c = [], h = 2e3, f = /* @__PURE__ */ new Map(), a = (u) => {
       if (f.has(u)) return f.get(u);
       const d = e.getLineContent(u) ?? "";
       return f.set(u, d), d;
@@ -2147,9 +2159,9 @@ ${u}`), i < n && s.length > 0 && (u += `
       if (!Number.isFinite(m) || !Number.isFinite(p) || !Number.isFinite(y)) continue;
       const b = m + 1;
       if (b < 1 || b > e.getLineCount()) continue;
-      const w = l(b), E = v(w, Math.max(0, p)) + 1, D = v(w, Math.max(0, y)) + 1;
+      const S = a(b), E = w(S, Math.max(0, p)) + 1, D = w(S, Math.max(0, y)) + 1;
       if (D <= E) continue;
-      const W = `${m}:${p}:${y}`, z = a && W === a ? "monaco-neovim-search-current" : "monaco-neovim-search-match";
+      const W = `${m}:${p}:${y}`, z = l && W === l ? "monaco-neovim-search-current" : "monaco-neovim-search-match";
       c.push({
         range: new g.Range(b, E, b, D),
         options: { inlineClassName: z }
@@ -2166,20 +2178,20 @@ ${u}`), i < n && s.length > 0 && (u += `
     this.ensureVisualStyle();
     const s = ge(e) === "V", n = [];
     if (s) {
-      let r = 1 / 0, a = -1 / 0;
+      let r = 1 / 0, l = -1 / 0;
       for (const c of t) {
         const h = c.getStartPosition(), f = c.getEndPosition();
-        r = Math.min(r, h.lineNumber, f.lineNumber), a = Math.max(a, h.lineNumber, f.lineNumber);
+        r = Math.min(r, h.lineNumber, f.lineNumber), l = Math.max(l, h.lineNumber, f.lineNumber);
       }
-      Number.isFinite(r) && Number.isFinite(a) && a >= r && n.push({
-        range: new g.Range(r, 1, a, 1),
+      Number.isFinite(r) && Number.isFinite(l) && l >= r && n.push({
+        range: new g.Range(r, 1, l, 1),
         options: { isWholeLine: !0, className: "monaco-neovim-visual-line" }
       });
     } else
       for (const r of t) {
-        const a = r.getStartPosition(), c = r.getEndPosition();
+        const l = r.getStartPosition(), c = r.getEndPosition();
         n.push({
-          range: g.Range.fromPositions(a, c),
+          range: g.Range.fromPositions(l, c),
           options: { inlineClassName: "monaco-neovim-visual-inline" }
         });
       }
@@ -2192,19 +2204,27 @@ ${u}`), i < n && s.length > 0 && (u += `
   applyNvimMode(t) {
     const e = typeof t == "string" ? t : "";
     if (!e || e === this.lastMode) return;
-    this.lastMode = e, x(e) && (this.ignoreNextInputEvent = !1);
-    const i = $(e) && !this.recordingRegister;
-    if (i !== this.delegateInsertToMonaco) {
-      this.delegateInsertToMonaco = i;
-      const s = this.ensureActiveState();
-      i ? (this.setPreedit(null), this.dotRepeatKeys = "", this.dotRepeatBackspaces = 0, s && (s.shadowLines = this.editor.getModel()?.getLinesContent() ?? null, s.pendingBufEdits = [], s.pendingFullSync = !1, s.pendingCursorSync = !1)) : (s && ((s.pendingBufEdits.length || s.pendingCursorSync || s.pendingFullSync) && this.flushPendingMonacoSync(), s.shadowLines = null, s.pendingBufEdits = [], s.pendingFullSync = !1, s.pendingCursorSync = !1), this.dotRepeatKeys = "", this.dotRepeatBackspaces = 0);
+    const i = this.lastMode;
+    this.lastMode = e, M(e) && (this.ignoreNextInputEvent = !1);
+    const s = $(e) && !this.recordingRegister;
+    if (s !== this.delegateInsertToMonaco) {
+      this.delegateInsertToMonaco = s;
+      const n = this.ensureActiveState();
+      s ? (this.setPreedit(null), this.dotRepeatKeys = "", this.dotRepeatBackspaces = 0, n && (n.shadowLines = this.editor.getModel()?.getLinesContent() ?? null, n.pendingBufEdits = [], n.pendingFullSync = !1, n.pendingCursorSync = !1)) : (n && ((n.pendingBufEdits.length || n.pendingCursorSync || n.pendingFullSync) && this.flushPendingMonacoSync(), n.shadowLines = null, n.pendingBufEdits = [], n.pendingFullSync = !1, n.pendingCursorSync = !1), this.dotRepeatKeys = "", this.dotRepeatBackspaces = 0);
     }
     if (this.exitingInsertMode && !$(e)) {
       this.exitInsertTimer && (clearTimeout(this.exitInsertTimer), this.exitInsertTimer = null), this.exitingInsertMode = !1;
-      const s = this.pendingKeysAfterExit;
-      this.pendingKeysAfterExit = "", s && this.sendInput(s);
+      const n = this.pendingKeysAfterExit;
+      this.pendingKeysAfterExit = "", n && this.sendInput(n);
     }
-    this.applyCursorStyle(e), this.opts.onModeChange && this.opts.onModeChange(e), this.updateVisualSelection(e), this.scheduleSearchHighlightRefresh();
+    if (this.applyCursorStyle(e), this.opts.onModeChange && this.opts.onModeChange(e), this.updateVisualSelection(e), v(i) && !v(e))
+      try {
+        const n = this.editor.getPosition() ?? this.lastCursorPos;
+        n && !this.compositionActive && (this.suppressCursorSync = !0, this.editor.setSelection(new g.Selection(n.lineNumber, n.column, n.lineNumber, n.column)), this.suppressCursorSync = !1);
+      } catch {
+        this.suppressCursorSync = !1;
+      }
+    this.scheduleSearchHighlightRefresh();
   }
   armInsertExit() {
     this.exitingInsertMode = !0, this.pendingKeysAfterExit = "", this.exitInsertTimer && (clearTimeout(this.exitInsertTimer), this.exitInsertTimer = null), this.exitInsertTimer = window.setTimeout(() => {
@@ -2282,7 +2302,7 @@ vim.opt.ei = ei
       }
       return;
     }
-    if (x(this.lastMode) && !this.compositionActive && !e.isComposing && !e.getModifierState?.("AltGraph") && !e.ctrlKey && !e.metaKey && typeof e.key == "string" && e.key.length === 1) {
+    if (M(this.lastMode) && !this.compositionActive && !e.isComposing && !e.getModifierState?.("AltGraph") && !e.ctrlKey && !e.metaKey && typeof e.key == "string" && e.key.length === 1) {
       const s = /^[\x20-\x7E]$/.test(e.key);
       if (!!!(e.altKey && s))
         return this.opts.shouldHandleKey(e), void 0;
@@ -2300,15 +2320,15 @@ vim.opt.ei = ei
   }
   handleMouse(t) {
     if (this.delegateInsertToMonaco || !this.bufHandle || !t.target?.position) return;
-    const { lineNumber: e, column: i } = t.target.position, s = this.editor.getModel(), n = Math.max(0, i - 1), r = s ? s.getLineContent(e) ?? "" : "", a = s ? C(r, n) : n;
-    this.sendNotify("nvim_win_set_cursor", [0, [e, a]]);
+    const { lineNumber: e, column: i } = t.target.position, s = this.editor.getModel(), n = Math.max(0, i - 1), r = s ? s.getLineContent(e) ?? "" : "", l = s ? C(r, n) : n;
+    this.sendNotify("nvim_win_set_cursor", [0, [e, l]]);
   }
   handleSelection(t) {
     if (this.delegateInsertToMonaco || !this.session || !this.session.isRunning() || !this.bufHandle || this.suppressCursorSync || this.compositionActive || t?.isComposing) return;
     const e = t.selection;
     if (e && t.source === "mouse") {
       if (e.isEmpty()) {
-        I(this.lastMode) && this.sendInput("<Esc>");
+        v(this.lastMode) && this.sendInput("<Esc>");
         return;
       }
       this.pendingSelection = new g.Selection(
@@ -2328,7 +2348,7 @@ vim.opt.ei = ei
     if (this.delegateInsertToMonaco || !this.session || !this.session.isRunning() || !this.bufHandle) return;
     const e = this.editor.getModel();
     if (!e) return;
-    const i = t.selectionStartLineNumber, s = Math.max(0, t.selectionStartColumn - 1), n = t.positionLineNumber, r = Math.max(0, t.positionColumn - 1), a = e.getLineContent(i) ?? "", c = e.getLineContent(n) ?? "", h = C(a, s), f = C(c, r);
+    const i = t.selectionStartLineNumber, s = Math.max(0, t.selectionStartColumn - 1), n = t.positionLineNumber, r = Math.max(0, t.positionColumn - 1), l = e.getLineContent(i) ?? "", c = e.getLineContent(n) ?? "", h = C(l, s), f = C(c, r);
     await this.execLua(`
 local api = vim.api
 local fn = vim.fn
@@ -2396,7 +2416,12 @@ api.nvim_win_set_cursor(0, { b_line, b_col0 })
     this.sendNotify("nvim_paste", [e, i, -1]);
   }
   handleMonacoModelChange(t) {
-    if (!this.delegateInsertToMonaco || this.applyingFromNvim || !this.session || !this.session.isRunning() || !this.bufHandle) return;
+    if (!this.delegateInsertToMonaco) {
+      if (this.applyingFromNvim || !this.session || !this.session.isRunning() || !this.bufHandle || this.compositionActive || t?.isComposing) return;
+      t?.changes?.length && this.scheduleResync();
+      return;
+    }
+    if (this.applyingFromNvim || !this.session || !this.session.isRunning() || !this.bufHandle) return;
     const e = this.editor.getModel();
     if (!e) return;
     const i = this.ensureActiveState();
@@ -2409,20 +2434,20 @@ api.nvim_win_set_cursor(0, { b_line, b_col0 })
       i.pendingFullSync = !0, i.pendingCursorSync = !0, i.shadowLines = e.getLinesContent(), this.scheduleFlushPendingMonacoSync();
       return;
     }
-    const s = t.changes[0], n = s.range, r = n.startLineNumber - 1, a = n.endLineNumber - 1;
-    if (r < 0 || a < 0) return;
-    if (i.shadowLines[r] == null || i.shadowLines[a] == null) {
+    const s = t.changes[0], n = s.range, r = n.startLineNumber - 1, l = n.endLineNumber - 1;
+    if (r < 0 || l < 0) return;
+    if (i.shadowLines[r] == null || i.shadowLines[l] == null) {
       i.pendingFullSync = !0, i.pendingCursorSync = !0, i.shadowLines = e.getLinesContent(), this.scheduleFlushPendingMonacoSync();
       return;
     }
-    const c = i.shadowLines[r] ?? "", h = i.shadowLines[a] ?? "", f = Math.max(0, n.startColumn - 1), l = Math.max(0, n.endColumn - 1), u = C(c, f), d = C(h, l), m = String(s.text ?? ""), p = m.length ? m.split(/\r?\n/) : [];
+    const c = i.shadowLines[r] ?? "", h = i.shadowLines[l] ?? "", f = Math.max(0, n.startColumn - 1), a = Math.max(0, n.endColumn - 1), u = C(c, f), d = C(h, a), m = String(s.text ?? ""), p = m.length ? m.split(/\r?\n/) : [];
     try {
       const b = Math.max(0, Number(s.rangeLength ?? 0) || 0);
-      r === a && !m.includes(`
+      r === l && !m.includes(`
 `) ? (b > 0 && (this.dotRepeatBackspaces += b, this.dotRepeatKeys += "<BS>".repeat(b)), m && (this.dotRepeatKeys += L(m, !0)), this.dotRepeatKeys.length > 2e4 && (this.dotRepeatKeys = "", this.dotRepeatBackspaces = 0)) : (this.dotRepeatKeys = "", this.dotRepeatBackspaces = 0);
     } catch {
     }
-    i.pendingBufEdits.push({ startRow: r, startColByte: u, endRow: a, endColByte: d, lines: p }), ye(i.shadowLines, r, f, a, l, m), i.pendingCursorSync = !0;
+    i.pendingBufEdits.push({ startRow: r, startColByte: u, endRow: l, endColByte: d, lines: p }), ye(i.shadowLines, r, f, l, a, m), i.pendingCursorSync = !0;
     const y = typeof performance < "u" && performance.now ? performance.now() : Date.now();
     this.ignoreNvimBufLinesUntil = y + Math.max(80, (this.opts.insertSyncDebounceMs || 20) * 4), this.scheduleFlushPendingMonacoSync();
   }
@@ -2473,7 +2498,7 @@ api.nvim_win_set_cursor(0, { b_line, b_col0 })
         const t = await this.rpcCall("nvim_get_api_info", []), e = Array.isArray(t) ? Number(t[0]) : NaN;
         if (!Number.isFinite(e) || e <= 0) return;
         this.nvimChannelId = e;
-        const i = this.opts.wrappedLineMotions ? "true" : "false", s = this.opts.scrollMotions ? "true" : "false", n = this.opts.syncScrolloff && this.opts.scrolloff == null ? "true" : "false", r = this.opts.hostCommands ? "true" : "false", a = `
+        const i = this.opts.wrappedLineMotions ? "true" : "false", s = this.opts.scrollMotions ? "true" : "false", n = this.opts.syncScrolloff && this.opts.scrolloff == null ? "true" : "false", r = this.opts.hostCommands ? "true" : "false", l = `
 local chan = ...
 local api = vim.api
 vim.g.monaco_neovim_wasm_chan = chan
@@ -2561,7 +2586,7 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
   filetype = (vim.bo[api.nvim_get_current_buf()] and vim.bo[api.nvim_get_current_buf()].filetype) or "",
 })
 `;
-        await this.execLua(a, [e]), this.hostAutocmdInstalled = !0;
+        await this.execLua(l, [e]), this.hostAutocmdInstalled = !0;
       } catch {
       }
   }
@@ -2594,8 +2619,8 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
       try {
         const r = await s.readFile(n);
         if (r == null) return;
-        const a = r instanceof Uint8Array ? new TextDecoder().decode(r) : String(r);
-        await this.openText({ path: n, text: a }), this.opts.status(`opened: ${n}`);
+        const l = r instanceof Uint8Array ? new TextDecoder().decode(r) : String(r);
+        await this.openText({ path: n, text: l }), this.opts.status(`opened: ${n}`);
       } catch (r) {
         this.opts.status(`edit failed: ${r?.message ?? r}`, !0);
       }
@@ -2603,21 +2628,21 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
     }
     if (e === "write" || e === "wq") {
       const n = this.editor.getModel(), r = n ? n.getValue() : "";
-      let a = typeof i.path == "string" ? String(i.path) : "";
-      if (!a)
+      let l = typeof i.path == "string" ? String(i.path) : "";
+      if (!l)
         try {
           const c = await this.rpcCall("nvim_buf_get_name", [0]);
-          typeof c == "string" && (a = c);
+          typeof c == "string" && (l = c);
         } catch {
         }
-      if (a || (a = this.opts.seedName), !s.writeFile) {
+      if (l || (l = this.opts.seedName), !s.writeFile) {
         this.opts.status("write: fileSystem.writeFile not set", !0);
         return;
       }
       try {
-        await s.writeFile(a, r);
+        await s.writeFile(l, r);
         try {
-          await this.rpcCall("nvim_buf_set_name", [0, a]);
+          await this.rpcCall("nvim_buf_set_name", [0, l]);
         } catch {
         }
         try {
@@ -2625,7 +2650,7 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
         } catch {
         }
         const c = this.getActiveState();
-        c && (c.name && c.name !== a && this.buffersByName.delete(c.name), c.name = a, this.buffersByName.set(a, c.id)), this.opts.status(`written: ${a}`), e === "wq" && this.opts.status("wq requested (provide onHostCommand to close the editor)");
+        c && (c.name && c.name !== l && this.buffersByName.delete(c.name), c.name = l, this.buffersByName.set(l, c.id)), this.opts.status(`written: ${l}`), e === "wq" && this.opts.status("wq requested (provide onHostCommand to close the editor)");
       } catch (c) {
         this.opts.status(`write failed: ${c?.message ?? c}`, !0);
       }
@@ -2648,19 +2673,19 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
         await this.rpcCall("nvim_buf_attach", [e, !1, {}]);
       } catch {
       }
-      let a = [""];
+      let l = [""];
       try {
         const u = await this.rpcCall("nvim_buf_get_lines", [e, 0, -1, !1]);
-        Array.isArray(u) && (a = u.map((d) => String(d ?? "")));
+        Array.isArray(u) && (l = u.map((d) => String(d ?? "")));
       } catch {
       }
-      const c = g.Uri.from({ scheme: "nvim", authority: "buf", path: `/${e}` }), h = a.join(`
-`), f = s && g.languages.getLanguages().some((u) => u.id === s), l = g.editor.createModel(h, f ? s : void 0, c);
+      const c = g.Uri.from({ scheme: "nvim", authority: "buf", path: `/${e}` }), h = l.join(`
+`), f = s && g.languages.getLanguages().some((u) => u.id === s), a = g.editor.createModel(h, f ? s : void 0, c);
       n = {
         id: e,
         name: i || "",
         filetype: s || "",
-        model: l,
+        model: a,
         createdModel: !0,
         shadowLines: null,
         pendingBufEdits: [],
@@ -2704,7 +2729,7 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
     if (!n)
       try {
         const r = await this.rpcCall("nvim_create_buf", [!0, !1]);
-        n = S(r) ?? Number(r);
+        n = x(r) ?? Number(r);
       } catch {
         n = null;
       }
@@ -2762,8 +2787,8 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
   updateCursor(t, e) {
     const i = this.editor.getModel(), s = Math.max(1, Number(t) || 1), n = Math.max(1, Number(e) || 1), r = i ? i.validatePosition(new g.Position(s, n)) : new g.Position(s, n);
     if (this.lastCursorPos = r, this.compositionActive) return;
-    const a = this.editor.getPosition();
-    a && a.lineNumber === r.lineNumber && a.column === r.column || (this.suppressCursorSync = !0, this.editor.setPosition(this.lastCursorPos), this.visualSelectionActive && this.editor.setSelection(new g.Selection(r.lineNumber, r.column, r.lineNumber, r.column)), this.applyScrolloff(this.lastCursorPos) || this.editor.revealPositionInCenterIfOutsideViewport(this.lastCursorPos), this.suppressCursorSync = !1), this.scheduleSearchHighlightRefresh();
+    const l = this.editor.getPosition();
+    l && l.lineNumber === r.lineNumber && l.column === r.column || (this.suppressCursorSync = !0, this.editor.setPosition(this.lastCursorPos), this.visualSelectionActive && this.editor.setSelection(new g.Selection(r.lineNumber, r.column, r.lineNumber, r.column)), this.applyScrolloff(this.lastCursorPos) || this.editor.revealPositionInCenterIfOutsideViewport(this.lastCursorPos), this.suppressCursorSync = !1), this.scheduleSearchHighlightRefresh();
   }
   scheduleCursorRefresh() {
     if (this.compositionActive || this.cursorRefreshTimer) return;
@@ -2787,8 +2812,8 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
     try {
       const e = await this.rpcCall("nvim_win_get_cursor", [0]);
       if (Array.isArray(e) && e.length >= 2) {
-        const i = Number(e[0]), s = Number(e[1]), n = B(this.editor, i, s), r = new g.Position(n.line, n.col), a = typeof performance < "u" && performance.now ? performance.now() : Date.now();
-        if (this.optimisticCursorPos && this.optimisticCursorUntil > a) {
+        const i = Number(e[0]), s = Number(e[1]), n = B(this.editor, i, s), r = new g.Position(n.line, n.col), l = typeof performance < "u" && performance.now ? performance.now() : Date.now();
+        if (this.optimisticCursorPos && this.optimisticCursorUntil > l) {
           const c = this.optimisticCursorPrevPos;
           c && r.lineNumber === c.lineNumber && r.column === c.column || r.lineNumber < this.optimisticCursorPos.lineNumber || r.lineNumber === this.optimisticCursorPos.lineNumber && r.column < this.optimisticCursorPos.column || (this.optimisticCursorPos = null, this.optimisticCursorPrevPos = null, this.optimisticCursorUntil = 0, this.updateCursor(r.lineNumber, r.column));
         } else
@@ -2814,7 +2839,7 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
     s === this.lastCursorStyle && n === this.lastCursorBlink && r === this.lastCursorWidth || (this.editor.updateOptions({ cursorStyle: s, cursorBlinking: n, cursorWidth: r }), this.lastCursorStyle = s, this.lastCursorBlink = n, this.lastCursorWidth = r);
   }
   async updateVisualSelection(t) {
-    const e = I(t), i = ++this.visualSelectionToken;
+    const e = v(t), i = ++this.visualSelectionToken;
     if (!e) {
       this.clearVisualDecorations();
       return;
@@ -2859,7 +2884,7 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
     return null;
   }
   async seedBuffer(t, e) {
-    const i = S(t);
+    const i = x(t);
     if (!i || i <= 0) return null;
     const s = e ?? this.opts.seedLines;
     if (!s || !s.length) return null;
@@ -2871,9 +2896,9 @@ vim.rpcnotify(chan, "monaco_buf_enter", {
   }
 }
 function _e(o, t = {}) {
-  return new le(o, t);
+  return new ae(o, t);
 }
-function M(o, t, e) {
+function I(o, t, e) {
   return Math.min(Math.max(o, t), e);
 }
 function k(o) {
@@ -2887,8 +2912,8 @@ function B(o, t, e) {
   const i = Math.max(1, Number(t) || 1), s = Math.max(1, (Number(e) || 0) + 1), n = o.getModel();
   if (!n)
     return { line: i, col: s };
-  const r = n.getLineCount(), a = M(i, 1, r), c = n.getLineContent(a) ?? "", h = n.getLineMaxColumn(a), f = Math.max(0, Number(e) || 0), l = v(c, f), u = M(l + 1, 1, h);
-  return { line: a, col: u };
+  const r = n.getLineCount(), l = I(i, 1, r), c = n.getLineContent(l) ?? "", h = n.getLineMaxColumn(l), f = Math.max(0, Number(e) || 0), a = w(c, f), u = I(a + 1, 1, h);
+  return { line: l, col: u };
 }
 function L(o, t = !0) {
   const e = String(o ?? "");
@@ -2901,10 +2926,10 @@ function L(o, t = !0) {
 function ce(o) {
   const t = o.key;
   if (!t || t === "Dead" || t === "Unidentified") return null;
-  const e = !!o.getModifierState?.("AltGraph"), i = o.ctrlKey && !e, s = o.altKey && !e, n = o.metaKey && !e, r = o.shiftKey, a = (l) => l === "<" ? "lt" : l, c = (l) => l === "<" ? "<lt>" : l, h = (l, u = !1) => {
+  const e = !!o.getModifierState?.("AltGraph"), i = o.ctrlKey && !e, s = o.altKey && !e, n = o.metaKey && !e, r = o.shiftKey, l = (a) => a === "<" ? "lt" : a, c = (a) => a === "<" ? "<lt>" : a, h = (a, u = !1) => {
     const d = [];
     i && d.push("C-"), u && r && d.push("S-"), s && d.push("A-"), n && d.push("D-");
-    const m = a(l);
+    const m = l(a);
     return d.length ? `<${d.join("")}${m}>` : `<${m}>`;
   };
   if (typeof o.code == "string" && o.code.startsWith("Numpad") || typeof KeyboardEvent?.DOM_KEY_LOCATION_NUMPAD == "number" && o.location === KeyboardEvent.DOM_KEY_LOCATION_NUMPAD) {
@@ -2958,7 +2983,7 @@ function ce(o) {
   if (t.length === 1) {
     if (!i && !s && !n) return c(t);
     if (t === " " && i && !s && !n) return "<Nul>";
-    const l = /^[A-Za-z]$/.test(t) ? t.toLowerCase() : t, u = a(l);
+    const a = /^[A-Za-z]$/.test(t) ? t.toLowerCase() : t, u = l(a);
     return `<${(i ? "C-" : "") + (s ? "A-" : "") + (n ? "D-" : "")}${u}>`;
   }
   return null;
@@ -2993,7 +3018,7 @@ function ue(o) {
 function he(o) {
   return o instanceof Uint8Array ? o : o instanceof ArrayBuffer ? new Uint8Array(o) : Array.isArray(o) ? new Uint8Array(o) : Number.isInteger(o) ? new Uint8Array([o & 255]) : o && o.type === "Buffer" && Array.isArray(o.data) ? new Uint8Array(o.data) : null;
 }
-function S(o) {
+function x(o) {
   if (o && typeof o == "object" && typeof o.type == "number") {
     const e = he(o.data);
     if (e) {
@@ -3004,7 +3029,7 @@ function S(o) {
   const t = Number(o);
   return Number.isInteger(t) && t > 0 ? t : null;
 }
-function v(o, t) {
+function w(o, t) {
   let e = 0, i = 0;
   const s = Math.max(0, Number(t) || 0);
   for (; e < s; ) {
@@ -3036,24 +3061,24 @@ function de(o) {
 }
 function F(o, t, e) {
   if (!t || typeof t.line != "number" || typeof t.col != "number") return null;
-  const i = o.getModel(), s = M(t.line + 1, 1, i?.getLineCount() || 1 / 0);
+  const i = o.getModel(), s = I(t.line + 1, 1, i?.getLineCount() || 1 / 0);
   if (!i) {
     const f = Math.max(1, t.col + 1);
     return { lineNumber: s, column: f + (e ? 1 : 0) };
   }
   const n = i.getLineContent(s) ?? "", r = Math.max(0, Number(t.col) || 0);
-  let a = r;
+  let l = r;
   if (e) {
-    const f = v(n, r);
+    const f = w(n, r);
     if (f < n.length) {
-      const l = n.codePointAt(f);
-      a = r + P(l ?? 0);
+      const a = n.codePointAt(f);
+      l = r + P(a ?? 0);
     }
   }
-  const c = v(n, a) + 1, h = i.getLineMaxColumn(s);
-  return { lineNumber: s, column: M(c, 1, h) };
+  const c = w(n, l) + 1, h = i.getLineMaxColumn(s);
+  return { lineNumber: s, column: I(c, 1, h) };
 }
-function I(o) {
+function v(o) {
   const t = typeof o == "string" ? o : "";
   return t.includes("v") || t.includes("V") || t.includes("") || t.includes("s") || t.includes("S") || t.includes("");
 }
@@ -3076,7 +3101,7 @@ function me(o, t) {
 function H(o, t) {
   const e = o.replace("#", "");
   if (e.length !== 6) return o;
-  const i = Math.round(M(t, 0, 1) * 255);
+  const i = Math.round(I(t, 0, 1) * 255);
   return `#${e}${i.toString(16).padStart(2, "0")}`;
 }
 function K(o) {
@@ -3098,17 +3123,17 @@ function ge(o) {
   const t = typeof o == "string" ? o : "";
   return t.length ? t[t.length - 1] : "";
 }
-function x(o) {
+function M(o) {
   const t = typeof o == "string" ? o : "";
   return t === "c" || t.startsWith("c");
 }
 function ye(o, t, e, i, s, n) {
-  const r = o[t] ?? "", a = o[i] ?? "", c = r.slice(0, Math.max(0, e)), h = a.slice(Math.max(0, s)), l = String(n ?? "").split(/\r?\n/);
+  const r = o[t] ?? "", l = o[i] ?? "", c = r.slice(0, Math.max(0, e)), h = l.slice(Math.max(0, s)), a = String(n ?? "").split(/\r?\n/);
   let u;
-  if (l.length <= 1)
-    u = [`${c}${l[0] ?? ""}${h}`];
+  if (a.length <= 1)
+    u = [`${c}${a[0] ?? ""}${h}`];
   else {
-    const d = `${c}${l[0] ?? ""}`, m = `${l[l.length - 1] ?? ""}${h}`, p = l.slice(1, -1);
+    const d = `${c}${a[0] ?? ""}`, m = `${a[a.length - 1] ?? ""}${h}`, p = a.slice(1, -1);
     u = [d, ...p, m];
   }
   o.splice(t, Math.max(0, i - t + 1), ...u);
@@ -3153,7 +3178,7 @@ function be(o) {
 }
 const Ce = new URL("./nvimWorker.js", import.meta.url), ve = new URL("./nvimWorkerAsyncify.js", import.meta.url);
 export {
-  le as MonacoNeovimClient,
+  ae as MonacoNeovimClient,
   te as NeovimWasmSession,
   _e as createMonacoNeovim,
   Ce as defaultWorkerUrl,

package/package.json

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