@codingame/monaco-vscode-view-common-service-override 15.0.2 → 16.0.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css

@@ -0,0 +1,235 @@
+.monaco-workbench .merge-editor .code-view > .header {
+	padding: 0 10px;
+	height: 30px;
+	display: flex;
+	align-content: center;
+	overflow: hidden;
+}
+.monaco-workbench .merge-editor .code-view > .header > span {
+	align-self: center;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	padding-right: 6px;
+	white-space: nowrap;
+}
+.monaco-workbench .merge-editor .code-view > .header > span.title {
+	flex-shrink: 0;
+}
+.monaco-workbench .merge-editor .code-view > .header > span.description {
+	flex-shrink: 0;
+	display: flex;
+	font-size: 12px;
+	align-items: center;
+	color: var(--vscode-descriptionForeground);
+}
+.monaco-workbench .merge-editor .code-view.result > .header > .description {
+	display: inline;
+	flex-shrink: 1;
+}
+.monaco-workbench .merge-editor .code-view.result > .header > .detail {
+	flex-shrink: 0;
+}
+.monaco-workbench .merge-editor .code-view.result > .header > .toolbar {
+	flex-shrink: 0;
+}
+.monaco-workbench .merge-editor .code-view > .header > span.description .codicon {
+	font-size: 14px;
+	color: var(--vscode-descriptionForeground);
+}
+.monaco-workbench .merge-editor .code-view > .header > span.detail {
+	margin-left: auto;
+	font-size: 12px;
+	color: var(--vscode-descriptionForeground);
+}
+.monaco-workbench .merge-editor .code-view > .header > span.detail .codicon {
+	font-size: 13px;
+}
+.monaco-workbench .merge-editor .code-view.input > .header > span.detail::before {
+	content: '•';
+	opacity: .5;
+	padding-right: 3px;
+}
+.monaco-workbench .merge-editor .code-view.input > .header > span.detail {
+	margin-left: 0;
+}
+.monaco-workbench .merge-editor .code-view.input > .header > span.toolbar {
+	flex-shrink: 0;
+	margin-left: auto;
+}
+.monaco-workbench .merge-editor .code-view > .container {
+	display: flex;
+	flex-direction: row;
+}
+.monaco-workbench .merge-editor .code-view > .container > .gutter {
+	width: 24px;
+	position: relative;
+	overflow: hidden;
+	flex-shrink: 0;
+	flex-grow: 0;
+}
+.monaco-workbench .merge-editor .merge-editor-diff {
+	background-color: var(--vscode-mergeEditor-change-background);
+}
+.monaco-workbench .merge-editor .merge-editor-diff-word {
+	background-color: var(--vscode-mergeEditor-change-word-background);
+}
+.monaco-workbench .merge-editor .merge-editor-block:not(.handled):not(.focused) {
+	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
+}
+.monaco-workbench .merge-editor .merge-editor-block:not(.handled).focused {
+	border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
+}
+.monaco-workbench .merge-editor .merge-editor-block.handled:not(.focused) {
+	border: 1px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border);
+}
+.monaco-workbench .merge-editor .merge-editor-block.handled.focused {
+	border: 1px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
+}
+.monaco-workbench .merge-editor .merge-editor-simplified.input.i1, .merge-editor-block.use-simplified-decorations.input.i1 {
+	background-color: var(--vscode-mergeEditor-conflict-input1-background);
+}
+.monaco-workbench .merge-editor .merge-editor-simplified.input.i2, .merge-editor-block.use-simplified-decorations.input.i2 {
+	background-color: var(--vscode-mergeEditor-conflict-input2-background);
+}
+.gutter.monaco-editor > div {
+	position: absolute;
+}
+.merge-accept-gutter-marker {
+	width: 28px;
+	margin-left: 4px;
+}
+.merge-accept-gutter-marker .background {
+	height: 100%;
+	width: 50%;
+	position: absolute;
+}
+.merge-accept-gutter-marker.multi-line.focused .background {
+	border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
+	border-right: 0;
+}
+.merge-accept-gutter-marker.multi-line .background {
+	border: 2px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
+	border-right: 0;
+	border-top-left-radius: 3px;
+	border-bottom-left-radius: 3px;
+}
+.merge-accept-gutter-marker.multi-line.handled.focused .background {
+	border: 2px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
+	border-right: 0;
+}
+.merge-accept-gutter-marker.multi-line.handled .background {
+	border: 2px solid var(--vscode-checkbox-border);
+	border-right: 0;
+}
+.focused .accept-conflict-group.monaco-custom-toggle {
+	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
+}
+.accept-conflict-group.monaco-custom-toggle {
+	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
+}
+.handled.focused .accept-conflict-group.monaco-custom-toggle {
+	border: 1px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
+}
+.handled .accept-conflict-group.monaco-custom-toggle {
+	border: 1px solid var(--vscode-checkbox-border);
+}
+.merge-accept-gutter-marker.multi-line .background {
+	left: 8px;
+	width: 10px;
+}
+.merge-accept-gutter-marker .checkbox {
+	width: 100%;
+	position: absolute;
+}
+.accept-conflict-group.monaco-custom-toggle {
+	height: 18px;
+	width: 18px;
+	border-radius: 3px;
+	margin-right: 0px;
+	margin-left: 0px;
+	padding: 0px;
+	opacity: 1;
+	background-size: 16px !important;
+	background-color: var(--vscode-checkbox-border);
+}
+.merge-accept-gutter-marker .checkbox-background {
+	display: flex;
+	background: var(--vscode-editor-background);
+}
+.conflict-zone-root {
+	background-color: var(--vscode-mergeEditor-change-background);
+	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
+	height: 90%;
+	display: flex;
+	align-items: center;
+	align-content: center;
+}
+.conflict-zone-root .dots {
+	margin: 0 10px;
+}
+.conflict-zone-root pre {
+	display: 'inline';
+	font-family: var(--monaco-monospace-font);
+}
+.conflict-zone-root .text {
+	background: var(--vscode-mergeEditor-conflictingLines-background);
+	margin-left: auto;
+	padding: 0 8px;
+	display: flex;
+	align-items: center;
+	height: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+}
+.focused.conflict-zone .conflict-zone-root {
+	border: 1px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
+}
+.merge-editor-conflict-actions {
+	margin: 0px 3px;
+	overflow: hidden;
+	display: inline-block;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	color: var(--vscode-editorCodeLens-foreground)
+}
+.merge-editor-conflict-actions > span,
+.merge-editor-conflict-actions > a {
+	user-select: none;
+	-webkit-user-select: none;
+	white-space: nowrap;
+}
+.merge-editor-conflict-actions > a {
+	text-decoration: none;
+}
+.merge-editor-conflict-actions > a:hover {
+	cursor: pointer;
+	color: var(--vscode-editorLink-activeForeground) !important;
+}
+.merge-editor-conflict-actions > a:hover .codicon {
+	color: var(--vscode-editorLink-activeForeground) !important;
+}
+.merge-editor-conflict-actions .codicon {
+	vertical-align: middle;
+	color: currentColor !important;
+	color: var(--vscode-editorCodeLens-foreground);
+}
+.merge-editor-conflict-actions > a:hover .codicon::before {
+	cursor: pointer;
+}
+.fixed-zone-widget {
+	width: 100%;
+}
+.merge-editor-diff-empty-word.base {
+	margin-left: 3px;
+	border-left: solid var(--vscode-mergeEditor-changeBase-word-background) 3px;
+}
+.merge-editor-diff-empty-word.input {
+	margin-left: 3px;
+	border-left: solid var(--vscode-mergeEditor-change-word-background) 3px;
+}
+.merge-editor-diff-word.base {
+	background-color: var(--vscode-mergeEditor-changeBase-word-background);
+}
+.merge-editor-diff.base {
+	background-color: var(--vscode-mergeEditor-changeBase-background);
+}

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.d.ts

@@ -9,7 +9,6 @@ import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/edito
 import { IEditorOptions as ICodeEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions";
 import { ICodeEditorViewState } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
 import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IEditorOptions, ITextEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
@@ -30,9 +29,7 @@ import { IEditorResolverService } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 export declare class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
     private readonly contextKeyService;
-    private readonly _configurationService;
     private readonly _codeEditorService;
-    private readonly configurationService;
     static readonly ID = "mergeEditor";
     private readonly _sessionDisposables;
     private readonly _viewModel;
@@ -56,11 +53,9 @@ export declare class MergeEditor extends AbstractTextEditor<IMergeEditorViewStat
     private readonly _inputModel;
     get inputModel(): IObservable<IMergeEditorInputModel | undefined>;
     get model(): MergeEditorModel | undefined;
-    private get inputsWritable();
     private readonly viewZoneComputer;
-    protected readonly codeLensesVisible: IObservable<boolean>;
     private readonly scrollSynchronizer;
-    constructor(group: IEditorGroup, instantiation: IInstantiationService, contextKeyService: IContextKeyService, telemetryService: ITelemetryService, storageService: IStorageService, themeService: IThemeService, textResourceConfigurationService: ITextResourceConfigurationService, _configurationService: IConfigurationService, editorService: IEditorService, editorGroupService: IEditorGroupsService, fileService: IFileService, _codeEditorService: ICodeEditorService, configurationService: IConfigurationService);
+    constructor(group: IEditorGroup, instantiation: IInstantiationService, contextKeyService: IContextKeyService, telemetryService: ITelemetryService, storageService: IStorageService, themeService: IThemeService, textResourceConfigurationService: ITextResourceConfigurationService, editorService: IEditorService, editorGroupService: IEditorGroupsService, fileService: IFileService, _codeEditorService: ICodeEditorService);
     dispose(): void;
     private readonly _onDidChangeSizeConstraints;
     readonly onDidChangeSizeConstraints: Event<void>;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js

@@ -6,16 +6,15 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitvi
 import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color';
 import { BugIndicatingError, onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { DisposableStore, MutableDisposable, toDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableStore, MutableDisposable, toDisposable, thenIfNotDisposed, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import './media/mergeEditor.css.js';
+import './media/mergeEditor.css';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { ScrollType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
 import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -28,8 +27,7 @@ import { DEFAULT_EDITOR_ASSOCIATION } from '@codingame/monaco-vscode-api/vscode/
 import { applyTextEditorOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorOptions';
 import { readTransientState, writeTransientState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
 import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { PersistentStore, deepMerge, thenIfNotDisposed } from '@codingame/monaco-vscode-210e86a9-a91b-5273-b05d-390c776dde1f-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
-import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
+import { PersistentStore, deepMerge } from '@codingame/monaco-vscode-210e86a9-a91b-5273-b05d-390c776dde1f-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { BaseCodeEditorView } from './editors/baseCodeEditorView.js';
 import { ScrollSynchronizer } from './scrollSynchronizer.js';
 import { MergeEditorViewModel } from './viewModel.js';
@@ -60,15 +58,10 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
     get model() {
         return this.inputModel.get()?.model;
     }
-    get inputsWritable() {
-        return !!this._configurationService.getValue('mergeEditor.writableInputs');
-    }
-    constructor(group, instantiation, contextKeyService, telemetryService, storageService, themeService, textResourceConfigurationService, _configurationService, editorService, editorGroupService, fileService, _codeEditorService, configurationService) {
+    constructor(group, instantiation, contextKeyService, telemetryService, storageService, themeService, textResourceConfigurationService, editorService, editorGroupService, fileService, _codeEditorService) {
         super(MergeEditor_1.ID, group, telemetryService, instantiation, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService, fileService);
         this.contextKeyService = contextKeyService;
-        this._configurationService = _configurationService;
         this._codeEditorService = _codeEditorService;
-        this.configurationService = configurationService;
         this._sessionDisposables = ( new DisposableStore());
         this._viewModel = observableValue(this, undefined);
         this._grid = this._register(( new MutableDisposable()));
@@ -92,7 +85,6 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
             this.input2View.editor,
             this.inputResultView.editor
         ));
-        this.codeLensesVisible = observableConfigValue('mergeEditor.showCodeLenses', true, this.configurationService);
         this.scrollSynchronizer = this._register(( new ScrollSynchronizer(
             this._viewModel,
             this.input1View,
@@ -123,7 +115,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(7521, "Text Merge Editor");
+        return localize(7798, "Text Merge Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;
@@ -138,13 +130,16 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         const inputOptions = deepMerge(options, {
             minimap: { enabled: false },
             glyphMargin: false,
-            lineNumbersMinChars: 2,
-            readOnly: !this.inputsWritable
+            lineNumbersMinChars: 2
+        });
+        const readOnlyInputOptions = deepMerge(inputOptions, {
+            readOnly: true,
+            readOnlyMessage: undefined
         });
-        this.input1View.updateOptions(inputOptions);
-        this.input2View.updateOptions(inputOptions);
+        this.input1View.updateOptions(readOnlyInputOptions);
+        this.input2View.updateOptions(readOnlyInputOptions);
         this.baseViewOptions.set({ ...this.input2View.editor.getRawOptions() }, undefined);
-        this.inputResultView.updateOptions(options);
+        this.inputResultView.updateOptions(inputOptions);
     }
     getMainControl() {
         return this.inputResultView.editor;
@@ -266,7 +261,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         const baseViewZoneIds = [];
         const resultViewZoneIds = [];
         const viewZones = this.viewZoneComputer.computeViewZones(reader, viewModel, {
-            codeLensesVisible: this.codeLensesVisible.read(reader),
+            codeLensesVisible: true,
             showNonConflictingChanges: this.showNonConflictingChanges.read(reader),
             shouldAlignBase,
             shouldAlignResult,
@@ -517,12 +512,10 @@ MergeEditor = MergeEditor_1 = ( __decorate([
     ( __param(4, IStorageService)),
     ( __param(5, IThemeService)),
     ( __param(6, ITextResourceConfigurationService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IEditorService)),
-    ( __param(9, IEditorGroupsService)),
-    ( __param(10, IFileService)),
-    ( __param(11, ICodeEditorService)),
-    ( __param(12, IConfigurationService))
+    ( __param(7, IEditorService)),
+    ( __param(8, IEditorGroupsService)),
+    ( __param(9, IFileService)),
+    ( __param(10, ICodeEditorService))
 ], MergeEditor));
 let MergeEditorLayoutStore = class MergeEditorLayoutStore {
     static { MergeEditorLayoutStore_1 = this; }

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js

@@ -205,7 +205,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(7522, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(7799, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -24,11 +24,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(8199, "Keyboard Layout"));
+        const name = ( localize(8476, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(8200, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(8477, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -40,7 +40,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(8200, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(8477, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -49,7 +49,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(8200, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(8477, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -67,11 +67,11 @@ KeyboardLayoutPickerContribution = ( __decorate([
 registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, WorkbenchPhase.BlockStartup);
 const DEFAULT_CONTENT = [
     `// ${( localize(
-        8201,
+        8478,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        8202,
+        8479,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -82,7 +82,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(8203, "Change Keyboard Layout")),
+            title: ( localize2(8480, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -112,17 +112,17 @@ registerAction2(class extends Action2 {
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localize(8204, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(8481, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(8205, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(8482, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(8206, "Auto Detect")),
+            label: ( localize(8483, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(8207, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(8484, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +144,7 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw ( new Error(( localize(8208, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(8485, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js

@@ -20,7 +20,7 @@ import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platfo
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                8688,
+                8968,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -30,7 +30,7 @@ import { isIOS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platfo
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                8689,
+                8969,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/media/typeHierarchy.css

@@ -0,0 +1,47 @@
+.monaco-workbench .type-hierarchy .results,
+.monaco-workbench .type-hierarchy .message {
+	display: none;
+}
+.monaco-workbench .type-hierarchy[data-state="data"] .results {
+	display: inherit;
+	height: 100%;
+}
+.monaco-workbench .type-hierarchy[data-state="message"] .message {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 100%;
+}
+.monaco-workbench .type-hierarchy .editor,
+.monaco-workbench .type-hierarchy .tree {
+	height: 100%;
+}
+.monaco-editor .type-hierarchy .tree {
+	background-color: var(--vscode-peekViewResult-background);
+	color: var(--vscode-peekViewResult-fileForeground);
+}
+.monaco-editor .type-hierarchy .tree .monaco-list:focus .monaco-list-rows > .monaco-list-row.selected:not(.highlighted) {
+	background-color: var(--vscode-peekViewResult-selectionBackground);
+	color: var(--vscode-peekViewResult-selectionForeground) !important;
+}
+.monaco-workbench .type-hierarchy .tree .typehierarchy-element {
+	display: flex;
+	flex: 1;
+	flex-flow: row nowrap;
+	align-items: center;
+}
+.monaco-workbench .type-hierarchy .tree .typehierarchy-element .monaco-icon-label {
+	padding-left: 4px;
+}
+.monaco-editor .type-hierarchy .type-decoration {
+	background-color: var(--vscode-peekViewEditor-matchHighlightBackground);
+	border: 2px solid var(--vscode-peekViewEditor-matchHighlightBorder);
+	box-sizing: border-box;
+}
+.monaco-editor .type-hierarchy .editor .monaco-editor .monaco-editor-background,
+.monaco-editor .type-hierarchy .editor .monaco-editor .inputarea.ime-input {
+	background-color: var(--vscode-peekViewEditor-background);
+}
+.monaco-editor .type-hierarchy .editor .monaco-editor .margin {
+	background-color: var(--vscode-peekViewEditorGutter-background);
+}

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js

@@ -22,12 +22,12 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(10729, 'Whether a type hierarchy provider is available'))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(10730, 'Whether type hierarchy peek is currently showing'))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(11051, 'Whether a type hierarchy provider is available'))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(11052, 'Whether type hierarchy peek is currently showing'))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(10731, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(11053, 'whether type hierarchy shows super types or subtypes')) }
 ));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
@@ -96,14 +96,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(10732, "No results")));
+                this._widget.showMessage(( localize(11054, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(10733, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(11055, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -148,7 +148,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(10734, 'Peek Type Hierarchy')),
+            title: ( localize2(11056, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -167,7 +167,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(10735, 'Show Supertypes')),
+            title: ( localize2(11057, 'Show Supertypes')),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
@@ -189,7 +189,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSubtypes',
-            title: ( localize2(10736, 'Show Subtypes')),
+            title: ( localize2(11058, 'Show Subtypes')),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
@@ -211,7 +211,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusTypeHierarchy',
-            title: ( localize2(10737, 'Refocus Type Hierarchy')),
+            title: ( localize2(11059, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -227,7 +227,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(10738, 'Close')),
+            title: ( localize(11060, 'Close')),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import './media/typeHierarchy.css.js';
+import './media/typeHierarchy.css';
 import { Dimension, isKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { SplitView, Sizing } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitview';
 import { TreeMouseEventTarget } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/tree';
@@ -77,7 +77,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         this.create();
         this._peekViewService.addExclusiveWidget(editor, this);
         this._applyTheme(themeService.getColorTheme());
-        this._disposables.add(themeService.onDidColorThemeChange(e => this._applyTheme(e.theme), this));
+        this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
         this._disposables.add(this._previewDisposable);
     }
     dispose() {
@@ -263,13 +263,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === TypeHierarchyDirection.Supertypes
-            ? ( localize(10739, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(10740, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(11061, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(11062, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(10741, "Loading...")));
+        this.setTitle(( localize(11063, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -288,8 +288,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === TypeHierarchyDirection.Supertypes
-                ? ( localize(10742, "No supertypes of '{0}'", model.root.name))
-                : ( localize(10743, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(11064, "No supertypes of '{0}'", model.root.name))
+                : ( localize(11065, "No subtypes of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;