@codingame/monaco-vscode-api 3.2.3 → 4.0.0

package/vscode/src/vs/workbench/contrib/logs/common/logsActions.js

@@ -0,0 +1,236 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { Action } from '../../../../base/common/actions.js';
+import { isLogLevel, LogLevel, LogLevelToLocalizedString, ILoggerService } from '../../../../platform/log/common/log.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { URI } from '../../../../base/common/uri.js';
+import '../../../../platform/files/common/files.js';
+import '../../../../platform/instantiation/common/instantiation.js';
+import { basename, dirname, isEqual } from '../../../../base/common/resources.js';
+import '../../../services/editor/common/editorGroupsService.js';
+import { IOutputService } from '../../../services/output/common/output.js';
+import { telemetryLogId, extensionTelemetryLogChannelId } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IDefaultLogLevelsService } from './defaultLogLevels.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+var SetLogLevelAction_1;
+let SetLogLevelAction = class SetLogLevelAction extends Action {
+    static { SetLogLevelAction_1 = this; }
+    static { this.ID = 'workbench.action.setLogLevel'; }
+    static { this.TITLE = ( localize2WithPath(
+        'vs/workbench/contrib/logs/common/logsActions',
+        'setLogLevel',
+        "Set Log Level..."
+    )); }
+    constructor(id, label, quickInputService, loggerService, outputService, defaultLogLevelsService) {
+        super(id, label);
+        this.quickInputService = quickInputService;
+        this.loggerService = loggerService;
+        this.outputService = outputService;
+        this.defaultLogLevelsService = defaultLogLevelsService;
+    }
+    async run() {
+        const logLevelOrChannel = await this.selectLogLevelOrChannel();
+        if (logLevelOrChannel !== null) {
+            if (isLogLevel(logLevelOrChannel)) {
+                this.loggerService.setLogLevel(logLevelOrChannel);
+            }
+            else {
+                await this.setLogLevelForChannel(logLevelOrChannel);
+            }
+        }
+    }
+    async selectLogLevelOrChannel() {
+        const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
+        const extensionLogs = [], logs = [];
+        const logLevel = this.loggerService.getLogLevel();
+        for (const channel of this.outputService.getChannelDescriptors()) {
+            if (!SetLogLevelAction_1.isLevelSettable(channel) || !channel.file) {
+                continue;
+            }
+            const channelLogLevel = this.loggerService.getLogLevel(channel.file) ?? logLevel;
+            const item = { id: channel.id, resource: channel.file, label: channel.label, description: channelLogLevel !== logLevel ? this.getLabel(channelLogLevel) : undefined, extensionId: channel.extensionId };
+            if (channel.extensionId) {
+                extensionLogs.push(item);
+            }
+            else {
+                logs.push(item);
+            }
+        }
+        const entries = [];
+        entries.push({ type: 'separator', label: ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'all', "All")) });
+        entries.push(...this.getLogLevelEntries(defaultLogLevels.default, this.loggerService.getLogLevel(), true));
+        if (extensionLogs.length) {
+            entries.push({ type: 'separator', label: ( localizeWithPath(
+                'vs/workbench/contrib/logs/common/logsActions',
+                'extensionLogs',
+                "Extension Logs"
+            )) });
+            entries.push(...extensionLogs.sort((a, b) => a.label.localeCompare(b.label)));
+        }
+        entries.push({ type: 'separator', label: ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'loggers', "Logs")) });
+        entries.push(...logs.sort((a, b) => a.label.localeCompare(b.label)));
+        return ( new Promise((resolve, reject) => {
+            const disposables = ( new DisposableStore());
+            const quickPick = this.quickInputService.createQuickPick();
+            quickPick.placeholder = ( localizeWithPath(
+                'vs/workbench/contrib/logs/common/logsActions',
+                'selectlog',
+                "Set Log Level"
+            ));
+            quickPick.items = entries;
+            let selectedItem;
+            disposables.add(quickPick.onDidTriggerItemButton(e => {
+                quickPick.hide();
+                this.defaultLogLevelsService.setDefaultLogLevel(e.item.level);
+            }));
+            disposables.add(quickPick.onDidAccept(e => {
+                selectedItem = quickPick.selectedItems[0];
+                quickPick.hide();
+            }));
+            disposables.add(quickPick.onDidHide(() => {
+                const result = selectedItem ? selectedItem.level ?? selectedItem : null;
+                disposables.dispose();
+                resolve(result);
+            }));
+            quickPick.show();
+        }));
+    }
+    static isLevelSettable(channel) {
+        return channel.log && channel.file !== undefined && channel.id !== telemetryLogId && channel.id !== extensionTelemetryLogChannelId;
+    }
+    async setLogLevelForChannel(logChannel) {
+        const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
+        const defaultLogLevel = defaultLogLevels.extensions.find(e => e[0] === logChannel.extensionId?.toLowerCase())?.[1] ?? defaultLogLevels.default;
+        const currentLogLevel = this.loggerService.getLogLevel(logChannel.resource) ?? defaultLogLevel;
+        const entries = this.getLogLevelEntries(defaultLogLevel, currentLogLevel, !!logChannel.extensionId);
+        return ( new Promise((resolve, reject) => {
+            const disposables = ( new DisposableStore());
+            const quickPick = this.quickInputService.createQuickPick();
+            quickPick.placeholder = logChannel ? ( localizeWithPath(
+                'vs/workbench/contrib/logs/common/logsActions',
+                'selectLogLevelFor',
+                " {0}: Select log level",
+                logChannel?.label
+            )) : ( localizeWithPath(
+                'vs/workbench/contrib/logs/common/logsActions',
+                'selectLogLevel',
+                "Select log level"
+            ));
+            quickPick.items = entries;
+            quickPick.activeItems = entries.filter((entry) => entry.level === this.loggerService.getLogLevel());
+            let selectedItem;
+            disposables.add(quickPick.onDidTriggerItemButton(e => {
+                quickPick.hide();
+                this.defaultLogLevelsService.setDefaultLogLevel(e.item.level, logChannel.extensionId);
+            }));
+            disposables.add(quickPick.onDidAccept(e => {
+                selectedItem = quickPick.selectedItems[0];
+                quickPick.hide();
+            }));
+            disposables.add(quickPick.onDidHide(() => {
+                if (selectedItem) {
+                    this.loggerService.setLogLevel(logChannel.resource, selectedItem.level);
+                }
+                disposables.dispose();
+                resolve();
+            }));
+            quickPick.show();
+        }));
+    }
+    getLogLevelEntries(defaultLogLevel, currentLogLevel, canSetDefaultLogLevel) {
+        const button = canSetDefaultLogLevel ? { iconClass: ThemeIcon.asClassName(Codicon.checkAll), tooltip: ( localizeWithPath(
+            'vs/workbench/contrib/logs/common/logsActions',
+            'resetLogLevel',
+            "Set as Default Log Level"
+        )) } : undefined;
+        return [
+            { label: this.getLabel(LogLevel.Trace, currentLogLevel), level: LogLevel.Trace, description: this.getDescription(LogLevel.Trace, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Trace ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Debug, currentLogLevel), level: LogLevel.Debug, description: this.getDescription(LogLevel.Debug, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Debug ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Info, currentLogLevel), level: LogLevel.Info, description: this.getDescription(LogLevel.Info, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Info ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Warning, currentLogLevel), level: LogLevel.Warning, description: this.getDescription(LogLevel.Warning, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Warning ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Error, currentLogLevel), level: LogLevel.Error, description: this.getDescription(LogLevel.Error, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Error ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Off, currentLogLevel), level: LogLevel.Off, description: this.getDescription(LogLevel.Off, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Off ? [button] : undefined },
+        ];
+    }
+    getLabel(level, current) {
+        const label = LogLevelToLocalizedString(level).value;
+        return level === current ? `$(check) ${label}` : label;
+    }
+    getDescription(level, defaultLogLevel) {
+        return defaultLogLevel === level ? ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'default', "Default")) : undefined;
+    }
+};
+SetLogLevelAction = SetLogLevelAction_1 = ( __decorate([
+    ( __param(2, IQuickInputService)),
+    ( __param(3, ILoggerService)),
+    ( __param(4, IOutputService)),
+    ( __param(5, IDefaultLogLevelsService))
+], SetLogLevelAction));
+(class OpenWindowSessionLogFileAction extends Action {
+    static { this.ID = 'workbench.action.openSessionLogFile'; }
+    static { this.TITLE = ( localize2WithPath(
+        'vs/workbench/contrib/logs/common/logsActions',
+        'openSessionLogFile',
+        "Open Window Log File (Session)..."
+    )); }
+    constructor(id, label, environmentService, fileService, quickInputService, editorService) {
+        super(id, label);
+        this.environmentService = environmentService;
+        this.fileService = fileService;
+        this.quickInputService = quickInputService;
+        this.editorService = editorService;
+    }
+    async run() {
+        const sessionResult = await this.quickInputService.pick(this.getSessions().then(sessions => ( sessions.map((s, index) => ({
+            id: ( s.toString()),
+            label: basename(s),
+            description: index === 0 ? ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'current', "Current")) : undefined
+        })))), {
+            canPickMany: false,
+            placeHolder: ( localizeWithPath(
+                'vs/workbench/contrib/logs/common/logsActions',
+                'sessions placeholder',
+                "Select Session"
+            ))
+        });
+        if (sessionResult) {
+            const logFileResult = await this.quickInputService.pick(this.getLogFiles(( URI.parse(sessionResult.id))).then(logFiles => ( logFiles.map(s => ({
+                id: ( s.toString()),
+                label: basename(s)
+            })))), {
+                canPickMany: false,
+                placeHolder: ( localizeWithPath(
+                    'vs/workbench/contrib/logs/common/logsActions',
+                    'log placeholder',
+                    "Select Log file"
+                ))
+            });
+            if (logFileResult) {
+                return this.editorService.openEditor({ resource: ( URI.parse(logFileResult.id)), options: { pinned: true } }).then(() => undefined);
+            }
+        }
+    }
+    async getSessions() {
+        const logsPath = this.environmentService.logsHome.with({ scheme: this.environmentService.logFile.scheme });
+        const result = [logsPath];
+        const stat = await this.fileService.resolve(dirname(logsPath));
+        if (stat.children) {
+            result.push(...( stat.children
+                .filter(stat => !isEqual(stat.resource, logsPath) && stat.isDirectory && /^\d{8}T\d{6}$/.test(stat.name))
+                .sort()
+                .reverse()
+                .map(d => d.resource)));
+        }
+        return result;
+    }
+    async getLogFiles(session) {
+        const stat = await this.fileService.resolve(session);
+        if (stat.children) {
+            return ( stat.children.filter(stat => !stat.isDirectory).map(stat => stat.resource));
+        }
+        return [];
+    }
+});
+export { SetLogLevelAction };

package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js

@@ -177,7 +177,7 @@ async function renderMarkdownDocument(text, extensionService, languageService, s
             return code;
         }
         if (typeof lang !== 'string') {
-            callback(null, `<code>${escape(code)}</code>`);
+            callback(null, escape(code));
             return '';
         }
         extensionService.whenInstalledExtensionsRegistered().then(async () => {
@@ -187,7 +187,7 @@ async function renderMarkdownDocument(text, extensionService, languageService, s
             }
             const languageId = languageService.getLanguageIdByLanguageName(lang) ?? languageService.getLanguageIdByLanguageName(lang.split(/\s+|:|,|(?!^)\{|\?]/, 1)[0]);
             const html = await tokenizeToString(languageService, code, languageId);
-            callback(null, `<code>${html}</code>`);
+            callback(null, html);
         });
         return '';
     };

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

@@ -1,5 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { assertFn } from '../../../../base/common/assert.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { isDefined } from '../../../../base/common/types.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
@@ -9,13 +13,13 @@ import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput } from '../../../common/editor.js';
+import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
 import { AbstractTextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
 import { TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory } from './mergeEditorInputModel.js';
 import { MergeEditorTelemetry } from './telemetry.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 var MergeEditorInput_1;
 class MergeEditorInputData {
     constructor(uri, title, detail, description) {
@@ -31,8 +35,8 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
     get useWorkingCopy() {
         return this.configurationService.getValue('mergeEditor.useWorkingCopy') ?? false;
     }
-    constructor(base, input1, input2, result, _instaService, editorService, textFileService, labelService, fileService, configurationService, filesConfigurationService, textResourceConfigurationService) {
-        super(result, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
+    constructor(base, input1, input2, result, _instaService, editorService, textFileService, labelService, fileService, configurationService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService) {
+        super(result, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
         this.base = base;
         this.input1 = input1;
         this.input2 = input2;
@@ -147,6 +151,7 @@ MergeEditorInput = MergeEditorInput_1 = ( __decorate([
     ( __param(8, IFileService)),
     ( __param(9, IConfigurationService)),
     ( __param(10, IFilesConfigurationService)),
-    ( __param(11, ITextResourceConfigurationService))
+    ( __param(11, ITextResourceConfigurationService)),
+    ( __param(12, ICustomEditorLabelService))
 ], MergeEditorInput));
 export { MergeEditorInput, MergeEditorInputData };

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

@@ -3,8 +3,13 @@ import { assertFn } from '../../../../base/common/assert.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { basename, isEqual } from '../../../../base/common/resources.js';
-import Severity from '../../../../base/common/severity.js';
+import Severity$1 from '../../../../base/common/severity.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -19,9 +24,6 @@ import { MergeEditorModel } from './model/mergeEditorModel.js';
 import { StorageCloseWithConflicts } from '../common/mergeEditor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var WorkspaceMergeEditorModeFactory_1;
 let TempFileMergeEditorModeFactory = class TempFileMergeEditorModeFactory {
@@ -141,7 +143,7 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 }
             ];
             choice = (await this.dialogService.prompt({
-                type: Severity.Info,
+                type: Severity$1.Info,
                 message,
                 detail: hasUnhandledConflicts
                     ? isMany
@@ -355,7 +357,7 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 basename(inputModels[0].resultUri)
             ));
             const { result } = await this._dialogService.prompt({
-                type: Severity.Info,
+                type: Severity$1.Info,
                 message,
                 detail: someUnhandledConflicts ?
                     isMany

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js

@@ -1,3 +1,11 @@
+import '../../../../../base/browser/dom.js';
+import '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
+import '../model/lineRange.js';
+import '../../../../../nls.js';
 const conflictMarkers = {
     start: '<<<<<<<',
     end: '>>>>>>>',

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -1,6 +1,11 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { equals, CompareResult } from '../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { transaction, observableValue } from '../../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
+import { keepObserved } from '../../../../../base/common/observableInternal/utils.js';
+import { waitForState } from '../../../../../base/common/observableInternal/promise.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { localizeWithPath } from '../../../../../nls.js';
@@ -11,11 +16,6 @@ import { DocumentLineRangeMap, LineRangeMapping, DocumentRangeMap } from './mapp
 import { TextModelDiffs } from './textModelDiffs.js';
 import { leftJoin } from '../utils.js';
 import { ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from './modifiedBaseRange.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
-import { waitForState } from '../../../../../base/common/observableInternal/promise.js';
-import { keepObserved } from '../../../../../base/common/observableInternal/utils.js';
-import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
-import { transaction, observableValue } from '../../../../../base/common/observableInternal/base.js';
 let MergeEditorModel = class MergeEditorModel extends EditorModel {
     constructor(base, input1, input2, resultTextModel, diffComputer, options, telemetry, languageService, undoRedoService) {
         super();

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils.js

@@ -1,5 +1,5 @@
 import { Position } from '../../../../../editor/common/core/position.js';
-import { LengthObj } from '../../../../../editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length.js';
+import { TextLength } from '../../../../../editor/common/core/textLength.js';
 function rangeContainsPosition(range, position) {
     if (position.lineNumber < range.startLineNumber || position.lineNumber > range.endLineNumber) {
         return false;
@@ -14,18 +14,18 @@ function rangeContainsPosition(range, position) {
 }
 function lengthOfRange(range) {
     if (range.startLineNumber === range.endLineNumber) {
-        return ( new LengthObj(0, range.endColumn - range.startColumn));
+        return ( new TextLength(0, range.endColumn - range.startColumn));
     }
     else {
-        return ( new LengthObj(range.endLineNumber - range.startLineNumber, range.endColumn - 1));
+        return ( new TextLength(range.endLineNumber - range.startLineNumber, range.endColumn - 1));
     }
 }
 function lengthBetweenPositions(position1, position2) {
     if (position1.lineNumber === position2.lineNumber) {
-        return ( new LengthObj(0, position2.column - position1.column));
+        return ( new TextLength(0, position2.column - position1.column));
     }
     else {
-        return ( new LengthObj(position2.lineNumber - position1.lineNumber, position2.column - 1));
+        return ( new TextLength(position2.lineNumber - position1.lineNumber, position2.column - 1));
     }
 }
 function addLength(position, length) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js

@@ -6,8 +6,10 @@ import { LineRangeEdit } from './editing.js';
 import { LineRange } from './lineRange.js';
 import { ReentrancyBarrier } from '../utils.js';
 import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
+import '../../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableSignal } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 class TextModelDiffs extends Disposable {
     get isApplyingChange() {
         return this._barrier.isActive;

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

@@ -2,9 +2,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { CompareResult, ArrayQueue } from '../../../../base/common/arrays.js';
 import { onUnexpectedError, BugIndicatingError } from '../../../../base/common/errors.js';
 import { toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/observableInternal/derived.js';
 import { autorunOpts } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 class ReentrancyBarrier {
     constructor() {
         this._isActive = false;

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

@@ -1,5 +1,15 @@
 import { localizeWithPath } from '../../../../../nls.js';
-import { registerColor, transparent, mergeCurrentHeaderBackground, mergeIncomingHeaderBackground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../../platform/theme/common/colorUtils.js';
+import '../../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../../platform/theme/common/colors/chartsColors.js';
+import { mergeCurrentHeaderBackground, mergeIncomingHeaderBackground } from '../../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../../platform/theme/common/colors/listColors.js';
+import '../../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../../platform/theme/common/colors/searchColors.js';
 registerColor('mergeEditor.change.background', { dark: '#9bb95533', light: '#9bb95533', hcDark: '#9bb95533', hcLight: '#9bb95533', }, ( localizeWithPath(
  'vs/workbench/contrib/mergeEditor/browser/view/colors',
  'mergeEditor.change.background',

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

@@ -2,13 +2,15 @@ import { createStyleSheet, isInShadowDOM, h, $, reset } from '../../../../../bas
 import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { hash } from '../../../../../base/common/hash.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { transaction } from '../../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 import { EDITOR_FONT_DEFAULTS } from '../../../../../editor/common/config/editorOptions.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from '../model/modifiedBaseRange.js';
 import { FixedZoneWidget } from './fixedZoneWidget.js';
-import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
-import { transaction } from '../../../../../base/common/observableInternal/base.js';
 class ConflictActionsFactory extends Disposable {
     constructor(_editor) {
         super();

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

@@ -1,9 +1,11 @@
 import { h, reset } from '../../../../../base/browser/dom.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { LineRange } from '../model/lineRange.js';
-import { observableFromEvent, observableSignalFromEvent, observableSignal } from '../../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import { transaction } from '../../../../../base/common/observableInternal/base.js';
+import '../../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, observableSignalFromEvent, observableSignal } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
+import { LineRange } from '../model/lineRange.js';
 class EditorGutter extends Disposable {
     constructor(_editor, _domNode, itemProvider) {
         super();

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

@@ -2,7 +2,11 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { reset, h } from '../../../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
-import { MinimapPosition, OverviewRulerLane } from '../../../../../../editor/common/model.js';
+import { derived } from '../../../../../../base/common/observableInternal/derived.js';
+import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../../base/common/observableInternal/utils.js';
+import '../../../../../../base/common/cancellation.js';
+import { OverviewRulerLane } from '../../../../../../editor/common/model.js';
 import { localizeWithPath } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
@@ -11,8 +15,6 @@ import { applyObservableDecorations } from '../../utils.js';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
-import { derived } from '../../../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
 let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
     constructor(viewModel, instantiationService, configurationService) {
         super(instantiationService, viewModel, configurationService);
@@ -83,7 +85,7 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                         blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                         description: 'Merge Editor',
                         minimap: {
-                            position: MinimapPosition.Gutter,
+                            position: 2 ,
                             color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                         },
                         overviewRuler: modifiedBaseRange.isConflicting ? {

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

@@ -2,8 +2,12 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { h } from '../../../../../../base/browser/dom.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { derived } from '../../../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
+import '../../../../../../base/common/cancellation.js';
 import { EditorExtensionsRegistry } from '../../../../../../editor/browser/editorExtensions.js';
-import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditorWidget.js';
+import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { Selection } from '../../../../../../editor/common/core/selection.js';
 import { CodeLensContribution } from '../../../../../../editor/contrib/codelens/browser/codelensController.js';
 import { FoldingController } from '../../../../../../editor/contrib/folding/browser/folding.js';
@@ -11,9 +15,6 @@ import { MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from '../../../../../browser/parts/editor/editor.js';
 import { setStyle, observableConfigValue } from '../../utils.js';
-import { observableFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
-import { derived } from '../../../../../../base/common/observableInternal/derived.js';
-import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
 class CodeEditorView extends Disposable {
     updateOptions(newOptions) {
         this.editor.updateOptions(newOptions);

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

@@ -6,9 +6,14 @@ import { Separator, Action } from '../../../../../../base/common/actions.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { clamp } from '../../../../../../base/common/numbers.js';
+import { observableValue, transaction } from '../../../../../../base/common/observableInternal/base.js';
+import { derivedOpts, derived } from '../../../../../../base/common/observableInternal/derived.js';
+import { autorunOpts, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../../base/common/observableInternal/utils.js';
+import '../../../../../../base/common/cancellation.js';
 import { noBreakWhitespace } from '../../../../../../base/common/strings.js';
 import { isDefined } from '../../../../../../base/common/types.js';
-import { MinimapPosition, OverviewRulerLane } from '../../../../../../editor/common/model.js';
+import { OverviewRulerLane } from '../../../../../../editor/common/model.js';
 import { localizeWithPath } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
@@ -19,9 +24,6 @@ import { applyObservableDecorations, setFields } from '../../utils.js';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
-import { derivedOpts, derived } from '../../../../../../base/common/observableInternal/derived.js';
-import { autorunOpts, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
-import { observableValue, transaction } from '../../../../../../base/common/observableInternal/base.js';
 let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
     constructor(inputNumber, viewModel, instantiationService, contextMenuService, configurationService) {
         super(instantiationService, viewModel, configurationService);
@@ -87,7 +89,7 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
                         blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                         description: 'Merge Editor',
                         minimap: {
-                            position: MinimapPosition.Gutter,
+                            position: 2 ,
                             color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                         },
                         overviewRuler: modifiedBaseRange.isConflicting ? {

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

@@ -5,7 +5,11 @@ import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabe
 import { CompareResult } from '../../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
 import { toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { MinimapPosition, OverviewRulerLane } from '../../../../../../editor/common/model.js';
+import { derived } from '../../../../../../base/common/observableInternal/derived.js';
+import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../../base/common/observableInternal/utils.js';
+import '../../../../../../base/common/cancellation.js';
+import { OverviewRulerLane } from '../../../../../../editor/common/model.js';
 import { localizeWithPath } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
@@ -18,8 +22,6 @@ import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverV
 import { EditorGutter } from '../editorGutter.js';
 import { ctxIsMergeResultEditor } from '../../../common/mergeEditor.js';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
-import { derived } from '../../../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
 let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
     constructor(viewModel, instantiationService, _labelService, configurationService) {
         super(instantiationService, viewModel, configurationService);
@@ -67,7 +69,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                             blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                             description: 'Result Diff',
                             minimap: {
-                                position: MinimapPosition.Gutter,
+                                position: 2 ,
                                 color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                             },
                             overviewRuler: modifiedBaseRange.isConflicting ? {