Fix bad merge

src/InputHandler.ts

@@ -107,18 +107,7 @@ export class InputHandler implements IInputHandler {
    * Bell (Ctrl-G).
    */
   public bell(): void {
-    this._terminal.emit('bell');
-    if (this._terminal.bellSound) {
-      this._terminal.bellAudioElement.play();
-    }
-    if (!this._terminal.visualBell) {
-      return;
-    }
-    this._terminal.element.style.borderColor = 'white';
-    setTimeout(() => this._terminal.element.style.borderColor = '', 10);
-    if (this._terminal.options.popOnBell) {
-      this._terminal.focus();
-    }
+    this._terminal.bell();
   }
 
   /**

src/Interfaces.ts

@@ -87,6 +87,7 @@ export interface IInputHandlingTerminal extends IEventEmitter {
   viewport: IViewport;
   selectionManager: ISelectionManager;
 
+  bell(): void;
   focus(): void;
   convertEol: boolean;
   updateRange(y: number): void;

src/Terminal.ts

@@ -1882,9 +1882,8 @@ export class Terminal extends EventEmitter implements ITerminal, IInputHandlingT
    */
   public bell(): void {
     this.emit('bell');
-    if (this.soundBell()) {
-      this.bellAudioElement.play();
-    }
+    if (this.soundBell()) this.bellAudioElement.play();
+
     if (this.visualBell()) {
       this.element.classList.add('visual-bell-active');
       clearTimeout(this.visualBellTimer);

src/utils/TestUtils.test.ts

@@ -97,6 +97,10 @@ export class MockInputHandlingTerminal implements IInputHandlingTerminal {
     throw new Error('Method not implemented.');
   }
   convertEol: boolean;
+  bell(): void {
+    throw new Error('Method not implemented.');
+  }
+
   updateRange(y: number): void {
     throw new Error('Method not implemented.');
   }