Move most code editor contributions to /browser/ (#69102)

src/tsconfig.strictNullChecks.json

@@ -142,19 +142,18 @@
 		"./vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts",
 		"./vs/workbench/contrib/codeEditor/browser/menuPreventer.ts",
 		"./vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/accessibility.ts",
+		"./vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts",
 		"./vs/workbench/contrib/codeEditor/electron-browser/inspectKeybindings.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/simpleEditorOptions.ts",
+		"./vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts",
+		"./vs/workbench/contrib/codeEditor/browser/selectionClipboard.ts",
 		"./vs/workbench/contrib/codeEditor/electron-browser/sleepResumeRepaintMinimap.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/suggestEnabledInput.ts",
+		"./vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts",
 		"./vs/workbench/contrib/codeEditor/electron-browser/textMate/inspectTMScopes.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/toggleMinimap.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/toggleMultiCursorModifier.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/toggleRenderControlCharacter.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/toggleRenderWhitespace.ts",
-		"./vs/workbench/contrib/codeEditor/electron-browser/toggleWordWrap.ts",
+		"./vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts",
+		"./vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.ts",
+		"./vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts",
+		"./vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.ts",
+		"./vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts",
 		"./vs/workbench/contrib/codeinset/common/codeInset.ts",
 		"./vs/workbench/contrib/comments/common/commentModel.ts",
 		"./vs/workbench/contrib/comments/electron-browser/commentGlyphWidget.ts",

src/vs/platform/clipboard/common/clipboardService.ts

@@ -15,12 +15,12 @@ export interface IClipboardService {
 	/**
 	 * Writes text to the system clipboard.
 	 */
-	writeText(text: string): void;
+	writeText(text: string, type?: string): void;
 
 	/**
 	 * Reads the content of the clipboard in plain text
 	 */
-	readText(): string;
+	readText(type?: string): string;
 
 	/**
 	 * Reads text from the system find pasteboard.

src/vs/platform/clipboard/electron-browser/clipboardService.ts

@@ -15,12 +15,12 @@ export class ClipboardService implements IClipboardService {
 
 	_serviceBrand: any;
 
-	public writeText(text: string): void {
-		clipboard.writeText(text);
+	public writeText(text: string, type?: string): void {
+		clipboard.writeText(text, type);
 	}
 
-	public readText(): string {
-		return clipboard.readText();
+	public readText(type?: string): string {
+		return clipboard.readText(type);
 	}
 
 	public readFindText(): string {

src/vs/workbench/api/electron-browser/extensionHost.contribution.ts

@@ -11,7 +11,7 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 // --- other interested parties
 import { JSONValidationExtensionPoint } from 'vs/workbench/api/common/jsonValidationExtensionPoint';
 import { ColorExtensionPoint } from 'vs/workbench/services/themes/common/colorExtensionPoint';
-import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint';
+import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint';
 
 // --- mainThread participants
 import 'vs/workbench/api/node/apiCommands';

src/vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts → src/vs/workbench/contrib/codeEditor/browser/selectionClipboard.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { clipboard } from 'electron';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { Disposable } from 'vs/base/common/lifecycle';
 import * as platform from 'vs/base/common/platform';
@@ -14,13 +13,13 @@ import { ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursor
 import { Range } from 'vs/editor/common/core/range';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { EndOfLinePreference } from 'vs/editor/common/model';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 
 export class SelectionClipboard extends Disposable implements IEditorContribution {
 	private static SELECTION_LENGTH_LIMIT = 65536;
 	private static readonly ID = 'editor.contrib.selectionClipboard';
 
-	constructor(editor: ICodeEditor, @IContextKeyService contextKeyService: IContextKeyService) {
+	constructor(editor: ICodeEditor, @IClipboardService clipboardService: IClipboardService) {
 		super();
 
 		if (platform.isLinux) {
@@ -53,7 +52,7 @@ export class SelectionClipboard extends Disposable implements IEditorContributio
 
 					process.nextTick(() => {
 						// TODO@Alex: electron weirdness: calling clipboard.readText('selection') generates a paste event, so no need to execute paste ourselves
-						clipboard.readText('selection');
+						clipboardService.readText('selection');
 						// keybindingService.executeCommand(Handler.Paste, {
 						// 	text: clipboard.readText('selection'),
 						// 	pasteOnNewLine: false
@@ -92,7 +91,7 @@ export class SelectionClipboard extends Disposable implements IEditorContributio
 				}
 
 				let textToCopy = result.join(model.getEOL());
-				clipboard.writeText(textToCopy, 'selection');
+				clipboardService.writeText(textToCopy, 'selection');
 			}, 100));
 
 			this._register(editor.onDidChangeCursorSelection((e: ICursorSelectionChangedEvent) => {

src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts

@@ -4,6 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
+import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu';
+import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
+import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
+import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
+import { SelectionClipboard } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
+import { TabCompletionController } from 'vs/workbench/contrib/snippets/browser/tabCompletion';
 
 export function getSimpleEditorOptions(): IEditorOptions {
 	return {
@@ -29,3 +36,17 @@ export function getSimpleEditorOptions(): IEditorOptions {
 		}
 	};
 }
+
+export function getSimpleCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
+	return {
+		isSimpleWidget: true,
+		contributions: [
+			MenuPreventer,
+			SelectionClipboard,
+			ContextMenuController,
+			SuggestController,
+			SnippetController2,
+			TabCompletionController,
+		]
+	};
+}

src/vs/workbench/contrib/codeEditor/electron-browser/suggestEnabledInput.ts → src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/suggestEnabledInput';
+import 'vs/css!./suggestEnabledInput';
 import { $, Dimension, addClass, append, removeClass } from 'vs/base/browser/dom';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { Color } from 'vs/base/common/color';
@@ -31,7 +31,7 @@ import { IStyleOverrides, IThemable, attachStyler } from 'vs/platform/theme/comm
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
 import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { SelectionClipboard } from 'vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard';
+import { SelectionClipboard } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
 
 interface SuggestResultsProvider {
 	/**

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

@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import '../browser/menuPreventer';
-import './accessibility';
+import '../browser/accessibility/accessibility';
 import './inspectKeybindings';
 import '../browser/largeFileOptimizations';
-import './selectionClipboard';
+import '../browser/selectionClipboard';
 import './sleepResumeRepaintMinimap';
 import './textMate/inspectTMScopes';
-import './toggleMinimap';
-import './toggleMultiCursorModifier';
-import './toggleRenderControlCharacter';
-import './toggleRenderWhitespace';
-import './toggleWordWrap';
-import './workbenchReferenceSearch';
\ No newline at end of file
+import '../browser/toggleMinimap';
+import '../browser/toggleMultiCursorModifier';
+import '../browser/toggleRenderControlCharacter';
+import '../browser/toggleRenderWhitespace';
+import '../browser/toggleWordWrap';
+import '../browser/workbenchReferenceSearch';
\ No newline at end of file

src/vs/workbench/contrib/codeEditor/electron-browser/simpleEditorOptions.ts

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu';
-import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
-import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
-import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { SelectionClipboard } from 'vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard';
-import { TabCompletionController } from 'vs/workbench/contrib/snippets/browser/tabCompletion';
-
-export function getSimpleCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
-	return {
-		isSimpleWidget: true,
-		contributions: [
-			MenuPreventer,
-			SelectionClipboard,
-			ContextMenuController,
-			SuggestController,
-			SnippetController2,
-			TabCompletionController,
-		]
-	};
-}

src/vs/workbench/contrib/codeEditor/electron-browser/textMate/inspectTMScopes.ts

@@ -22,9 +22,8 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { editorHoverBackground, editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
 import { HIGH_CONTRAST, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { findMatchingThemeRule } from 'vs/workbench/services/textMate/electron-browser/TMHelper';
-import { ITextMateService } from 'vs/workbench/services/textMate/common/textMateService';
+import { ITextMateService, IGrammar, IToken, StackElement } from 'vs/workbench/services/textMate/common/textMateService';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { IGrammar, IToken, StackElement } from 'vscode-textmate';
 
 class InspectTMScopesController extends Disposable implements IEditorContribution {
 

src/vs/workbench/contrib/debug/electron-browser/breakpointWidget.ts

@@ -32,8 +32,7 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { IDecorationOptions } from 'vs/editor/common/editorCommon';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { getSimpleCodeEditorWidgetOptions } from 'vs/workbench/contrib/codeEditor/electron-browser/simpleEditorOptions';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IRange, Range } from 'vs/editor/common/core/range';
 
 const $ = dom.$;

src/vs/workbench/contrib/debug/electron-browser/repl.ts

@@ -36,8 +36,7 @@ import { HistoryNavigator } from 'vs/base/common/history';
 import { IHistoryNavigationWidget } from 'vs/base/browser/history';
 import { createAndBindHistoryNavigationWidgetScopedContextKeyService } from 'vs/platform/browser/contextScopedHistoryWidget';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { getSimpleCodeEditorWidgetOptions } from 'vs/workbench/contrib/codeEditor/electron-browser/simpleEditorOptions';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IDecorationOptions } from 'vs/editor/common/editorCommon';
 import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';

src/vs/workbench/contrib/extensions/electron-browser/extensionsViewlet.ts

@@ -48,7 +48,7 @@ import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IAddedViewDescriptorRef } from 'vs/workbench/browser/parts/views/views';
 import { ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
 import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
-import { SuggestEnabledInput, attachSuggestEnabledInputBoxStyler } from 'vs/workbench/contrib/codeEditor/electron-browser/suggestEnabledInput';
+import { SuggestEnabledInput, attachSuggestEnabledInputBoxStyler } from 'vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { createErrorWithActions } from 'vs/base/common/errorsWithActions';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';

src/vs/workbench/contrib/performance/electron-browser/perfviewEditor.ts

@@ -19,7 +19,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import * as perf from 'vs/base/common/performance';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { writeTransientState } from 'vs/workbench/contrib/codeEditor/electron-browser/toggleWordWrap';
+import { writeTransientState } from 'vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
 import { mergeSort } from 'vs/base/common/arrays';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import product from 'vs/platform/node/product';

src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts

@@ -28,7 +28,7 @@ import { attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditor, IEditorMemento } from 'vs/workbench/common/editor';
-import { attachSuggestEnabledInputBoxStyler, SuggestEnabledInput } from 'vs/workbench/contrib/codeEditor/electron-browser/suggestEnabledInput';
+import { attachSuggestEnabledInputBoxStyler, SuggestEnabledInput } from 'vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
 import { SettingsTarget, SettingsTargetsWidget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
 import { commonlyUsedData, tocData } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
 import { AbstractSettingRenderer, ISettingLinkClickEvent, ISettingOverrideClickEvent, resolveExtensionsSettings, resolveSettingsTree, SettingsTree, SettingTreeRenderers } from 'vs/workbench/contrib/preferences/browser/settingsTree';