Skip to content

Commit cf43d33

Browse files
authored
Update deprecated xterm dependency (#15523)
fixes #13896 Contributed on behalf of STMicroelectronics Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
1 parent 8788d7f commit cf43d33

File tree

3 files changed

+11
-34
lines changed

3 files changed

+11
-34
lines changed

package-lock.json

Lines changed: 2 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/test/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"@theia/filesystem": "1.60.0",
99
"@theia/navigator": "1.60.0",
1010
"@theia/terminal": "1.60.0",
11-
"xterm": "^4.16.0",
12-
"xterm-addon-fit": "^0.5.0"
11+
"xterm": "^5.3.0",
12+
"xterm-addon-fit": "^0.8.0"
1313
},
1414
"publishConfig": {
1515
"access": "public"

packages/test/src/browser/view/test-output-widget.ts

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
//
1414
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
1515
// *****************************************************************************
16-
import { RendererType, Terminal } from 'xterm';
16+
import { Terminal } from 'xterm';
1717
import { FitAddon } from 'xterm-addon-fit';
1818

1919
import { BaseWidget, Message, Widget, codicon, isFirefox } from '@theia/core/lib/browser';
2020
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
2121
import { Disposable, DisposableCollection } from '@theia/core';
22-
import { DEFAULT_TERMINAL_RENDERER_TYPE, TerminalPreferences, TerminalRendererType, isTerminalRendererType } from '@theia/terminal/lib/browser/terminal-preferences';
22+
import { TerminalPreferences } from '@theia/terminal/lib/browser/terminal-preferences';
2323
import { TerminalThemeService } from '@theia/terminal/lib/browser/terminal-theme-service';
2424
import { TestOutputSource, TestOutputUIModel } from './test-output-ui-model';
2525
import debounce = require('p-debounce');
@@ -60,7 +60,6 @@ export class TestOutputWidget extends BaseWidget {
6060
lineHeight: this.preferences['terminal.integrated.lineHeight'],
6161
scrollback: this.preferences['terminal.integrated.scrollback'],
6262
fastScrollSensitivity: this.preferences['terminal.integrated.fastScrollSensitivity'],
63-
rendererType: this.getTerminalRendererType(this.preferences['terminal.integrated.rendererType']),
6463
theme: this.themeService.theme
6564
});
6665

@@ -122,13 +121,6 @@ export class TestOutputWidget extends BaseWidget {
122121
}
123122
}
124123

125-
private getTerminalRendererType(terminalRendererType?: string | TerminalRendererType): RendererType {
126-
if (terminalRendererType && isTerminalRendererType(terminalRendererType)) {
127-
return terminalRendererType;
128-
}
129-
return DEFAULT_TERMINAL_RENDERER_TYPE;
130-
}
131-
132124
protected override onResize(msg: Widget.ResizeMessage): void {
133125
super.onResize(msg);
134126
this.resizeTerminal();
@@ -141,8 +133,10 @@ export class TestOutputWidget extends BaseWidget {
141133
return;
142134
}
143135
const geo = this.fitAddon.proposeDimensions();
144-
const cols = geo.cols;
145-
const rows = geo.rows - 1; // subtract one row for margin
146-
this.term.resize(cols, rows);
136+
if (geo) {
137+
const cols = geo.cols;
138+
const rows = geo.rows - 1; // subtract one row for margin
139+
this.term.resize(cols, rows);
140+
}
147141
}
148142
}

0 commit comments

Comments
 (0)