Remove renderer circular dep on renderservice

Also fix super.dispose not being called correctly on RenderService

src/browser/renderer/Types.d.ts

@@ -5,6 +5,7 @@
 
 import { IDisposable } from 'common/Types';
 import { IColorSet } from 'browser/Types';
+import { IEvent } from 'common/EventEmitter';
 
 export type CharacterJoinerHandler = (text: string) => [number, number][];
 
@@ -23,6 +24,11 @@ export interface IRenderDimensions {
   actualCellHeight: number;
 }
 
+export interface IRequestRefreshRowsEvent {
+  start: number;
+  end: number;
+}
+
 /**
  * Note that IRenderer implementations should emit the refresh event after
  * rendering rows to the screen.
@@ -30,6 +36,8 @@ export interface IRenderDimensions {
 export interface IRenderer extends IDisposable {
   readonly dimensions: IRenderDimensions;
 
+  readonly onRequestRefreshRows: IEvent<IRequestRefreshRowsEvent>;
+
   dispose(): void;
   setColors(colors: IColorSet): void;
   onDevicePixelRatioChange(): void;

src/browser/renderer/dom/DomRenderer.ts

@@ -3,13 +3,14 @@
  * @license MIT
  */
 
-import { IRenderer, IRenderDimensions, CharacterJoinerHandler } from 'browser/renderer/Types';
+import { IRenderer, IRenderDimensions, CharacterJoinerHandler, IRequestRefreshRowsEvent } from 'browser/renderer/Types';
 import { BOLD_CLASS, ITALIC_CLASS, CURSOR_CLASS, CURSOR_STYLE_BLOCK_CLASS, CURSOR_BLINK_CLASS, CURSOR_STYLE_BAR_CLASS, CURSOR_STYLE_UNDERLINE_CLASS, DomRendererRowFactory } from 'browser/renderer/dom/DomRendererRowFactory';
 import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
 import { Disposable } from 'common/Lifecycle';
 import { IColorSet, ILinkifierEvent, ILinkifier } from 'browser/Types';
-import { ICharSizeService, IRenderService } from 'browser/services/Services';
+import { ICharSizeService } from 'browser/services/Services';
 import { IOptionsService, IBufferService } from 'common/services/Services';
+import { EventEmitter, IEvent } from 'common/EventEmitter';
 
 const TERMINAL_CLASS_PREFIX = 'xterm-dom-renderer-owner-';
 const ROW_CONTAINER_CLASS = 'xterm-rows';
@@ -37,6 +38,9 @@ export class DomRenderer extends Disposable implements IRenderer {
 
   public dimensions: IRenderDimensions;
 
+  private _onRequestRefreshRows = new EventEmitter<IRequestRefreshRowsEvent>();
+  public get onRequestRefreshRows(): IEvent<IRequestRefreshRowsEvent> { return this._onRequestRefreshRows.event; }
+
   constructor(
     private _colors: IColorSet,
     private readonly _element: HTMLElement,
@@ -45,8 +49,7 @@ export class DomRenderer extends Disposable implements IRenderer {
     private readonly _linkifier: ILinkifier,
     @ICharSizeService private readonly _charSizeService: ICharSizeService,
     @IOptionsService private readonly _optionsService: IOptionsService,
-    @IBufferService private readonly _bufferService: IBufferService,
-    @IRenderService private readonly _renderService: IRenderService
+    @IBufferService private readonly _bufferService: IBufferService
   ) {
     super();
 
@@ -337,7 +340,7 @@ export class DomRenderer extends Disposable implements IRenderer {
     // Force a refresh
     this._updateDimensions();
     this._injectCss();
-    this._renderService.refreshRows(0, this._bufferService.rows - 1);
+    this._onRequestRefreshRows.fire({ start: 0, end: this._bufferService.rows - 1 });
   }
 
   public clear(): void {

src/browser/services/RenderService.ts

@@ -51,6 +51,9 @@ export class RenderService extends Disposable implements IRenderService {
     this.register(optionsService.onOptionChange(() => this._renderer.onOptionsChanged()));
     this.register(charSizeService.onCharSizeChange(() => this.onCharSizeChanged()));
 
+    // No need to register this as renderer is explicitly disposed in RenderService.dispose
+    this._renderer.onRequestRefreshRows(e => this.refreshRows(e.start, e.end));
+
     // dprchange should handle this case, we need this as well for browsers that don't support the
     // matchMedia query.
     this.register(addDisposableDomListener(window, 'resize', () => this.onDevicePixelRatioChange()));
@@ -105,12 +108,14 @@ export class RenderService extends Disposable implements IRenderService {
 
   public dispose(): void {
     this._renderer.dispose();
+    super.dispose();
   }
 
   public setRenderer(renderer: IRenderer): void {
     // TODO: RenderService should be the only one to dispose the renderer
     this._renderer.dispose();
     this._renderer = renderer;
+    this._renderer.onRequestRefreshRows(e => this.refreshRows(e.start, e.end));
     this.refreshRows(0, this._rowCount - 1);
   }