window.ts 20.0 KB
Newer Older
E
Erich Gamma 已提交
1 2 3 4 5 6 7
/*---------------------------------------------------------------------------------------------
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

'use strict';

8
import * as nls from 'vs/nls';
9
import URI from 'vs/base/common/uri';
10 11
import * as errors from 'vs/base/common/errors';
import * as types from 'vs/base/common/types';
J
Johannes Rieken 已提交
12
import { TPromise } from 'vs/base/common/winjs.base';
13 14 15
import * as arrays from 'vs/base/common/arrays';
import * as objects from 'vs/base/common/objects';
import * as DOM from 'vs/base/browser/dom';
16 17
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
import { IAction, Action } from 'vs/base/common/actions';
18
import { AutoSaveConfiguration, IFileService } from 'vs/platform/files/common/files';
B
Benjamin Pasero 已提交
19
import { toResource, IUntitledResourceInput } from 'vs/workbench/common/editor';
20
import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
J
Johannes Rieken 已提交
21
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
22
import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
23
import { IWindowsService, IWindowService, IWindowSettings, IPath, IOpenFileRequest, IWindowsConfiguration, IAddFoldersRequest, IRunActionInWindowRequest } from 'vs/platform/windows/common/windows';
24 25
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
B
Benjamin Pasero 已提交
26
import { ITitleService } from 'vs/workbench/services/title/common/titleService';
27
import { IWorkbenchThemeService, VS_HC_THEME, VS_DARK_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService';
28 29
import * as browser from 'vs/base/browser/browser';
import { ICommandService } from 'vs/platform/commands/common/commands';
B
Benjamin Pasero 已提交
30
import { IResourceInput } from 'vs/platform/editor/common/editor';
31
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
A
Alex Dima 已提交
32
import { KeyboardMapperFactory } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
33
import { Themable } from 'vs/workbench/common/theme';
34
import { ipcRenderer as ipc, webFrame } from 'electron';
35
import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
36 37
import { IMenuService, MenuId, IMenu, MenuItemAction, ICommandAction } from 'vs/platform/actions/common/actions';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
38
import { fillInActionBarActions } from 'vs/platform/actions/browser/menuItemActionItem';
39 40
import { RunOnceScheduler } from 'vs/base/common/async';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
I
isidor 已提交
41
import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
42
import { LifecyclePhase, ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
43
import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
44 45 46
import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
import { AccessibilitySupport, isRootUser, isWindows, isMacintosh } from 'vs/base/common/platform';
import product from 'vs/platform/node/product';
47
import { INotificationService } from 'vs/platform/notification/common/notification';
B
Benjamin Pasero 已提交
48
import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
E
Erich Gamma 已提交
49

50 51 52 53 54 55 56 57 58 59 60
const TextInputActions: IAction[] = [
	new Action('undo', nls.localize('undo', "Undo"), null, true, () => document.execCommand('undo') && TPromise.as(true)),
	new Action('redo', nls.localize('redo', "Redo"), null, true, () => document.execCommand('redo') && TPromise.as(true)),
	new Separator(),
	new Action('editor.action.clipboardCutAction', nls.localize('cut', "Cut"), null, true, () => document.execCommand('cut') && TPromise.as(true)),
	new Action('editor.action.clipboardCopyAction', nls.localize('copy', "Copy"), null, true, () => document.execCommand('copy') && TPromise.as(true)),
	new Action('editor.action.clipboardPasteAction', nls.localize('paste', "Paste"), null, true, () => document.execCommand('paste') && TPromise.as(true)),
	new Separator(),
	new Action('editor.action.selectAll', nls.localize('selectAll', "Select All"), null, true, () => document.execCommand('selectAll') && TPromise.as(true))
];

61
export class ElectronWindow extends Themable {
62

63
	private static readonly AUTO_SAVE_SETTING = 'files.autoSave';
64

65 66
	private touchBarMenu: IMenu;
	private touchBarUpdater: RunOnceScheduler;
67 68 69 70 71
	private touchBarDisposables: IDisposable[];
	private lastInstalledTouchedBar: ICommandAction[][];

	private previousConfiguredZoomLevel: number;

72 73 74
	private addFoldersScheduler: RunOnceScheduler;
	private pendingFoldersToAdd: IAddFoldersRequest[];

E
Erich Gamma 已提交
75 76
	constructor(
		shellContainer: HTMLElement,
B
Benjamin Pasero 已提交
77
		@IEditorService private editorService: EditorServiceImpl,
78
		@IWindowsService private windowsService: IWindowsService,
B
Benjamin Pasero 已提交
79
		@IWindowService private windowService: IWindowService,
80 81
		@IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService,
		@ITitleService private titleService: ITitleService,
82
		@IWorkbenchThemeService protected themeService: IWorkbenchThemeService,
83
		@INotificationService private notificationService: INotificationService,
84 85 86 87
		@ICommandService private commandService: ICommandService,
		@IExtensionService private extensionService: IExtensionService,
		@IContextMenuService private contextMenuService: IContextMenuService,
		@IKeybindingService private keybindingService: IKeybindingService,
88
		@ITelemetryService private telemetryService: ITelemetryService,
89
		@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,
90
		@IFileService private fileService: IFileService,
91
		@IMenuService private menuService: IMenuService,
92 93
		@ILifecycleService private lifecycleService: ILifecycleService,
		@IIntegrityService private integrityService: IIntegrityService
E
Erich Gamma 已提交
94
	) {
95 96
		super(themeService);

97 98
		this.touchBarDisposables = [];

99 100 101 102
		this.pendingFoldersToAdd = [];
		this.addFoldersScheduler = new RunOnceScheduler(() => this.doAddFolders(), 100);
		this.toUnbind.push(this.addFoldersScheduler);

E
Erich Gamma 已提交
103
		this.registerListeners();
104
		this.create();
E
Erich Gamma 已提交
105 106 107 108
	}

	private registerListeners(): void {

109
		// React to editor input changes
B
Benjamin Pasero 已提交
110
		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.updateTouchbarMenu()));
E
Erich Gamma 已提交
111

112
		// prevent opening a real URL inside the shell
113 114 115 116
		[DOM.EventType.DRAG_OVER, DOM.EventType.DROP].forEach(event => {
			window.document.body.addEventListener(event, (e: DragEvent) => {
				DOM.EventHelper.stop(e);
			});
E
Erich Gamma 已提交
117 118
		});

119
		// Support runAction event
120
		ipc.on('vscode:runAction', (event: any, request: IRunActionInWindowRequest) => {
121 122 123 124 125
			const args: any[] = [];

			// If we run an action from the touchbar, we fill in the currently active resource
			// as payload because the touch bar items are context aware depending on the editor
			if (request.from === 'touchbar') {
B
Benjamin Pasero 已提交
126
				const activeEditor = this.editorService.activeEditor;
127
				if (activeEditor) {
B
Benjamin Pasero 已提交
128
					const resource = toResource(activeEditor, { supportSideBySide: true });
129 130 131 132 133 134 135 136 137
					if (resource) {
						args.push(resource);
					}
				}
			} else {
				args.push({ from: request.from }); // TODO@telemetry this is a bit weird to send this to every action?
			}

			this.commandService.executeCommand(request.id, ...args).done(_ => {
K
kieferrm 已提交
138
				/* __GDPR__
K
kieferrm 已提交
139 140 141 142 143
					"commandExecuted" : {
						"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
						"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
144
				this.telemetryService.publicLog('commandExecuted', { id: request.id, from: request.from });
J
Johannes Rieken 已提交
145
			}, err => {
146
				this.notificationService.error(err);
J
Johannes Rieken 已提交
147
			});
148 149 150
		});

		// Support resolve keybindings event
151
		ipc.on('vscode:resolveKeybindings', (event: any, rawActionIds: string) => {
152 153 154 155 156 157 158 159
			let actionIds: string[] = [];
			try {
				actionIds = JSON.parse(rawActionIds);
			} catch (error) {
				// should not happen
			}

			// Resolve keys using the keybinding service and send back to browser process
160
			this.resolveKeybindings(actionIds).done(keybindings => {
161 162 163 164 165 166
				if (keybindings.length) {
					ipc.send('vscode:keybindingsResolved', JSON.stringify(keybindings));
				}
			}, () => errors.onUnexpectedError);
		});

167
		ipc.on('vscode:reportError', (event: any, error: string) => {
168 169 170 171 172 173 174 175
			if (error) {
				const errorParsed = JSON.parse(error);
				errorParsed.mainProcess = true;
				errors.onUnexpectedError(errorParsed);
			}
		});

		// Support openFiles event for existing and new files
176
		ipc.on('vscode:openFiles', (event: any, request: IOpenFileRequest) => this.onOpenFiles(request));
177

178
		// Support addFolders event if we have a workspace opened
179
		ipc.on('vscode:addFolders', (event: any, request: IAddFoldersRequest) => this.onAddFoldersRequest(request));
180

181
		// Message support
182
		ipc.on('vscode:showInfoMessage', (event: any, message: string) => {
183
			this.notificationService.info(message);
184 185 186
		});

		// Support toggling auto save
187
		ipc.on('vscode.toggleAutoSave', () => {
188 189 190 191
			this.toggleAutoSave();
		});

		// Fullscreen Events
192
		ipc.on('vscode:enterFullScreen', () => {
193
			this.lifecycleService.when(LifecyclePhase.Running).then(() => {
194 195 196 197
				browser.setFullscreen(true);
			});
		});

198
		ipc.on('vscode:leaveFullScreen', () => {
199
			this.lifecycleService.when(LifecyclePhase.Running).then(() => {
200 201 202 203 204
				browser.setFullscreen(false);
			});
		});

		// High Contrast Events
205
		ipc.on('vscode:enterHighContrast', () => {
206
			const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
207
			if (windowConfig && windowConfig.autoDetectHighContrast) {
208
				this.lifecycleService.when(LifecyclePhase.Running).then(() => {
M
Martin Aeschlimann 已提交
209
					this.themeService.setColorTheme(VS_HC_THEME, null);
210 211
				});
			}
212 213
		});

214
		ipc.on('vscode:leaveHighContrast', () => {
215
			const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
216
			if (windowConfig && windowConfig.autoDetectHighContrast) {
217
				this.lifecycleService.when(LifecyclePhase.Running).then(() => {
M
Martin Aeschlimann 已提交
218
					this.themeService.setColorTheme(VS_DARK_THEME, null);
219 220
				});
			}
221 222
		});

A
Alex Dima 已提交
223
		// keyboard layout changed event
224
		ipc.on('vscode:keyboardLayoutChanged', () => {
225
			KeyboardMapperFactory.INSTANCE._onKeyboardLayoutChanged();
A
Alex Dima 已提交
226 227
		});

228
		// keyboard layout changed event
229
		ipc.on('vscode:accessibilitySupportChanged', (event: any, accessibilitySupportEnabled: boolean) => {
230
			browser.setAccessibilitySupport(accessibilitySupportEnabled ? AccessibilitySupport.Enabled : AccessibilitySupport.Disabled);
231 232
		});

S
Sandeep Somavarapu 已提交
233 234 235 236 237 238 239
		// Zoom level changes
		this.updateWindowZoomLevel();
		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => {
			if (e.affectsConfiguration('window.zoomLevel')) {
				this.updateWindowZoomLevel();
			}
		}));
240

241 242 243
		// Context menu support in input/textarea
		window.document.addEventListener('contextmenu', e => this.onContextMenu(e));
	}
244

245 246 247 248 249 250
	private onContextMenu(e: PointerEvent): void {
		if (e.target instanceof HTMLElement) {
			const target = <HTMLElement>e.target;
			if (target.nodeName && (target.nodeName.toLowerCase() === 'input' || target.nodeName.toLowerCase() === 'textarea')) {
				e.preventDefault();
				e.stopPropagation();
251

252 253 254 255
				this.contextMenuService.showContextMenu({
					getAnchor: () => e,
					getActions: () => TPromise.as(TextInputActions)
				});
256
			}
257 258 259
		}
	}

S
Sandeep Somavarapu 已提交
260
	private updateWindowZoomLevel(): void {
261
		const windowConfig: IWindowsConfiguration = this.configurationService.getValue<IWindowsConfiguration>();
262 263 264 265

		let newZoomLevel = 0;
		if (windowConfig.window && typeof windowConfig.window.zoomLevel === 'number') {
			newZoomLevel = windowConfig.window.zoomLevel;
266

267 268 269
			// Leave early if the configured zoom level did not change (https://github.com/Microsoft/vscode/issues/1536)
			if (this.previousConfiguredZoomLevel === newZoomLevel) {
				return;
270
			}
271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295

			this.previousConfiguredZoomLevel = newZoomLevel;
		}

		if (webFrame.getZoomLevel() !== newZoomLevel) {
			webFrame.setZoomLevel(newZoomLevel);
			browser.setZoomFactor(webFrame.getZoomFactor());
			// See https://github.com/Microsoft/vscode/issues/26151
			// Cannot be trusted because the webFrame might take some time
			// until it really applies the new zoom level
			browser.setZoomLevel(webFrame.getZoomLevel(), /*isTrusted*/false);
		}
	}

	private create(): void {

		// Handle window.open() calls
		const $this = this;
		(<any>window).open = function (url: string, target: string, features: string, replace: boolean): any {
			$this.windowsService.openExternal(url);

			return null;
		};

		// Emit event when vscode has loaded
296
		this.lifecycleService.when(LifecyclePhase.Running).then(() => {
297 298 299
			ipc.send('vscode:workbenchLoaded', this.windowService.getCurrentWindowId());
		});

300 301 302 303 304 305 306 307 308
		// Integrity warning
		this.integrityService.isPure().then(res => this.titleService.updateProperties({ isPure: res.isPure }));

		// Root warning
		this.lifecycleService.when(LifecyclePhase.Running).then(() => {
			let isAdminPromise: Promise<boolean>;
			if (isWindows) {
				isAdminPromise = import('native-is-elevated').then(isElevated => isElevated());
			} else {
A
Alex Dima 已提交
309
				isAdminPromise = Promise.resolve(isRootUser());
310 311 312 313 314 315 316
			}

			return isAdminPromise.then(isAdmin => {

				// Update title
				this.titleService.updateProperties({ isAdmin });

317 318
				// Show warning message (unix only)
				if (isAdmin && !isWindows) {
319
					this.notificationService.warn(nls.localize('runningAsRoot', "It is not recommended to run {0} as root user.", product.nameShort));
320 321 322
				}
			});
		});
323 324 325

		// Touchbar menu (if enabled)
		this.updateTouchbarMenu();
326 327 328
	}

	private updateTouchbarMenu(): void {
329 330 331 332 333
		if (
			!isMacintosh || // macOS only
			!this.configurationService.getValue<boolean>('keyboard.touchbar.enabled') // disabled via setting
		) {
			return;
334 335
		}

336 337
		// Dispose old
		this.touchBarDisposables = dispose(this.touchBarDisposables);
338
		this.touchBarMenu = void 0;
339

340 341 342 343
		// Create new (delayed)
		this.touchBarUpdater = new RunOnceScheduler(() => this.doUpdateTouchbarMenu(), 300);
		this.touchBarDisposables.push(this.touchBarUpdater);
		this.touchBarUpdater.schedule();
344 345
	}

346 347 348 349 350 351 352
	private doUpdateTouchbarMenu(): void {
		if (!this.touchBarMenu) {
			this.touchBarMenu = this.editorService.invokeWithinEditorContext(accessor => this.menuService.createMenu(MenuId.TouchBarContext, accessor.get(IContextKeyService)));
			this.touchBarDisposables.push(this.touchBarMenu);
			this.touchBarDisposables.push(this.touchBarMenu.onDidChange(() => this.touchBarUpdater.schedule()));
		}

353 354 355
		const actions: (MenuItemAction | Separator)[] = [];

		// Fill actions into groups respecting order
356
		fillInActionBarActions(this.touchBarMenu, void 0, actions);
357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372

		// Convert into command action multi array
		const items: ICommandAction[][] = [];
		let group: ICommandAction[] = [];
		for (let i = 0; i < actions.length; i++) {
			const action = actions[i];

			// Command
			if (action instanceof MenuItemAction) {
				group.push(action.item);
			}

			// Separator
			else if (action instanceof Separator) {
				if (group.length) {
					items.push(group);
373
				}
374 375

				group = [];
376
			}
377 378 379 380 381 382 383 384 385 386 387
		}

		if (group.length) {
			items.push(group);
		}

		// Only update if the actions have changed
		if (!objects.equals(this.lastInstalledTouchedBar, items)) {
			this.lastInstalledTouchedBar = items;
			this.windowService.updateTouchBar(items);
		}
388 389
	}

390
	private resolveKeybindings(actionIds: string[]): TPromise<{ id: string; label: string, isNative: boolean; }[]> {
391
		return TPromise.join([this.lifecycleService.when(LifecyclePhase.Running), this.extensionService.whenInstalledExtensionsRegistered()]).then(() => {
392
			return arrays.coalesce(actionIds.map(id => {
393
				const binding = this.keybindingService.lookupKeybinding(id);
394 395 396
				if (!binding) {
					return null;
				}
397

398 399 400 401 402
				// first try to resolve a native accelerator
				const electronAccelerator = binding.getElectronAccelerator();
				if (electronAccelerator) {
					return { id, label: electronAccelerator, isNative: true };
				}
403

404 405 406 407
				// we need this fallback to support keybindings that cannot show in electron menus (e.g. chords)
				const acceleratorLabel = binding.getLabel();
				if (acceleratorLabel) {
					return { id, label: acceleratorLabel, isNative: false };
408 409 410 411 412 413 414
				}

				return null;
			}));
		});
	}

415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433
	private onAddFoldersRequest(request: IAddFoldersRequest): void {

		// Buffer all pending requests
		this.pendingFoldersToAdd.push(request);

		// Delay the adding of folders a bit to buffer in case more requests are coming
		if (!this.addFoldersScheduler.isScheduled()) {
			this.addFoldersScheduler.schedule();
		}
	}

	private doAddFolders(): void {
		const foldersToAdd: IWorkspaceFolderCreationData[] = [];

		this.pendingFoldersToAdd.forEach(request => {
			foldersToAdd.push(...request.foldersToAdd.map(folderToAdd => ({ uri: URI.file(folderToAdd.filePath) })));
		});

		this.pendingFoldersToAdd = [];
434

435
		this.workspaceEditingService.addFolders(foldersToAdd).done(null, errors.onUnexpectedError);
436 437
	}

438
	private onOpenFiles(request: IOpenFileRequest): void {
B
Benjamin Pasero 已提交
439
		const inputs: IResourceEditor[] = [];
440
		const diffMode = (request.filesToDiff.length === 2);
441 442 443 444 445 446 447 448 449 450 451 452 453 454

		if (!diffMode && request.filesToOpen) {
			inputs.push(...this.toInputs(request.filesToOpen, false));
		}

		if (!diffMode && request.filesToCreate) {
			inputs.push(...this.toInputs(request.filesToCreate, true));
		}

		if (diffMode) {
			inputs.push(...this.toInputs(request.filesToDiff, false));
		}

		if (inputs.length) {
455
			this.openResources(inputs, diffMode).then(null, errors.onUnexpectedError);
456
		}
457 458 459 460 461 462 463

		if (request.filesToWait && inputs.length) {
			// In wait mode, listen to changes to the editors and wait until the files
			// are closed that the user wants to wait for. When this happens we delete
			// the wait marker file to signal to the outside that editing is done.
			const resourcesToWaitFor = request.filesToWait.paths.map(p => URI.file(p.filePath));
			const waitMarkerFile = URI.file(request.filesToWait.waitMarkerFilePath);
B
Benjamin Pasero 已提交
464 465
			const unbind = this.editorService.onDidCloseEditor(() => {
				if (resourcesToWaitFor.every(resource => !this.editorService.isOpen({ resource }))) {
466 467 468 469 470
					unbind.dispose();
					this.fileService.del(waitMarkerFile).done(null, errors.onUnexpectedError);
				}
			});
		}
471 472
	}

B
Benjamin Pasero 已提交
473 474
	private openResources(resources: (IResourceInput | IUntitledResourceInput)[], diffMode: boolean): Thenable<any> {
		return this.lifecycleService.when(LifecyclePhase.Running).then((): TPromise<any> => {
N
Nick Snyder 已提交
475

476
			// In diffMode we open 2 resources as diff
477
			if (diffMode && resources.length === 2) {
478
				return this.editorService.openEditor({ leftResource: resources[0].resource, rightResource: resources[1].resource, options: { pinned: true } });
479 480 481 482 483 484 485 486
			}

			// For one file, just put it into the current active editor
			if (resources.length === 1) {
				return this.editorService.openEditor(resources[0]);
			}

			// Otherwise open all
B
Benjamin Pasero 已提交
487
			return this.editorService.openEditors(resources);
488 489 490
		});
	}

B
Benjamin Pasero 已提交
491
	private toInputs(paths: IPath[], isNew: boolean): IResourceEditor[] {
492
		return paths.map(p => {
493 494 495 496 497 498 499
			const resource = URI.file(p.filePath);
			let input: IResourceInput | IUntitledResourceInput;
			if (isNew) {
				input = { filePath: resource.fsPath, options: { pinned: true } } as IUntitledResourceInput;
			} else {
				input = { resource, options: { pinned: true } } as IResourceInput;
			}
500 501 502 503 504 505 506 507 508 509 510 511 512

			if (!isNew && p.lineNumber) {
				input.options.selection = {
					startLineNumber: p.lineNumber,
					startColumn: p.columnNumber
				};
			}

			return input;
		});
	}

	private toggleAutoSave(): void {
513
		const setting = this.configurationService.inspect(ElectronWindow.AUTO_SAVE_SETTING);
514 515 516 517 518 519 520 521 522 523 524 525
		let userAutoSaveConfig = setting.user;
		if (types.isUndefinedOrNull(userAutoSaveConfig)) {
			userAutoSaveConfig = setting.default; // use default if setting not defined
		}

		let newAutoSaveValue: string;
		if ([AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE].some(s => s === userAutoSaveConfig)) {
			newAutoSaveValue = AutoSaveConfiguration.OFF;
		} else {
			newAutoSaveValue = AutoSaveConfiguration.AFTER_DELAY;
		}

526
		this.configurationService.updateValue(ElectronWindow.AUTO_SAVE_SETTING, newAutoSaveValue, ConfigurationTarget.USER);
527
	}
528 529 530 531 532 533

	public dispose(): void {
		this.touchBarDisposables = dispose(this.touchBarDisposables);

		super.dispose();
	}
J
Johannes Rieken 已提交
534
}