1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { fail } from 'assert';
import { Emitter } from 'vs/base/common/event';
import { TerminalLocation } from 'vs/platform/terminal/common/terminal';
import { TerminalService } from 'vs/workbench/contrib/terminal/browser/terminalService';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { TestEditorService, TestLifecycleService, TestRemoteAgentService, TestTerminalEditorService, TestTerminalGroupService, TestTerminalInstanceService, TestTerminalProfileService } from 'vs/workbench/test/browser/workbenchTestServices';
import { ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
import { ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
suite('Workbench - TerminalService', () => {
let instantiationService: TestInstantiationService;
let terminalService: TerminalService;
let configurationService: TestConfigurationService;
let dialogService: TestDialogService;
setup(async () => {
dialogService = new TestDialogService();
configurationService = new TestConfigurationService({
terminal: {
integrated: {
fontWeight: 'normal'
}
}
});
instantiationService = new TestInstantiationService();
instantiationService.stub(IConfigurationService, configurationService);
instantiationService.stub(IContextKeyService, instantiationService.createInstance(ContextKeyService));
instantiationService.stub(ILifecycleService, new TestLifecycleService());
instantiationService.stub(IThemeService, new TestThemeService());
instantiationService.stub(IEditorService, new TestEditorService());
instantiationService.stub(ITerminalEditorService, new TestTerminalEditorService());
instantiationService.stub(ITerminalGroupService, new TestTerminalGroupService());
instantiationService.stub(ITerminalInstanceService, new TestTerminalInstanceService());
instantiationService.stub(ITerminalProfileService, new TestTerminalProfileService());
instantiationService.stub(IRemoteAgentService, new TestRemoteAgentService());
instantiationService.stub(IRemoteAgentService, 'getConnection', null);
instantiationService.stub(IDialogService, dialogService);
terminalService = instantiationService.createInstance(TerminalService);
instantiationService.stub(ITerminalService, terminalService);
});
suite('safeDisposeTerminal', () => {
let onExitEmitter: Emitter<number | undefined>;
setup(() => {
onExitEmitter = new Emitter<number | undefined>();
});
test('should not show prompt when confirmOnKill is never', async () => {
setConfirmOnKill(configurationService, 'never');
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Editor,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
});
test('should not show prompt when any terminal editor is closed (handled by editor itself)', async () => {
setConfirmOnKill(configurationService, 'editor');
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Editor,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
setConfirmOnKill(configurationService, 'always');
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Editor,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
});
test('should not show prompt when confirmOnKill is editor and panel terminal is closed', async () => {
setConfirmOnKill(configurationService, 'editor');
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
});
test('should show prompt when confirmOnKill is panel and panel terminal is closed', async () => {
setConfirmOnKill(configurationService, 'panel');
// No child process cases
dialogService.setConfirmResult({ confirmed: false });
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: false,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
dialogService.setConfirmResult({ confirmed: true });
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: false,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
// Child process cases
dialogService.setConfirmResult({ confirmed: false });
await terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
dispose: () => fail()
} as Partial<ITerminalInstance> as any);
dialogService.setConfirmResult({ confirmed: true });
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
});
test('should show prompt when confirmOnKill is always and panel terminal is closed', async () => {
setConfirmOnKill(configurationService, 'always');
// No child process cases
dialogService.setConfirmResult({ confirmed: false });
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: false,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
dialogService.setConfirmResult({ confirmed: true });
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: false,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
// Child process cases
dialogService.setConfirmResult({ confirmed: false });
await terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
dispose: () => fail()
} as Partial<ITerminalInstance> as any);
dialogService.setConfirmResult({ confirmed: true });
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
});
});
});
async function setConfirmOnKill(configurationService: TestConfigurationService, value: 'never' | 'always' | 'panel' | 'editor') {
await configurationService.setUserConfiguration('terminal', { integrated: { confirmOnKill: value } });
configurationService.onDidChangeConfigurationEmitter.fire({
affectsConfiguration: () => true,
affectedKeys: ['terminal.integrated.confirmOnKill']
} as any);
}
|
