Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2

src/vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution.ts

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './inputClipboardActions';
+import './selectionClipboard';
+import './sleepResumeRepaintMinimap';

src/vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts

@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import * as platform from 'vs/base/common/platform';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+
+if (platform.isMacintosh) {
+
+	// On the mac, cmd+x, cmd+c and cmd+v do not result in cut / copy / paste
+	// We therefore add a basic keybinding rule that invokes document.execCommand
+	// This is to cover <input>s...
+
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: 'execCut',
+		primary: KeyMod.CtrlCmd | KeyCode.KEY_X,
+		handler: bindExecuteCommand('cut'),
+		weight: 0,
+		when: undefined,
+	});
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: 'execCopy',
+		primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
+		handler: bindExecuteCommand('copy'),
+		weight: 0,
+		when: undefined,
+	});
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: 'execPaste',
+		primary: KeyMod.CtrlCmd | KeyCode.KEY_V,
+		handler: bindExecuteCommand('paste'),
+		weight: 0,
+		when: undefined,
+	});
+
+	function bindExecuteCommand(command: 'cut' | 'copy' | 'paste') {
+		return () => {
+			document.execCommand(command);
+		};
+	}
+}

src/vs/workbench/contrib/codeEditor/electron-sandbox/selectionClipboard.ts

@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { Disposable } from 'vs/base/common/lifecycle';
+import * as platform from 'vs/base/common/platform';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { registerEditorContribution, EditorAction, ServicesAccessor, registerEditorAction } from 'vs/editor/browser/editorExtensions';
+import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
+import { ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
+import { Range } from 'vs/editor/common/core/range';
+import { IEditorContribution, Handler } from 'vs/editor/common/editorCommon';
+import { EndOfLinePreference } from 'vs/editor/common/model';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+
+export class SelectionClipboard extends Disposable implements IEditorContribution {
+	private static readonly SELECTION_LENGTH_LIMIT = 65536;
+
+	constructor(editor: ICodeEditor, @IClipboardService clipboardService: IClipboardService) {
+		super();
+
+		if (platform.isLinux) {
+			let isEnabled = editor.getOption(EditorOption.selectionClipboard);
+
+			this._register(editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
+				if (e.hasChanged(EditorOption.selectionClipboard)) {
+					isEnabled = editor.getOption(EditorOption.selectionClipboard);
+				}
+			}));
+
+			let setSelectionToClipboard = this._register(new RunOnceScheduler(() => {
+				if (!editor.hasModel()) {
+					return;
+				}
+				let model = editor.getModel();
+				let selections = editor.getSelections();
+				selections = selections.slice(0);
+				selections.sort(Range.compareRangesUsingStarts);
+
+				let resultLength = 0;
+				for (const sel of selections) {
+					if (sel.isEmpty()) {
+						// Only write if all cursors have selection
+						return;
+					}
+					resultLength += model.getValueLengthInRange(sel);
+				}
+
+				if (resultLength > SelectionClipboard.SELECTION_LENGTH_LIMIT) {
+					// This is a large selection!
+					// => do not write it to the selection clipboard
+					return;
+				}
+
+				let result: string[] = [];
+				for (const sel of selections) {
+					result.push(model.getValueInRange(sel, EndOfLinePreference.TextDefined));
+				}
+
+				let textToCopy = result.join(model.getEOL());
+				clipboardService.writeText(textToCopy, 'selection');
+			}, 100));
+
+			this._register(editor.onDidChangeCursorSelection((e: ICursorSelectionChangedEvent) => {
+				if (!isEnabled) {
+					return;
+				}
+				if (e.source === 'restoreState') {
+					// do not set selection to clipboard if this selection change
+					// was caused by restoring editors...
+					return;
+				}
+				setSelectionToClipboard.schedule();
+			}));
+		}
+	}
+
+	public dispose(): void {
+		super.dispose();
+	}
+}
+
+class SelectionClipboardPastePreventer implements IWorkbenchContribution {
+	constructor(
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		if (platform.isLinux) {
+			document.addEventListener('mouseup', (e) => {
+				if (e.button === 1) {
+					// middle button
+					const config = configurationService.getValue<{ selectionClipboard: boolean; }>('editor');
+					if (!config.selectionClipboard) {
+						// selection clipboard is disabled
+						// try to stop the upcoming paste
+						e.preventDefault();
+					}
+				}
+			});
+		}
+	}
+}
+
+class PasteSelectionClipboardAction extends EditorAction {
+
+	constructor() {
+		super({
+			id: 'editor.action.selectionClipboardPaste',
+			label: nls.localize('actions.pasteSelectionClipboard', "Paste Selection Clipboard"),
+			alias: 'Paste Selection Clipboard',
+			precondition: EditorContextKeys.writable
+		});
+	}
+
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Promise<void> {
+		const clipboardService = accessor.get(IClipboardService);
+
+		// read selection clipboard
+		const text = await clipboardService.readText('selection');
+
+		editor.trigger('keyboard', Handler.Paste, {
+			text: text,
+			pasteOnNewLine: false,
+			multicursorText: null
+		});
+	}
+}
+
+registerEditorContribution(SelectionClipboardContributionID, SelectionClipboard);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(SelectionClipboardPastePreventer, LifecyclePhase.Ready);
+if (platform.isLinux) {
+	registerEditorAction(PasteSelectionClipboardAction);
+}

src/vs/workbench/contrib/codeEditor/electron-sandbox/sleepResumeRepaintMinimap.ts

@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
+import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+
+class SleepResumeRepaintMinimap implements IWorkbenchContribution {
+
+	constructor(
+		@ICodeEditorService codeEditorService: ICodeEditorService
+	) {
+		ipcRenderer.on('vscode:osResume', () => {
+			codeEditorService.listCodeEditors().forEach(editor => editor.render(true));
+		});
+	}
+}
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(SleepResumeRepaintMinimap, LifecyclePhase.Eventually);