Skip to content

Commit b435e29

Browse files
TyriarTyriar
authored
Merge pull request microsoft#185358 from microsoft/tyriar/185349
Replace escape sequence logging with terminal log channel
2 parents af93ce2 + 8adc6e0 commit b435e29

File tree

15 files changed

+125
-162
lines changed

15 files changed

+125
-162
lines changed

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@
9292
"vscode-oniguruma": "1.7.0",
9393
"vscode-regexpp": "^3.1.0",
9494
"vscode-textmate": "9.0.0",
95-
"xterm": "5.3.0-beta.1",
96-
"xterm-addon-canvas": "0.5.0-beta.1",
95+
"xterm": "5.3.0-beta.3",
96+
"xterm-addon-canvas": "0.5.0-beta.2",
9797
"xterm-addon-image": "0.4.1",
98-
"xterm-addon-search": "0.13.0-beta.1",
99-
"xterm-addon-serialize": "0.11.0-beta.1",
98+
"xterm-addon-search": "0.13.0-beta.2",
99+
"xterm-addon-serialize": "0.11.0-beta.2",
100100
"xterm-addon-unicode11": "0.5.0",
101-
"xterm-addon-webgl": "0.16.0-beta.1",
102-
"xterm-headless": "5.3.0-beta.1",
101+
"xterm-addon-webgl": "0.16.0-beta.2",
102+
"xterm-headless": "5.3.0-beta.3",
103103
"yauzl": "^2.9.2",
104104
"yazl": "^2.4.3"
105105
},
@@ -230,4 +230,4 @@
230230
"optionalDependencies": {
231231
"windows-foreground-love": "0.5.0"
232232
}
233-
}
233+
}

‎remote/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
"vscode-oniguruma": "1.7.0",
2727
"vscode-regexpp": "^3.1.0",
2828
"vscode-textmate": "9.0.0",
29-
"xterm": "5.3.0-beta.1",
30-
"xterm-addon-canvas": "0.5.0-beta.1",
29+
"xterm": "5.3.0-beta.3",
30+
"xterm-addon-canvas": "0.5.0-beta.2",
3131
"xterm-addon-image": "0.4.1",
32-
"xterm-addon-search": "0.13.0-beta.1",
33-
"xterm-addon-serialize": "0.11.0-beta.1",
32+
"xterm-addon-search": "0.13.0-beta.2",
33+
"xterm-addon-serialize": "0.11.0-beta.2",
3434
"xterm-addon-unicode11": "0.5.0",
35-
"xterm-addon-webgl": "0.16.0-beta.1",
36-
"xterm-headless": "5.3.0-beta.1",
35+
"xterm-addon-webgl": "0.16.0-beta.2",
36+
"xterm-headless": "5.3.0-beta.3",
3737
"yauzl": "^2.9.2",
3838
"yazl": "^2.4.3"
3939
}

‎remote/web/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"tas-client-umd": "0.1.8",
1212
"vscode-oniguruma": "1.7.0",
1313
"vscode-textmate": "9.0.0",
14-
"xterm": "5.3.0-beta.1",
15-
"xterm-addon-canvas": "0.5.0-beta.1",
14+
"xterm": "5.3.0-beta.3",
15+
"xterm-addon-canvas": "0.5.0-beta.2",
1616
"xterm-addon-image": "0.4.1",
17-
"xterm-addon-search": "0.13.0-beta.1",
17+
"xterm-addon-search": "0.13.0-beta.2",
1818
"xterm-addon-unicode11": "0.5.0",
19-
"xterm-addon-webgl": "0.16.0-beta.1"
19+
"xterm-addon-webgl": "0.16.0-beta.2"
2020
}
2121
}

‎remote/web/yarn.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,32 +68,32 @@ vscode-textmate@9.0.0:
6868
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
6969
integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
7070

71-
xterm-addon-canvas@0.5.0-beta.1:
72-
version "0.5.0-beta.1"
73-
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0-beta.1.tgz#b5ae185741423715460a66029c944b4dededfab0"
74-
integrity sha512-A7yjIpyTcOh8ckPJw1YFDvwbTbQ+grM+kTtutOvu5LjLSV9EoCHX17kVoiT2V29ywF7KJMeLYwfBwyFE3uA3QQ==
71+
xterm-addon-canvas@0.5.0-beta.2:
72+
version "0.5.0-beta.2"
73+
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0-beta.2.tgz#1b83c2a9a306766c47a4f80b8c65cc9ee5f5a5c4"
74+
integrity sha512-oTb/2krdbHYGxH2X6yiBZzAB/1WB+apUu4nXHdhBnht20bl8E+YVWqg95D4o0Gl+QJI+XOfB3mqmWaBx1x531A==
7575

7676
xterm-addon-image@0.4.1:
7777
version "0.4.1"
7878
resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.4.1.tgz#ec8f750af48005ad641c1128fa1f551ac198472a"
7979
integrity sha512-iJpYyvtbHg4oXSv+D6J73ZfCjnboZpbZ567MLplXDBlYSUknv3kvPTfVMPJATV7Zsx7+bDgyXboCh9vsDf/m/w==
8080

81-
xterm-addon-search@0.13.0-beta.1:
82-
version "0.13.0-beta.1"
83-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.13.0-beta.1.tgz#9fb6ede402d4c369d59d5d6faefe54a05b125bcf"
84-
integrity sha512-rdOIhwkfRASqTriUO8QP9UY0p6BosLMv1NXTZqhgq3/5xAXx4VZg6mlQjTRGnUz/GJIN1jU9e/Vp20SpocP/Hw==
81+
xterm-addon-search@0.13.0-beta.2:
82+
version "0.13.0-beta.2"
83+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.13.0-beta.2.tgz#c984a35312acad4ce768d17bc49adffa90eece61"
84+
integrity sha512-+VoPhIRmfiX2uh2t6xD/RJtBYjVjrkNa3dKQnOYEp4UbYzDjK57rZX652mnZ82TQfk/juxf7v+jV5aRdNLZVbA==
8585

8686
xterm-addon-unicode11@0.5.0:
8787
version "0.5.0"
8888
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0.tgz#41c0d96acc1e3bb6c6596eee64e163b6bca74be7"
8989
integrity sha512-Jm4/g4QiTxiKiTbYICQgC791ubhIZyoIwxAIgOW8z8HWFNY+lwk+dwaKEaEeGBfM48Vk8fklsUW9u/PlenYEBg==
9090

91-
xterm-addon-webgl@0.16.0-beta.1:
92-
version "0.16.0-beta.1"
93-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0-beta.1.tgz#e2b41c6b5f838724a5cb3cfa4231e2d1b8f3f130"
94-
integrity sha512-iJK+Uk+23Mh84BNa/44JqAdPESdNKN0ONfw6UztmDk2HTvsy47sU+d/lgF2kOcuI3ew2tRzK9YlupOUhVPwe9g==
91+
xterm-addon-webgl@0.16.0-beta.2:
92+
version "0.16.0-beta.2"
93+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0-beta.2.tgz#30489ef235405255ee54077002c90553531870d8"
94+
integrity sha512-DAt4E/QI1w34ToBhcDj0vaZOAHOO+ffwMt2HGDAB7amPXRcMb0LBIjLpyZhB9sD4tbIgsE0vuqZi1R9vKxZwbg==
9595

96-
xterm@5.3.0-beta.1:
97-
version "5.3.0-beta.1"
98-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.3.0-beta.1.tgz#68e76f2818965592c60bb269360f1fc37219f4ae"
99-
integrity sha512-2v/Qmk1A0wO5oouRWUWZ3wxqtfFjxsQbZ1sWxPGJTQvoTSdkORLG44gxrU+Sk2jB5Ojz+3Kg42bnfFghsXVzlw==
96+
xterm@5.3.0-beta.3:
97+
version "5.3.0-beta.3"
98+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.3.0-beta.3.tgz#1a1aaf9a57afe4dcf86e87d8dc85e80a41d68644"
99+
integrity sha512-NGxpV25U2W/KKk6M5V2OXuLgrKY+w05ABi66ZEYuCTi7ux1Qv0z+jm7bkgzk1pGGiTVLG+90OGr2nrhbFr5Y4w==

‎remote/yarn.lock‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -836,45 +836,45 @@ wrappy@1:
836836
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
837837
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
838838

839-
xterm-addon-canvas@0.5.0-beta.1:
840-
version "0.5.0-beta.1"
841-
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0-beta.1.tgz#b5ae185741423715460a66029c944b4dededfab0"
842-
integrity sha512-A7yjIpyTcOh8ckPJw1YFDvwbTbQ+grM+kTtutOvu5LjLSV9EoCHX17kVoiT2V29ywF7KJMeLYwfBwyFE3uA3QQ==
839+
xterm-addon-canvas@0.5.0-beta.2:
840+
version "0.5.0-beta.2"
841+
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0-beta.2.tgz#1b83c2a9a306766c47a4f80b8c65cc9ee5f5a5c4"
842+
integrity sha512-oTb/2krdbHYGxH2X6yiBZzAB/1WB+apUu4nXHdhBnht20bl8E+YVWqg95D4o0Gl+QJI+XOfB3mqmWaBx1x531A==
843843

844844
xterm-addon-image@0.4.1:
845845
version "0.4.1"
846846
resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.4.1.tgz#ec8f750af48005ad641c1128fa1f551ac198472a"
847847
integrity sha512-iJpYyvtbHg4oXSv+D6J73ZfCjnboZpbZ567MLplXDBlYSUknv3kvPTfVMPJATV7Zsx7+bDgyXboCh9vsDf/m/w==
848848

849-
xterm-addon-search@0.13.0-beta.1:
850-
version "0.13.0-beta.1"
851-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.13.0-beta.1.tgz#9fb6ede402d4c369d59d5d6faefe54a05b125bcf"
852-
integrity sha512-rdOIhwkfRASqTriUO8QP9UY0p6BosLMv1NXTZqhgq3/5xAXx4VZg6mlQjTRGnUz/GJIN1jU9e/Vp20SpocP/Hw==
849+
xterm-addon-search@0.13.0-beta.2:
850+
version "0.13.0-beta.2"
851+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.13.0-beta.2.tgz#c984a35312acad4ce768d17bc49adffa90eece61"
852+
integrity sha512-+VoPhIRmfiX2uh2t6xD/RJtBYjVjrkNa3dKQnOYEp4UbYzDjK57rZX652mnZ82TQfk/juxf7v+jV5aRdNLZVbA==
853853

854-
xterm-addon-serialize@0.11.0-beta.1:
855-
version "0.11.0-beta.1"
856-
resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.11.0-beta.1.tgz#a4bc1ef5d8b8db0180c07f071ce543536d806db1"
857-
integrity sha512-2I9Dq49nXUc6ymznwJp8SUsDq5owUdYviUy11HzLh35baDjzbG31CCu5Gs8KSlfUxpNRr3BxaV5/hx7MRPu7Qg==
854+
xterm-addon-serialize@0.11.0-beta.2:
855+
version "0.11.0-beta.2"
856+
resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.11.0-beta.2.tgz#fff924decfbf1bc08434317894f985fef7bb260b"
857+
integrity sha512-tN4IT2e+EIpsoFpMONUh1OAuoVAcV7AYOLsqMKgH6GNWB1D/LKGo3cwjpw1vwRZzDJJcCcLxYgxlUzhPbDbLxQ==
858858

859859
xterm-addon-unicode11@0.5.0:
860860
version "0.5.0"
861861
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0.tgz#41c0d96acc1e3bb6c6596eee64e163b6bca74be7"
862862
integrity sha512-Jm4/g4QiTxiKiTbYICQgC791ubhIZyoIwxAIgOW8z8HWFNY+lwk+dwaKEaEeGBfM48Vk8fklsUW9u/PlenYEBg==
863863

864-
xterm-addon-webgl@0.16.0-beta.1:
865-
version "0.16.0-beta.1"
866-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0-beta.1.tgz#e2b41c6b5f838724a5cb3cfa4231e2d1b8f3f130"
867-
integrity sha512-iJK+Uk+23Mh84BNa/44JqAdPESdNKN0ONfw6UztmDk2HTvsy47sU+d/lgF2kOcuI3ew2tRzK9YlupOUhVPwe9g==
864+
xterm-addon-webgl@0.16.0-beta.2:
865+
version "0.16.0-beta.2"
866+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0-beta.2.tgz#30489ef235405255ee54077002c90553531870d8"
867+
integrity sha512-DAt4E/QI1w34ToBhcDj0vaZOAHOO+ffwMt2HGDAB7amPXRcMb0LBIjLpyZhB9sD4tbIgsE0vuqZi1R9vKxZwbg==
868868

869-
xterm-headless@5.3.0-beta.1:
870-
version "5.3.0-beta.1"
871-
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.3.0-beta.1.tgz#8c7db703b9f57496c2f052411721c00909b08e8b"
872-
integrity sha512-6rsv6l44hLL9Eg2UrfAbCiZcAucdHuPyIsovl2BEmluo4chwd4LD7VINRlPV/x8ML2HgD9SohFyNs5BQAc07Gg==
869+
xterm-headless@5.3.0-beta.3:
870+
version "5.3.0-beta.3"
871+
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.3.0-beta.3.tgz#153cf330082f4b2aae64ff736ef0b62d93c30da8"
872+
integrity sha512-4i/bpFoAn4D4ZA4g8RKrJdhq2EcB1HN2E25yUg3omRbWCOZ2Gp9nAn+62LYzX5rvGqdNbpUTRJLX0lKwEFyLFw==
873873

874-
xterm@5.3.0-beta.1:
875-
version "5.3.0-beta.1"
876-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.3.0-beta.1.tgz#68e76f2818965592c60bb269360f1fc37219f4ae"
877-
integrity sha512-2v/Qmk1A0wO5oouRWUWZ3wxqtfFjxsQbZ1sWxPGJTQvoTSdkORLG44gxrU+Sk2jB5Ojz+3Kg42bnfFghsXVzlw==
874+
xterm@5.3.0-beta.3:
875+
version "5.3.0-beta.3"
876+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.3.0-beta.3.tgz#1a1aaf9a57afe4dcf86e87d8dc85e80a41d68644"
877+
integrity sha512-NGxpV25U2W/KKk6M5V2OXuLgrKY+w05ABi66ZEYuCTi7ux1Qv0z+jm7bkgzk1pGGiTVLG+90OGr2nrhbFr5Y4w==
878878

879879
yallist@^4.0.0:
880880
version "4.0.0"

‎src/vs/workbench/contrib/terminal/browser/terminal.ts‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ export interface ITerminalService extends ITerminalInstanceHost {
230230

231231
resolveLocation(location?: ITerminalLocationOptions): TerminalLocation | undefined;
232232
setNativeDelegate(nativeCalls: ITerminalServiceNativeDelegate): void;
233-
toggleEscapeSequenceLogging(): Promise<void>;
234233

235234
getEditingTerminal(): ITerminalInstance | undefined;
236235
setEditingTerminal(instance: ITerminalInstance | undefined): void;
@@ -240,8 +239,6 @@ export class TerminalLinkQuickPickEvent extends MouseEvent {
240239
}
241240
export interface ITerminalServiceNativeDelegate {
242241
getWindowCount(): Promise<number>;
243-
openDevTools(): Promise<void>;
244-
toggleDevTools(): Promise<void>;
245242
}
246243

247244
/**
@@ -857,16 +854,6 @@ export interface ITerminalInstance {
857854
*/
858855
toggleSizeToContentWidth(): Promise<void>;
859856

860-
/**
861-
* Toggles escape sequence logging in the devtools console.
862-
*/
863-
toggleEscapeSequenceLogging(): Promise<boolean>;
864-
865-
/**
866-
* Sets whether escape seqeunce logging is enabled in the devtools console.
867-
*/
868-
setEscapeSequenceLogging(enable: boolean): void;
869-
870857
/**
871858
* Gets the initial current working directory, fetching it from the backend if required.
872859
*/

‎src/vs/workbench/contrib/terminal/browser/terminalActions.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -928,13 +928,6 @@ export function registerTerminalActions() {
928928
}
929929
});
930930

931-
registerTerminalAction({
932-
id: TerminalCommandId.ToggleEscapeSequenceLogging,
933-
title: { value: localize('workbench.action.terminal.toggleEscapeSequenceLogging', "Toggle Escape Sequence Logging"), original: 'Toggle Escape Sequence Logging' },
934-
precondition: ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
935-
run: (c) => c.service.toggleEscapeSequenceLogging()
936-
});
937-
938931
registerTerminalAction({
939932
id: TerminalCommandId.SendSequence,
940933
title: terminalStrings.sendSequence,

‎src/vs/workbench/contrib/terminal/browser/terminalInstance.ts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,11 +1702,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
17021702
});
17031703
}
17041704

1705-
async setEscapeSequenceLogging(enable: boolean): Promise<void> {
1706-
const xterm = await this._xtermReadyPromise;
1707-
xterm.raw.options.logLevel = enable ? 'debug' : 'info';
1708-
}
1709-
17101705
@debounce(1000)
17111706
relaunch(): void {
17121707
this.reuseTerminal(this._shellLaunchConfig, true);
@@ -2110,12 +2105,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
21102105
this.statusList.add(info.getStatus({ workspaceFolder }));
21112106
}
21122107

2113-
async toggleEscapeSequenceLogging(): Promise<boolean> {
2114-
const xterm = await this._xtermReadyPromise;
2115-
xterm.raw.options.logLevel = xterm.raw.options.logLevel === 'debug' ? 'info' : 'debug';
2116-
return xterm.raw.options.logLevel === 'debug';
2117-
}
2118-
21192108
async getInitialCwd(): Promise<string> {
21202109
if (!this._initialCwd) {
21212110
this._initialCwd = this._processManager.initialCwd;

‎src/vs/workbench/contrib/terminal/browser/terminalService.ts‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ export class TerminalService implements ITerminalService {
6161
private _terminalEditorActive: IContextKey<boolean>;
6262
private readonly _terminalShellTypeContextKey: IContextKey<string>;
6363

64-
private _escapeSequenceLoggingEnabled: boolean = false;
65-
6664
private _isShuttingDown: boolean = false;
6765
private _backgroundedTerminalInstances: ITerminalInstance[] = [];
6866
private _backgroundedTerminalDisposables: Map<number, IDisposable[]> = new Map();
@@ -183,7 +181,6 @@ export class TerminalService implements ITerminalService {
183181
this._forwardInstanceHostEvents(this._terminalEditorService);
184182
this._terminalGroupService.onDidChangeActiveGroup(this._onDidChangeActiveGroup.fire, this._onDidChangeActiveGroup);
185183
this._terminalInstanceService.onDidCreateInstance(instance => {
186-
instance.setEscapeSequenceLogging(this._escapeSequenceLoggingEnabled);
187184
this._initInstanceListeners(instance);
188185
this._onDidCreateInstance.fire(instance);
189186
});
@@ -477,17 +474,6 @@ export class TerminalService implements ITerminalService {
477474
return reconnectCounter;
478475
}
479476

480-
async toggleEscapeSequenceLogging(): Promise<void> {
481-
if (this.instances.length === 0) {
482-
return;
483-
}
484-
this._escapeSequenceLoggingEnabled = await this.instances[0].toggleEscapeSequenceLogging();
485-
for (let i = 1; i < this.instances.length; i++) {
486-
this.instances[i].setEscapeSequenceLogging(this._escapeSequenceLoggingEnabled);
487-
}
488-
await this._toggleDevTools(this._escapeSequenceLoggingEnabled);
489-
}
490-
491477
private _attachProcessLayoutListeners(): void {
492478
this.onDidChangeActiveGroup(() => this._saveState());
493479
this.onDidChangeActiveInstance(() => this._saveState());
@@ -621,14 +607,6 @@ export class TerminalService implements ITerminalService {
621607
this._nativeDelegate = nativeDelegate;
622608
}
623609

624-
private async _toggleDevTools(open?: boolean): Promise<void> {
625-
if (open) {
626-
this._nativeDelegate?.openDevTools();
627-
} else {
628-
this._nativeDelegate?.toggleDevTools();
629-
}
630-
}
631-
632610
private _shouldReviveProcesses(reason: ShutdownReason): boolean {
633611
if (!this._configHelper.config.enablePersistentSessions) {
634612
return false;

0 commit comments

Comments
 (0)