From 10fedf4ccfc53b07e21f78df266d8a4bb7515c30 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 27 Jun 2019 18:36:44 -0700 Subject: [PATCH] Enforce underscore prefix for protected members --- .../src/renderLayer/BaseRenderLayer.ts | 22 +++++++++---------- .../src/renderLayer/CursorRenderLayer.ts | 12 +++++----- .../src/renderLayer/LinkRenderLayer.ts | 14 ++++++------ src/Linkifier.test.ts | 2 +- src/Linkifier.ts | 20 ++++++++--------- src/renderer/BaseRenderLayer.ts | 22 +++++++++---------- src/renderer/CursorRenderLayer.ts | 12 +++++----- src/renderer/LinkRenderLayer.ts | 14 ++++++------ src/renderer/SelectionRenderLayer.ts | 12 +++++----- src/renderer/TextRenderLayer.ts | 16 +++++++------- tslint.json | 4 +--- yarn.lock | 2 +- 12 files changed, 75 insertions(+), 77 deletions(-) diff --git a/addons/xterm-addon-webgl/src/renderLayer/BaseRenderLayer.ts b/addons/xterm-addon-webgl/src/renderLayer/BaseRenderLayer.ts index 999d94f4..0422440e 100644 --- a/addons/xterm-addon-webgl/src/renderLayer/BaseRenderLayer.ts +++ b/addons/xterm-addon-webgl/src/renderLayer/BaseRenderLayer.ts @@ -66,7 +66,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { this._ctx = this._canvas.getContext('2d', {alpha: this._alpha}); // Draw the background if this is an opaque layer if (!this._alpha) { - this.clearAll(); + this._clearAll(); } } @@ -81,7 +81,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { this._refreshCharAtlas(terminal, colorSet); } - protected setTransparency(terminal: Terminal, alpha: boolean): void { + protected _setTransparency(terminal: Terminal, alpha: boolean): void { // Do nothing when alpha doesn't change if (alpha === this._alpha) { return; @@ -127,7 +127,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { // Draw the background if this is an opaque layer if (!this._alpha) { - this.clearAll(); + this._clearAll(); } this._refreshCharAtlas(terminal, this._colors); @@ -142,7 +142,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param width The number of columns to fill. * @param height The number of rows to fill. */ - protected fillCells(x: number, y: number, width: number, height: number): void { + protected _fillCells(x: number, y: number, width: number, height: number): void { this._ctx.fillRect( x * this._scaledCellWidth, y * this._scaledCellHeight, @@ -156,7 +156,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param x The column to fill. * @param y The row to fill. */ - protected fillBottomLineAtCells(x: number, y: number, width: number = 1): void { + protected _fillBottomLineAtCells(x: number, y: number, width: number = 1): void { this._ctx.fillRect( x * this._scaledCellWidth, (y + 1) * this._scaledCellHeight - window.devicePixelRatio - 1 /* Ensure it's drawn within the cell */, @@ -170,7 +170,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param x The column to fill. * @param y The row to fill. */ - protected fillLeftLineAtCell(x: number, y: number): void { + protected _fillLeftLineAtCell(x: number, y: number): void { this._ctx.fillRect( x * this._scaledCellWidth, y * this._scaledCellHeight, @@ -184,7 +184,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param x The column to fill. * @param y The row to fill. */ - protected strokeRectAtCell(x: number, y: number, width: number, height: number): void { + protected _strokeRectAtCell(x: number, y: number, width: number, height: number): void { this._ctx.lineWidth = window.devicePixelRatio; this._ctx.strokeRect( x * this._scaledCellWidth + window.devicePixelRatio / 2, @@ -196,7 +196,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { /** * Clears the entire canvas. */ - protected clearAll(): void { + protected _clearAll(): void { if (this._alpha) { this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height); } else { @@ -212,7 +212,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param width The number of columns to clear. * @param height The number of rows to clear. */ - protected clearCells(x: number, y: number, width: number, height: number): void { + protected _clearCells(x: number, y: number, width: number, height: number): void { if (this._alpha) { this._ctx.clearRect( x * this._scaledCellWidth, @@ -239,7 +239,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param y The row to draw at. * @param color The color of the character. */ - protected fillCharTrueColor(terminal: Terminal, cell: CellData, x: number, y: number): void { + protected _fillCharTrueColor(terminal: Terminal, cell: CellData, x: number, y: number): void { this._ctx.font = this._getFont(terminal, false, false); this._ctx.textBaseline = 'middle'; this._clipRow(terminal, y); @@ -263,7 +263,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * This is used to validate whether a cached image can be used. * @param bold Whether the text is bold. */ - protected drawChars(terminal: Terminal, cell: ICellData, x: number, y: number): void { + protected _drawChars(terminal: Terminal, cell: ICellData, x: number, y: number): void { // skip cache right away if we draw in RGB // Note: to avoid bad runtime JoinedCellData will be skipped diff --git a/addons/xterm-addon-webgl/src/renderLayer/CursorRenderLayer.ts b/addons/xterm-addon-webgl/src/renderLayer/CursorRenderLayer.ts index b0bf581f..09abe82a 100644 --- a/addons/xterm-addon-webgl/src/renderLayer/CursorRenderLayer.ts +++ b/addons/xterm-addon-webgl/src/renderLayer/CursorRenderLayer.ts @@ -182,7 +182,7 @@ export class CursorRenderLayer extends BaseRenderLayer { private _clearCursor(): void { if (this._state) { - this.clearCells(this._state.x, this._state.y, this._state.width, 1); + this._clearCells(this._state.x, this._state.y, this._state.width, 1); this._state = { x: null, y: null, @@ -196,30 +196,30 @@ export class CursorRenderLayer extends BaseRenderLayer { private _renderBarCursor(terminal: Terminal, x: number, y: number, cell: ICellData): void { this._ctx.save(); this._ctx.fillStyle = this._colors.cursor.css; - this.fillLeftLineAtCell(x, y); + this._fillLeftLineAtCell(x, y); this._ctx.restore(); } private _renderBlockCursor(terminal: Terminal, x: number, y: number, cell: ICellData): void { this._ctx.save(); this._ctx.fillStyle = this._colors.cursor.css; - this.fillCells(x, y, cell.getWidth(), 1); + this._fillCells(x, y, cell.getWidth(), 1); this._ctx.fillStyle = this._colors.cursorAccent.css; - this.fillCharTrueColor(terminal, cell, x, y); + this._fillCharTrueColor(terminal, cell, x, y); this._ctx.restore(); } private _renderUnderlineCursor(terminal: Terminal, x: number, y: number, cell: ICellData): void { this._ctx.save(); this._ctx.fillStyle = this._colors.cursor.css; - this.fillBottomLineAtCells(x, y); + this._fillBottomLineAtCells(x, y); this._ctx.restore(); } private _renderBlurCursor(terminal: Terminal, x: number, y: number, cell: ICellData): void { this._ctx.save(); this._ctx.strokeStyle = this._colors.cursor.css; - this.strokeRectAtCell(x, y, cell.getWidth(), 1); + this._strokeRectAtCell(x, y, cell.getWidth(), 1); this._ctx.restore(); } } diff --git a/addons/xterm-addon-webgl/src/renderLayer/LinkRenderLayer.ts b/addons/xterm-addon-webgl/src/renderLayer/LinkRenderLayer.ts index d37f2640..7c79ddcc 100644 --- a/addons/xterm-addon-webgl/src/renderLayer/LinkRenderLayer.ts +++ b/addons/xterm-addon-webgl/src/renderLayer/LinkRenderLayer.ts @@ -32,12 +32,12 @@ export class LinkRenderLayer extends BaseRenderLayer { private _clearCurrentLink(): void { if (this._state) { - this.clearCells(this._state.x1, this._state.y1, this._state.cols - this._state.x1, 1); + this._clearCells(this._state.x1, this._state.y1, this._state.cols - this._state.x1, 1); const middleRowCount = this._state.y2 - this._state.y1 - 1; if (middleRowCount > 0) { - this.clearCells(0, this._state.y1 + 1, this._state.cols, middleRowCount); + this._clearCells(0, this._state.y1 + 1, this._state.cols, middleRowCount); } - this.clearCells(0, this._state.y2, this._state.x2, 1); + this._clearCells(0, this._state.y2, this._state.x2, 1); this._state = null; } } @@ -54,14 +54,14 @@ export class LinkRenderLayer extends BaseRenderLayer { if (e.y1 === e.y2) { // Single line link - this.fillBottomLineAtCells(e.x1, e.y1, e.x2 - e.x1); + this._fillBottomLineAtCells(e.x1, e.y1, e.x2 - e.x1); } else { // Multi-line link - this.fillBottomLineAtCells(e.x1, e.y1, e.cols - e.x1); + this._fillBottomLineAtCells(e.x1, e.y1, e.cols - e.x1); for (let y = e.y1 + 1; y < e.y2; y++) { - this.fillBottomLineAtCells(0, y, e.cols); + this._fillBottomLineAtCells(0, y, e.cols); } - this.fillBottomLineAtCells(0, e.y2, e.x2); + this._fillBottomLineAtCells(0, e.y2, e.x2); } this._state = e; } diff --git a/src/Linkifier.test.ts b/src/Linkifier.test.ts index 1ccae7fc..9e6588af 100644 --- a/src/Linkifier.test.ts +++ b/src/Linkifier.test.ts @@ -15,7 +15,7 @@ import { CellData } from 'common/buffer/CellData'; class TestLinkifier extends Linkifier { constructor(terminal: ITerminal) { super(terminal); - (Linkifier).TIME_BEFORE_LINKIFY = 0; + Linkifier._timeBeforeLatency = 0; } public get linkMatchers(): ILinkMatcher[] { return this._linkMatchers; } diff --git a/src/Linkifier.ts b/src/Linkifier.ts index c11849de..ded6f87a 100644 --- a/src/Linkifier.ts +++ b/src/Linkifier.ts @@ -9,6 +9,13 @@ import { MouseZone } from './MouseZoneManager'; import { getStringCellWidth } from 'common/CharWidth'; import { EventEmitter, IEvent } from 'common/EventEmitter'; +/** + * Limit of the unwrapping line expansion (overscan) at the top and bottom + * of the actual viewport in ASCII characters. + * A limit of 2000 should match most sane urls. + */ +const OVERSCAN_CHAR_LIMIT = 2000; + /** * The Linkifier applies links to rows shortly after they have been refreshed. */ @@ -18,14 +25,7 @@ export class Linkifier implements ILinkifier { * the costly operation of searching every row multiple times, potentially a * huge amount of times. */ - protected static readonly TIME_BEFORE_LINKIFY = 200; - - /** - * Limit of the unwrapping line expansion (overscan) at the top and bottom - * of the actual viewport in ASCII characters. - * A limit of 2000 should match most sane urls. - */ - protected static readonly OVERSCAN_CHAR_LIMIT = 2000; + protected static _timeBeforeLatency = 200; protected _linkMatchers: ILinkMatcher[] = []; @@ -85,7 +85,7 @@ export class Linkifier implements ILinkifier { if (this._rowsTimeoutId) { clearTimeout(this._rowsTimeoutId); } - this._rowsTimeoutId = setTimeout(() => this._linkifyRows(), Linkifier.TIME_BEFORE_LINKIFY); + this._rowsTimeoutId = setTimeout(() => this._linkifyRows(), Linkifier._timeBeforeLatency); } /** @@ -114,7 +114,7 @@ export class Linkifier implements ILinkifier { // the viewport to +OVERSCAN_CHAR_LIMIT chars (overscan) at top and bottom. // This comes with the tradeoff that matches longer than OVERSCAN_CHAR_LIMIT // chars will not match anymore at the viewport borders. - const overscanLineLimit = Math.ceil(Linkifier.OVERSCAN_CHAR_LIMIT / this._terminal.cols); + const overscanLineLimit = Math.ceil(OVERSCAN_CHAR_LIMIT / this._terminal.cols); const iterator = this._terminal.buffer.iterator( false, absoluteRowIndexStart, absoluteRowIndexEnd, overscanLineLimit, overscanLineLimit); while (iterator.hasNext()) { diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts index b47434e2..767ef08c 100644 --- a/src/renderer/BaseRenderLayer.ts +++ b/src/renderer/BaseRenderLayer.ts @@ -66,7 +66,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { this._ctx = this._canvas.getContext('2d', {alpha: this._alpha}); // Draw the background if this is an opaque layer if (!this._alpha) { - this.clearAll(); + this._clearAll(); } } @@ -81,7 +81,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { this._refreshCharAtlas(terminal, colorSet); } - protected setTransparency(terminal: ITerminal, alpha: boolean): void { + protected _setTransparency(terminal: ITerminal, alpha: boolean): void { // Do nothing when alpha doesn't change if (alpha === this._alpha) { return; @@ -127,7 +127,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { // Draw the background if this is an opaque layer if (!this._alpha) { - this.clearAll(); + this._clearAll(); } this._refreshCharAtlas(terminal, this._colors); @@ -142,7 +142,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param width The number of columns to fill. * @param height The number of rows to fill. */ - protected fillCells(x: number, y: number, width: number, height: number): void { + protected _fillCells(x: number, y: number, width: number, height: number): void { this._ctx.fillRect( x * this._scaledCellWidth, y * this._scaledCellHeight, @@ -156,7 +156,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param x The column to fill. * @param y The row to fill. */ - protected fillBottomLineAtCells(x: number, y: number, width: number = 1): void { + protected _fillBottomLineAtCells(x: number, y: number, width: number = 1): void { this._ctx.fillRect( x * this._scaledCellWidth, (y + 1) * this._scaledCellHeight - window.devicePixelRatio - 1 /* Ensure it's drawn within the cell */, @@ -170,7 +170,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param x The column to fill. * @param y The row to fill. */ - protected fillLeftLineAtCell(x: number, y: number): void { + protected _fillLeftLineAtCell(x: number, y: number): void { this._ctx.fillRect( x * this._scaledCellWidth, y * this._scaledCellHeight, @@ -184,7 +184,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param x The column to fill. * @param y The row to fill. */ - protected strokeRectAtCell(x: number, y: number, width: number, height: number): void { + protected _strokeRectAtCell(x: number, y: number, width: number, height: number): void { this._ctx.lineWidth = window.devicePixelRatio; this._ctx.strokeRect( x * this._scaledCellWidth + window.devicePixelRatio / 2, @@ -196,7 +196,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { /** * Clears the entire canvas. */ - protected clearAll(): void { + protected _clearAll(): void { if (this._alpha) { this._ctx.clearRect(0, 0, this._canvas.width, this._canvas.height); } else { @@ -212,7 +212,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param width The number of columns to clear. * @param height The number of rows to clear. */ - protected clearCells(x: number, y: number, width: number, height: number): void { + protected _clearCells(x: number, y: number, width: number, height: number): void { if (this._alpha) { this._ctx.clearRect( x * this._scaledCellWidth, @@ -239,7 +239,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * @param y The row to draw at. * @param color The color of the character. */ - protected fillCharTrueColor(terminal: ITerminal, cell: CellData, x: number, y: number): void { + protected _fillCharTrueColor(terminal: ITerminal, cell: CellData, x: number, y: number): void { this._ctx.font = this._getFont(terminal, false, false); this._ctx.textBaseline = 'middle'; this._clipRow(terminal, y); @@ -263,7 +263,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { * This is used to validate whether a cached image can be used. * @param bold Whether the text is bold. */ - protected drawChars(terminal: ITerminal, cell: ICellData, x: number, y: number): void { + protected _drawChars(terminal: ITerminal, cell: ICellData, x: number, y: number): void { // skip cache right away if we draw in RGB // Note: to avoid bad runtime JoinedCellData will be skipped diff --git a/src/renderer/CursorRenderLayer.ts b/src/renderer/CursorRenderLayer.ts index b2d856d1..b0e43fdc 100644 --- a/src/renderer/CursorRenderLayer.ts +++ b/src/renderer/CursorRenderLayer.ts @@ -180,7 +180,7 @@ export class CursorRenderLayer extends BaseRenderLayer { private _clearCursor(): void { if (this._state) { - this.clearCells(this._state.x, this._state.y, this._state.width, 1); + this._clearCells(this._state.x, this._state.y, this._state.width, 1); this._state = { x: null, y: null, @@ -194,30 +194,30 @@ export class CursorRenderLayer extends BaseRenderLayer { private _renderBarCursor(terminal: ITerminal, x: number, y: number, cell: ICellData): void { this._ctx.save(); this._ctx.fillStyle = this._colors.cursor.css; - this.fillLeftLineAtCell(x, y); + this._fillLeftLineAtCell(x, y); this._ctx.restore(); } private _renderBlockCursor(terminal: ITerminal, x: number, y: number, cell: ICellData): void { this._ctx.save(); this._ctx.fillStyle = this._colors.cursor.css; - this.fillCells(x, y, cell.getWidth(), 1); + this._fillCells(x, y, cell.getWidth(), 1); this._ctx.fillStyle = this._colors.cursorAccent.css; - this.fillCharTrueColor(terminal, cell, x, y); + this._fillCharTrueColor(terminal, cell, x, y); this._ctx.restore(); } private _renderUnderlineCursor(terminal: ITerminal, x: number, y: number, cell: ICellData): void { this._ctx.save(); this._ctx.fillStyle = this._colors.cursor.css; - this.fillBottomLineAtCells(x, y); + this._fillBottomLineAtCells(x, y); this._ctx.restore(); } private _renderBlurCursor(terminal: ITerminal, x: number, y: number, cell: ICellData): void { this._ctx.save(); this._ctx.strokeStyle = this._colors.cursor.css; - this.strokeRectAtCell(x, y, cell.getWidth(), 1); + this._strokeRectAtCell(x, y, cell.getWidth(), 1); this._ctx.restore(); } } diff --git a/src/renderer/LinkRenderLayer.ts b/src/renderer/LinkRenderLayer.ts index 8c6976d7..f32b5ad9 100644 --- a/src/renderer/LinkRenderLayer.ts +++ b/src/renderer/LinkRenderLayer.ts @@ -31,12 +31,12 @@ export class LinkRenderLayer extends BaseRenderLayer { private _clearCurrentLink(): void { if (this._state) { - this.clearCells(this._state.x1, this._state.y1, this._state.cols - this._state.x1, 1); + this._clearCells(this._state.x1, this._state.y1, this._state.cols - this._state.x1, 1); const middleRowCount = this._state.y2 - this._state.y1 - 1; if (middleRowCount > 0) { - this.clearCells(0, this._state.y1 + 1, this._state.cols, middleRowCount); + this._clearCells(0, this._state.y1 + 1, this._state.cols, middleRowCount); } - this.clearCells(0, this._state.y2, this._state.x2, 1); + this._clearCells(0, this._state.y2, this._state.x2, 1); this._state = null; } } @@ -53,14 +53,14 @@ export class LinkRenderLayer extends BaseRenderLayer { if (e.y1 === e.y2) { // Single line link - this.fillBottomLineAtCells(e.x1, e.y1, e.x2 - e.x1); + this._fillBottomLineAtCells(e.x1, e.y1, e.x2 - e.x1); } else { // Multi-line link - this.fillBottomLineAtCells(e.x1, e.y1, e.cols - e.x1); + this._fillBottomLineAtCells(e.x1, e.y1, e.cols - e.x1); for (let y = e.y1 + 1; y < e.y2; y++) { - this.fillBottomLineAtCells(0, y, e.cols); + this._fillBottomLineAtCells(0, y, e.cols); } - this.fillBottomLineAtCells(0, e.y2, e.x2); + this._fillBottomLineAtCells(0, e.y2, e.x2); } this._state = e; } diff --git a/src/renderer/SelectionRenderLayer.ts b/src/renderer/SelectionRenderLayer.ts index 7c297fd8..20b86a3f 100644 --- a/src/renderer/SelectionRenderLayer.ts +++ b/src/renderer/SelectionRenderLayer.ts @@ -41,7 +41,7 @@ export class SelectionRenderLayer extends BaseRenderLayer { public reset(terminal: ITerminal): void { if (this._state.start && this._state.end) { this._clearState(); - this.clearAll(); + this._clearAll(); } } @@ -52,7 +52,7 @@ export class SelectionRenderLayer extends BaseRenderLayer { } // Remove all selections - this.clearAll(); + this._clearAll(); // Selection does not exist if (!start || !end) { @@ -77,22 +77,22 @@ export class SelectionRenderLayer extends BaseRenderLayer { const startCol = start[0]; const width = end[0] - startCol; const height = viewportCappedEndRow - viewportCappedStartRow + 1; - this.fillCells(startCol, viewportCappedStartRow, width, height); + this._fillCells(startCol, viewportCappedStartRow, width, height); } else { // Draw first row const startCol = viewportStartRow === viewportCappedStartRow ? start[0] : 0; const startRowEndCol = viewportCappedStartRow === viewportCappedEndRow ? end[0] : terminal.cols; - this.fillCells(startCol, viewportCappedStartRow, startRowEndCol - startCol, 1); + this._fillCells(startCol, viewportCappedStartRow, startRowEndCol - startCol, 1); // Draw middle rows const middleRowsCount = Math.max(viewportCappedEndRow - viewportCappedStartRow - 1, 0); - this.fillCells(0, viewportCappedStartRow + 1, terminal.cols, middleRowsCount); + this._fillCells(0, viewportCappedStartRow + 1, terminal.cols, middleRowsCount); // Draw final row if (viewportCappedStartRow !== viewportCappedEndRow) { // Only draw viewportEndRow if it's not the same as viewportStartRow const endCol = viewportEndRow === viewportCappedEndRow ? end[0] : terminal.cols; - this.fillCells(0, viewportCappedEndRow, endCol, 1); + this._fillCells(0, viewportCappedEndRow, endCol, 1); } } diff --git a/src/renderer/TextRenderLayer.ts b/src/renderer/TextRenderLayer.ts index 96678a5d..03e5c112 100644 --- a/src/renderer/TextRenderLayer.ts +++ b/src/renderer/TextRenderLayer.ts @@ -52,7 +52,7 @@ export class TextRenderLayer extends BaseRenderLayer { public reset(terminal: ITerminal): void { this._state.clear(); - this.clearAll(); + this._clearAll(); } private _forEachCell( @@ -179,13 +179,13 @@ export class TextRenderLayer extends BaseRenderLayer { } if (y !== startY) { // our row changed, draw the previous row ctx.fillStyle = prevFillStyle; - this.fillCells(startX, startY, cols - startX, 1); + this._fillCells(startX, startY, cols - startX, 1); startX = x; startY = y; } else if (prevFillStyle !== nextFillStyle) { // our color changed, draw the previous characters in this row ctx.fillStyle = prevFillStyle; - this.fillCells(startX, startY, x - startX, 1); + this._fillCells(startX, startY, x - startX, 1); startX = x; startY = y; } @@ -196,7 +196,7 @@ export class TextRenderLayer extends BaseRenderLayer { // flush the last color we encountered if (prevFillStyle !== null) { ctx.fillStyle = prevFillStyle; - this.fillCells(startX, startY, cols - startX, 1); + this._fillCells(startX, startY, cols - startX, 1); } ctx.restore(); @@ -207,7 +207,7 @@ export class TextRenderLayer extends BaseRenderLayer { if (cell.isInvisible()) { return; } - this.drawChars(terminal, cell, x, y); + this._drawChars(terminal, cell, x, y); if (cell.isUnderline()) { this._ctx.save(); @@ -233,7 +233,7 @@ export class TextRenderLayer extends BaseRenderLayer { } } - this.fillBottomLineAtCells(x, y, cell.getWidth()); + this._fillBottomLineAtCells(x, y, cell.getWidth()); this._ctx.restore(); } }); @@ -249,13 +249,13 @@ export class TextRenderLayer extends BaseRenderLayer { this._charAtlas.beginFrame(); } - this.clearCells(0, firstRow, terminal.cols, lastRow - firstRow + 1); + this._clearCells(0, firstRow, terminal.cols, lastRow - firstRow + 1); this._drawBackground(terminal, firstRow, lastRow); this._drawForeground(terminal, firstRow, lastRow); } public onOptionsChanged(terminal: ITerminal): void { - this.setTransparency(terminal, terminal.options.allowTransparency); + this._setTransparency(terminal, terminal.options.allowTransparency); } /** diff --git a/tslint.json b/tslint.json index f6f1f46c..a18111bf 100644 --- a/tslint.json +++ b/tslint.json @@ -96,9 +96,7 @@ {"type": "type", "format": "PascalCase"}, {"type": "class", "format": "PascalCase"}, {"type": "property", "modifiers": ["const"], "format": ["camelCase", "UPPER_CASE"]}, - {"type": "member", "modifiers": ["protected"], "format": "camelCase", "leadingUnderscore": "allow"}, - // TODO: Change allow to require when there aren't many PRs out - // {"type": "member", "modifiers": ["protected"], "format": "camelCase", "leadingUnderscore": "require"}, + {"type": "member", "modifiers": ["protected"], "format": "camelCase", "leadingUnderscore": "require"}, {"type": "member", "modifiers": ["private"], "format": "camelCase", "leadingUnderscore": "require"}, {"type": "variable", "modifiers": ["const"], "format": ["camelCase", "UPPER_CASE"]}, {"type": "interface", "prefix": "I"} diff --git a/yarn.lock b/yarn.lock index 9a7bfe1e..1ac3af13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2537,7 +2537,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@3.13.1, js-yaml@^3.13.1: +js-yaml@3.13.1, js-yaml@^3.13.1, js-yaml@^3.7.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==