@theia/test 1.60.2 → 1.61.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/view/test-output-widget.d.ts +0 -1
- package/lib/browser/view/test-output-widget.d.ts.map +1 -1
- package/lib/browser/view/test-output-widget.js +5 -10
- package/lib/browser/view/test-output-widget.js.map +1 -1
- package/package.json +10 -10
- package/src/browser/view/test-output-widget.ts +7 -13
|
@@ -17,7 +17,6 @@ export declare class TestOutputWidget extends BaseWidget {
|
|
|
17
17
|
init(): void;
|
|
18
18
|
setInput(selectedOutputSource: TestOutputSource | undefined): void;
|
|
19
19
|
protected onAfterAttach(msg: Message): void;
|
|
20
|
-
private getTerminalRendererType;
|
|
21
20
|
protected onResize(msg: Widget.ResizeMessage): void;
|
|
22
21
|
protected resizeTerminal: () => Promise<void>;
|
|
23
22
|
protected doResizeTerminal(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-output-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/test-output-widget.ts"],"names":[],"mappings":"AAeA,OAAO,
|
|
1
|
+
{"version":3,"file":"test-output-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/test-output-widget.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAsB,MAAM,yBAAyB,CAAC;AAE1F,OAAO,EAAc,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG7E,qBACa,gBAAiB,SAAQ,UAAU;IACf,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC;IACnD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IAEzE,MAAM,CAAC,EAAE,SAAsB;IAE/B,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;IACzB,SAAS,CAAC,iBAAiB,uBAA8B;IACzD,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;;IAa7B,IAAI,IAAI,IAAI;IA0BZ,QAAQ,CAAC,oBAAoB,EAAE,gBAAgB,GAAG,SAAS,GAAG,IAAI;cAa/C,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;cAmCjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,GAAG,IAAI;IAK5D,SAAS,CAAC,cAAc,sBAA+C;IAEvE,SAAS,CAAC,gBAAgB,IAAI,IAAI;CAWrC"}
|
|
@@ -51,7 +51,6 @@ let TestOutputWidget = TestOutputWidget_1 = class TestOutputWidget extends brows
|
|
|
51
51
|
lineHeight: this.preferences['terminal.integrated.lineHeight'],
|
|
52
52
|
scrollback: this.preferences['terminal.integrated.scrollback'],
|
|
53
53
|
fastScrollSensitivity: this.preferences['terminal.integrated.fastScrollSensitivity'],
|
|
54
|
-
rendererType: this.getTerminalRendererType(this.preferences['terminal.integrated.rendererType']),
|
|
55
54
|
theme: this.themeService.theme
|
|
56
55
|
});
|
|
57
56
|
this.fitAddon = new xterm_addon_fit_1.FitAddon();
|
|
@@ -104,12 +103,6 @@ let TestOutputWidget = TestOutputWidget_1 = class TestOutputWidget extends brows
|
|
|
104
103
|
}
|
|
105
104
|
}
|
|
106
105
|
}
|
|
107
|
-
getTerminalRendererType(terminalRendererType) {
|
|
108
|
-
if (terminalRendererType && (0, terminal_preferences_1.isTerminalRendererType)(terminalRendererType)) {
|
|
109
|
-
return terminalRendererType;
|
|
110
|
-
}
|
|
111
|
-
return terminal_preferences_1.DEFAULT_TERMINAL_RENDERER_TYPE;
|
|
112
|
-
}
|
|
113
106
|
onResize(msg) {
|
|
114
107
|
super.onResize(msg);
|
|
115
108
|
this.resizeTerminal();
|
|
@@ -119,9 +112,11 @@ let TestOutputWidget = TestOutputWidget_1 = class TestOutputWidget extends brows
|
|
|
119
112
|
return;
|
|
120
113
|
}
|
|
121
114
|
const geo = this.fitAddon.proposeDimensions();
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
115
|
+
if (geo) {
|
|
116
|
+
const cols = geo.cols;
|
|
117
|
+
const rows = geo.rows - 1; // subtract one row for margin
|
|
118
|
+
this.term.resize(cols, rows);
|
|
119
|
+
}
|
|
125
120
|
}
|
|
126
121
|
};
|
|
127
122
|
exports.TestOutputWidget = TestOutputWidget;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-output-widget.js","sourceRoot":"","sources":["../../../src/browser/view/test-output-widget.ts"],"names":[],"mappings":";;;;;AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"test-output-widget.js","sourceRoot":"","sources":["../../../src/browser/view/test-output-widget.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/test",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.61.0",
|
|
4
4
|
"description": "Theia - Test Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/editor": "1.
|
|
8
|
-
"@theia/filesystem": "1.
|
|
9
|
-
"@theia/navigator": "1.
|
|
10
|
-
"@theia/terminal": "1.
|
|
11
|
-
"xterm": "^
|
|
12
|
-
"xterm-addon-fit": "^0.
|
|
6
|
+
"@theia/core": "1.61.0",
|
|
7
|
+
"@theia/editor": "1.61.0",
|
|
8
|
+
"@theia/filesystem": "1.61.0",
|
|
9
|
+
"@theia/navigator": "1.61.0",
|
|
10
|
+
"@theia/terminal": "1.61.0",
|
|
11
|
+
"xterm": "^5.3.0",
|
|
12
|
+
"xterm-addon-fit": "^0.8.0"
|
|
13
13
|
},
|
|
14
14
|
"publishConfig": {
|
|
15
15
|
"access": "public"
|
|
@@ -44,10 +44,10 @@
|
|
|
44
44
|
"watch": "theiaext watch"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@theia/ext-scripts": "1.
|
|
47
|
+
"@theia/ext-scripts": "1.61.0"
|
|
48
48
|
},
|
|
49
49
|
"nyc": {
|
|
50
50
|
"extends": "../../configs/nyc.json"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "c99af52568c2e1f453c80c1b0d1fb73c3a23dcc0"
|
|
53
53
|
}
|
|
@@ -13,13 +13,13 @@
|
|
|
13
13
|
//
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
|
-
import {
|
|
16
|
+
import { Terminal } from 'xterm';
|
|
17
17
|
import { FitAddon } from 'xterm-addon-fit';
|
|
18
18
|
|
|
19
19
|
import { BaseWidget, Message, Widget, codicon, isFirefox } from '@theia/core/lib/browser';
|
|
20
20
|
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
21
21
|
import { Disposable, DisposableCollection } from '@theia/core';
|
|
22
|
-
import {
|
|
22
|
+
import { TerminalPreferences } from '@theia/terminal/lib/browser/terminal-preferences';
|
|
23
23
|
import { TerminalThemeService } from '@theia/terminal/lib/browser/terminal-theme-service';
|
|
24
24
|
import { TestOutputSource, TestOutputUIModel } from './test-output-ui-model';
|
|
25
25
|
import debounce = require('p-debounce');
|
|
@@ -60,7 +60,6 @@ export class TestOutputWidget extends BaseWidget {
|
|
|
60
60
|
lineHeight: this.preferences['terminal.integrated.lineHeight'],
|
|
61
61
|
scrollback: this.preferences['terminal.integrated.scrollback'],
|
|
62
62
|
fastScrollSensitivity: this.preferences['terminal.integrated.fastScrollSensitivity'],
|
|
63
|
-
rendererType: this.getTerminalRendererType(this.preferences['terminal.integrated.rendererType']),
|
|
64
63
|
theme: this.themeService.theme
|
|
65
64
|
});
|
|
66
65
|
|
|
@@ -122,13 +121,6 @@ export class TestOutputWidget extends BaseWidget {
|
|
|
122
121
|
}
|
|
123
122
|
}
|
|
124
123
|
|
|
125
|
-
private getTerminalRendererType(terminalRendererType?: string | TerminalRendererType): RendererType {
|
|
126
|
-
if (terminalRendererType && isTerminalRendererType(terminalRendererType)) {
|
|
127
|
-
return terminalRendererType;
|
|
128
|
-
}
|
|
129
|
-
return DEFAULT_TERMINAL_RENDERER_TYPE;
|
|
130
|
-
}
|
|
131
|
-
|
|
132
124
|
protected override onResize(msg: Widget.ResizeMessage): void {
|
|
133
125
|
super.onResize(msg);
|
|
134
126
|
this.resizeTerminal();
|
|
@@ -141,8 +133,10 @@ export class TestOutputWidget extends BaseWidget {
|
|
|
141
133
|
return;
|
|
142
134
|
}
|
|
143
135
|
const geo = this.fitAddon.proposeDimensions();
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
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
|
+
}
|
|
147
141
|
}
|
|
148
142
|
}
|