From 8237445753f9d0192056770f6918853e2a1696a6 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 26 Jun 2018 12:45:36 -0700 Subject: [PATCH] Rename cols to columns Fixes #52885 --- .../vscode-api-tests/src/singlefolder-tests/window.test.ts | 2 +- src/vs/vscode.proposed.d.ts | 2 +- src/vs/workbench/api/node/extHostTerminalService.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts index 87734062b8a..50ef55b4f55 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts @@ -646,7 +646,7 @@ suite('window namespace tests', () => { }); const renderer = window.createTerminalRenderer('foo'); const reg2 = renderer.onDidChangeMaximumDimensions(dimensions => { - assert.ok(dimensions.cols > 0); + assert.ok(dimensions.columns > 0); assert.ok(dimensions.rows > 0); reg2.dispose(); const reg3 = window.onDidCloseTerminal(() => { diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index bfc033ca751..04d85d9ed84 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -351,7 +351,7 @@ declare module 'vscode' { /** * The number of columns in the terminal. */ - cols: number; + columns: number; /** * The number of rows in the terminal. diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index 5589c538331..e4f5405418c 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/src/vs/workbench/api/node/extHostTerminalService.ts @@ -179,7 +179,7 @@ export class ExtHostTerminalRenderer extends BaseExtHostTerminal implements vsco } return { rows: this._maximumDimensions.rows, - cols: this._maximumDimensions.cols + columns: this._maximumDimensions.columns }; } @@ -212,8 +212,8 @@ export class ExtHostTerminalRenderer extends BaseExtHostTerminal implements vsco this._onInput.fire(data); } - public _setMaximumDimensions(cols: number, rows: number): void { - this._maximumDimensions = { cols, rows }; + public _setMaximumDimensions(columns: number, rows: number): void { + this._maximumDimensions = { columns, rows }; this._onDidChangeMaximumDimensions.fire(this.maximumDimensions); } } -- GitLab