shmup/colabbd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix suppression flag timing with counter instead of boolean

Browse source
This commit is contained in:
Jared Miller 2026-01-27 16:18:15 -05:00
parent 73ee70c52a
commit 7b81777d9d
Signed by: shmup
GPG key ID: 22B5C6D66A38B06C
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adapters/vim/bridge.ts
View file

@ -9,7 +9,7 @@ const DAEMON_URL = process.env.COLLABD_URL || "ws://localhost:4040/ws";
let ws: WebSocket | null = null; let ws: WebSocket | null = null;
let doc: Y.Doc | null = null; let doc: Y.Doc | null = null;
let text: Y.Text | null = null; let text: Y.Text | null = null;
let suppressLocal = false; let suppressLocal = 0;
function send(msg: object) { function send(msg: object) {
console.log(JSON.stringify(msg)); console.log(JSON.stringify(msg));
@ -24,7 +24,7 @@ function connect(roomName: string) {
// when remote changes come in, notify vim // when remote changes come in, notify vim
text.observe(() => { text.observe(() => {
if (!suppressLocal) { if (suppressLocal === 0) {
send({ type: "content", text: text?.toString() || "" }); send({ type: "content", text: text?.toString() || "" });
} }
}); });
@ -43,12 +43,12 @@ function connect(roomName: string) {
case "update": { case "update": {
if (!doc) break; if (!doc) break;
try { try {
suppressLocal = true; suppressLocal++;
Y.applyUpdate(doc, new Uint8Array(msg.data)); Y.applyUpdate(doc, new Uint8Array(msg.data));
suppressLocal = false; suppressLocal--;
send({ type: "content", text: text?.toString() || "" }); send({ type: "content", text: text?.toString() || "" });
} catch (err) { } catch (err) {
suppressLocal = false; suppressLocal--;
console.error("failed to apply yjs update:", err); console.error("failed to apply yjs update:", err);
send({ type: "error", message: "failed to apply remote update" }); send({ type: "error", message: "failed to apply remote update" });
} }