fix #7958 -- user setting: make it so it is an explicit user setting whether you see your own cursor

Author: williamstein

src/packages/frontend/account/editor-settings/checkboxes.tsx

@@ -83,8 +83,7 @@ const EDITOR_SETTINGS_CHECKBOXES = {
     id: "account.editor-setting.checkbox.ask_jupyter_kernel",
     defaultMessage: "ask which kernel to use for a new Jupyter Notebook",
   }),
-  show_my_other_cursors:
-    "when editing the same file in mutiple browsers, show my other cursors",
+  show_my_other_cursors: "when editing the same file in multiple browsers",
   disable_jupyter_virtualization: defineMessage({
     id: "account.editor-setting.checkbox.disable_jupyter_virtualization",
     defaultMessage:

src/packages/frontend/frame-editors/code-editor/actions.ts

@@ -1148,13 +1148,19 @@ export class Actions<
     // TODO: for now, just for the one syncstring obviously
     // TOOD: this is probably naive and slow too...
     let cursors: Map<string, List<Map<string, any>>> = Map();
-    this._syncstring.get_cursors().forEach((info, account_id) => {
-      info.get("locs").forEach((loc) => {
-        loc = loc.set("time", info.get("time"));
-        const locs = cursors.get(account_id, List()).push(loc);
-        cursors = cursors.set(account_id, locs as any);
+    this._syncstring
+      .get_cursors({
+        excludeSelf: !redux
+          .getStore("account")
+          .getIn(["editor_settings", "show_my_other_cursors"]),
+      })
+      .forEach((info, account_id) => {
+        info.get("locs").forEach((loc) => {
+          loc = loc.set("time", info.get("time"));
+          const locs = cursors.get(account_id, List()).push(loc);
+          cursors = cursors.set(account_id, locs as any);
+        });
       });
-    });
     if (!cursors.equals(this.store.get("cursors"))) {
       this.setState({ cursors });
     }
@@ -1191,7 +1197,10 @@ export class Actions<
       return;
     }
     const omit_lines: SetMap = {};
-    const cursors = this._syncstring.get_cursors?.(); // there are situations where get_cursors isn't defined (seen this).
+    const cursors = this._syncstring.get_cursors?.({
+      excludeSelf: false,
+      maxAge: 3 * 60 * 1000,
+    }); // there are situations where get_cursors isn't defined (seen this).
     if (cursors) {
       cursors.map((user, _) => {
         const locs = user.get("locs");

src/packages/frontend/jupyter/browser-actions.ts

@@ -326,7 +326,10 @@ export class JupyterActions extends JupyterActions0 {
     ) {
       return;
     }
-    const cursors = this.syncdb.get_cursors();
+    const excludeSelf = !this.redux
+      .getStore("account")
+      .getIn(["editor_settings", "show_my_other_cursors"]);
+    const cursors = this.syncdb.get_cursors({ excludeSelf });
     const cells = this.cursor_manager.process(this.store.get("cells"), cursors);
     if (cells != null) {
       this.setState({ cells });