fix: delete marker and cursor SVG elements

rachel-fenichel · rachel-fenichel · commit 834a59d03b7d · 2025-05-07T09:14:21.000-07:00
diff --git a/core/block_svg.ts b/core/block_svg.ts
@@ -1698,28 +1698,6 @@ export class BlockSvg
     if (this.nextConnection) this.nextConnection.tightenEfficiently();
   }
 
-  /**
-   * Add the cursor SVG to this block's SVG group.
-   *
-   * @param cursorSvg The SVG root of the cursor to be added to the block SVG
-   *     group.
-   * @internal
-   */
-  setCursorSvg(cursorSvg: SVGElement) {
-    this.pathObject.setCursorSvg(cursorSvg);
-  }
-
-  /**
-   * Add the marker SVG to this block's SVG group.
-   *
-   * @param markerSvg The SVG root of the marker to be added to the block SVG
-   *     group.
-   * @internal
-   */
-  setMarkerSvg(markerSvg: SVGElement) {
-    this.pathObject.setMarkerSvg(markerSvg);
-  }
-
   /**
    * Returns a bounding box describing the dimensions of this block
    * and any blocks stacked below it.
diff --git a/core/field.ts b/core/field.ts
@@ -113,18 +113,6 @@ export abstract class Field<T = any>
   private tooltip: Tooltip.TipInfo | null = null;
   protected size_: Size;
 
-  /**
-   * Holds the cursors svg element when the cursor is attached to the field.
-   * This is null if there is no cursor on the field.
-   */
-  private cursorSvg: SVGElement | null = null;
-
-  /**
-   * Holds the markers svg element when the marker is attached to the field.
-   * This is null if there is no marker on the field.
-   */
-  private markerSvg: SVGElement | null = null;
-
   /** The rendered field's SVG group element. */
   protected fieldGroup_: SVGGElement | null = null;
 
@@ -1358,44 +1346,6 @@ export abstract class Field<T = any>
     return false;
   }
 
-  /**
-   * Add the cursor SVG to this fields SVG group.
-   *
-   * @param cursorSvg The SVG root of the cursor to be added to the field group.
-   * @internal
-   */
-  setCursorSvg(cursorSvg: SVGElement) {
-    if (!cursorSvg) {
-      this.cursorSvg = null;
-      return;
-    }
-
-    if (!this.fieldGroup_) {
-      throw new Error(`The field group is ${this.fieldGroup_}.`);
-    }
-    this.fieldGroup_.appendChild(cursorSvg);
-    this.cursorSvg = cursorSvg;
-  }
-
-  /**
-   * Add the marker SVG to this fields SVG group.
-   *
-   * @param markerSvg The SVG root of the marker to be added to the field group.
-   * @internal
-   */
-  setMarkerSvg(markerSvg: SVGElement) {
-    if (!markerSvg) {
-      this.markerSvg = null;
-      return;
-    }
-
-    if (!this.fieldGroup_) {
-      throw new Error(`The field group is ${this.fieldGroup_}.`);
-    }
-    this.fieldGroup_.appendChild(markerSvg);
-    this.markerSvg = markerSvg;
-  }
-
   /** See IFocusableNode.getFocusableElement. */
   getFocusableElement(): HTMLElement | SVGElement {
     if (!this.fieldGroup_) {
diff --git a/core/flyout_button.ts b/core/flyout_button.ts
@@ -348,15 +348,6 @@ export class FlyoutButton
     }
   }
 
-  /**
-   * Required by IASTNodeLocationSvg, but not used. A marker cannot be set on a
-   * button. If the 'mark' shortcut is used on a button, its associated callback
-   * function is triggered.
-   */
-  setMarkerSvg() {
-    throw new Error('Attempted to set a marker on a button.');
-  }
-
   /**
    * Do something when the button is clicked.
    *
diff --git a/core/interfaces/i_ast_node_location_svg.ts b/core/interfaces/i_ast_node_location_svg.ts
@@ -12,17 +12,5 @@ import type {IASTNodeLocation} from './i_ast_node_location.js';
  * An AST node location SVG interface.
  */
 export interface IASTNodeLocationSvg extends IASTNodeLocation {
-  /**
-   * Add the marker SVG to this node's SVG group.
-   *
-   * @param markerSvg The SVG root of the marker to be added to the SVG group.
-   */
-  setMarkerSvg(markerSvg: SVGElement | null): void;
 
-  /**
-   * Add the cursor SVG to this node's SVG group.
-   *
-   * @param cursorSvg The SVG root of the cursor to be added to the SVG group.
-   */
-  setCursorSvg(cursorSvg: SVGElement | null): void;
 }
diff --git a/core/marker_manager.ts b/core/marker_manager.ts
@@ -25,15 +25,9 @@ export class MarkerManager {
   /** The cursor. */
   private cursor: LineCursor | null = null;
 
-  /** The cursor's SVG element. */
-  private cursorSvg: SVGElement | null = null;
-
   /** The map of markers for the workspace. */
   private markers = new Map<string, Marker>();
 
-  /** The marker's SVG element. */
-  private markerSvg: SVGElement | null = null;
-
   /**
    * @param workspace The workspace for the marker manager.
    * @internal
@@ -103,47 +97,6 @@ export class MarkerManager {
     this.cursor = cursor;
   }
 
-  /**
-   * Add the cursor SVG to this workspace SVG group.
-   *
-   * @param cursorSvg The SVG root of the cursor to be added to the workspace
-   *     SVG group.
-   * @internal
-   */
-  setCursorSvg(cursorSvg: SVGElement | null) {
-    if (!cursorSvg) {
-      this.cursorSvg = null;
-      return;
-    }
-
-    this.workspace.getBlockCanvas()!.appendChild(cursorSvg);
-    this.cursorSvg = cursorSvg;
-  }
-
-  /**
-   * Add the marker SVG to this workspaces SVG group.
-   *
-   * @param markerSvg The SVG root of the marker to be added to the workspace
-   *     SVG group.
-   * @internal
-   */
-  setMarkerSvg(markerSvg: SVGElement | null) {
-    if (!markerSvg) {
-      this.markerSvg = null;
-      return;
-    }
-
-    if (this.workspace.getBlockCanvas()) {
-      if (this.cursorSvg) {
-        this.workspace
-          .getBlockCanvas()!
-          .insertBefore(markerSvg, this.cursorSvg);
-      } else {
-        this.workspace.getBlockCanvas()!.appendChild(markerSvg);
-      }
-    }
-  }
-
   /**
    * Dispose of the marker manager.
    * Go through and delete all markers associated with this marker manager.
diff --git a/core/renderers/common/i_path_object.ts b/core/renderers/common/i_path_object.ts
@@ -30,18 +30,6 @@ export interface IPathObject {
   /** The primary path of the block. */
   style: BlockStyle;
 
-  /**
-   * Holds the cursors SVG element when the cursor is attached to the block.
-   * This is null if there is no cursor on the block.
-   */
-  cursorSvg: SVGElement | null;
-
-  /**
-   * Holds the markers SVG element when the marker is attached to the block.
-   * This is null if there is no marker on the block.
-   */
-  markerSvg: SVGElement | null;
-
   /**
    * Set the path generated by the renderer onto the respective SVG element.
    *
@@ -54,22 +42,6 @@ export interface IPathObject {
    */
   flipRTL(): void;
 
-  /**
-   * Add the cursor SVG to this block's SVG group.
-   *
-   * @param cursorSvg The SVG root of the cursor to be added to the block SVG
-   *     group.
-   */
-  setCursorSvg(cursorSvg: SVGElement): void;
-
-  /**
-   * Add the marker SVG to this block's SVG group.
-   *
-   * @param markerSvg The SVG root of the marker to be added to the block SVG
-   *     group.
-   */
-  setMarkerSvg(markerSvg: SVGElement): void;
-
   /**
    * Set whether the block shows a highlight or not.  Block highlighting is
    * often used to visually mark blocks currently being executed.
diff --git a/core/renderers/common/path_object.ts b/core/renderers/common/path_object.ts
@@ -24,18 +24,6 @@ export class PathObject implements IPathObject {
   svgRoot: SVGElement;
   svgPath: SVGElement;
 
-  /**
-   * Holds the cursors svg element when the cursor is attached to the block.
-   * This is null if there is no cursor on the block.
-   */
-  cursorSvg: SVGElement | null = null;
-
-  /**
-   * Holds the markers svg element when the marker is attached to the block.
-   * This is null if there is no marker on the block.
-   */
-  markerSvg: SVGElement | null = null;
-
   constants: ConstantProvider;
   style: BlockStyle;
 
@@ -86,42 +74,6 @@ export class PathObject implements IPathObject {
     this.svgPath.setAttribute('transform', 'scale(-1 1)');
   }
 
-  /**
-   * Add the cursor SVG to this block's SVG group.
-   *
-   * @param cursorSvg The SVG root of the cursor to be added to the block SVG
-   *     group.
-   */
-  setCursorSvg(cursorSvg: SVGElement) {
-    if (!cursorSvg) {
-      this.cursorSvg = null;
-      return;
-    }
-
-    this.svgRoot.appendChild(cursorSvg);
-    this.cursorSvg = cursorSvg;
-  }
-
-  /**
-   * Add the marker SVG to this block's SVG group.
-   *
-   * @param markerSvg The SVG root of the marker to be added to the block SVG
-   *     group.
-   */
-  setMarkerSvg(markerSvg: SVGElement) {
-    if (!markerSvg) {
-      this.markerSvg = null;
-      return;
-    }
-
-    if (this.cursorSvg) {
-      this.svgRoot.insertBefore(markerSvg, this.cursorSvg);
-    } else {
-      this.svgRoot.appendChild(markerSvg);
-    }
-    this.markerSvg = markerSvg;
-  }
-
   /**
    * Apply the stored colours to the block's path, taking into account whether
    * the paths belong to a shadow block.
diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts
@@ -474,28 +474,6 @@ export class WorkspaceSvg
     return this.componentManager;
   }
 
-  /**
-   * Add the cursor SVG to this workspaces SVG group.
-   *
-   * @param cursorSvg The SVG root of the cursor to be added to the workspace
-   *     SVG group.
-   * @internal
-   */
-  setCursorSvg(cursorSvg: SVGElement) {
-    this.markerManager.setCursorSvg(cursorSvg);
-  }
-
-  /**
-   * Add the marker SVG to this workspaces SVG group.
-   *
-   * @param markerSvg The SVG root of the marker to be added to the workspace
-   *     SVG group.
-   * @internal
-   */
-  setMarkerSvg(markerSvg: SVGElement) {
-    this.markerManager.setMarkerSvg(markerSvg);
-  }
-
   /**
    * Get the marker with the given ID.
    *

Original file line number	Diff line number	Diff line change
`@@ -348,15 +348,6 @@ export class FlyoutButton`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`
`351`		`- /**`
`352`		`- * Required by IASTNodeLocationSvg, but not used. A marker cannot be set on a`
`353`		`- * button. If the 'mark' shortcut is used on a button, its associated callback`
`354`		`- * function is triggered.`
`355`		`- */`
`356`		`- setMarkerSvg() {`
`357`		`- throw new Error('Attempted to set a marker on a button.');`
`358`		`- }`
`359`		`-`
`360`	`351`	`/**`
`361`	`352`	`* Do something when the button is clicked.`
`362`	`353`	`*`