@codingame/monaco-vscode-api 3.2.3 → 4.0.0

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js

@@ -7,6 +7,7 @@ import { Extensions } from '../../../../platform/configuration/common/configurat
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { changeDropTypeCommandId, dropWidgetVisibleCtx, DropIntoEditorController, defaultProviderConfig } from './dropIntoEditorController.js';
 registerEditorContribution(DropIntoEditorController.ID, DropIntoEditorController, 2 );
+registerEditorFeature(DefaultDropProvidersFeature);
 registerEditorCommand(new (class extends EditorCommand {
     constructor() {
         super({
@@ -22,7 +23,21 @@ registerEditorCommand(new (class extends EditorCommand {
         DropIntoEditorController.get(editor)?.changeDropType();
     }
 }));
-registerEditorFeature(DefaultDropProvidersFeature);
+registerEditorCommand(new (class extends EditorCommand {
+    constructor() {
+        super({
+            id: 'editor.hideDropWidget',
+            precondition: dropWidgetVisibleCtx,
+            kbOpts: {
+                weight: 100 ,
+                primary: 9 ,
+            }
+        });
+    }
+    runEditorCommand(_accessor, editor, _args) {
+        DropIntoEditorController.get(editor)?.clearWidgets();
+    }
+}));
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     ...editorConfigurationBaseNode,
     properties: {

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { coalesce } from '../../../../base/common/arrays.js';
 import { createCancelablePromise, raceCancellation } from '../../../../base/common/async.js';
 import { matchesMimeType, VSDataTransfer } from '../../../../base/common/dataTransfer.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { toExternalVSDataTransfer } from '../../../browser/dnd.js';
 import { Range } from '../../../common/core/range.js';
@@ -84,7 +85,7 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
                 if (edits.length) {
                     const activeEditIndex = this.getInitialActiveEditIndex(model, edits);
                     const canShowWidget = editor.getOption(36 ).showDropSelector === 'afterDrop';
-                    await this._postDropWidgetManager.applyEditAndShowIfNeeded([Range.fromPositions(position)], { activeEditIndex, allEdits: edits }, canShowWidget, token);
+                    await this._postDropWidgetManager.applyEditAndShowIfNeeded([Range.fromPositions(position)], { activeEditIndex, allEdits: edits }, canShowWidget, async (edit) => edit, token);
                 }
             }
             finally {
@@ -104,23 +105,22 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
     async getDropEdits(providers, model, position, dataTransfer, tokenSource) {
         const results = await raceCancellation(Promise.all(( providers.map(async (provider) => {
             try {
-                const edit = await provider.provideDocumentOnDropEdits(model, position, dataTransfer, tokenSource.token);
-                if (edit) {
-                    return { ...edit, providerId: provider.id };
-                }
+                const edits = await provider.provideDocumentOnDropEdits(model, position, dataTransfer, tokenSource.token);
+                return edits?.map(edit => ({ ...edit, providerId: provider.id }));
             }
             catch (err) {
                 console.error(err);
             }
             return undefined;
         }))), tokenSource.token);
-        const edits = coalesce(results ?? []);
+        const edits = coalesce(results ?? []).flat();
         return sortEditsByYieldTo(edits);
     }
     getInitialActiveEditIndex(model, edits) {
         const preferredProviders = this._configService.getValue(defaultProviderConfig, { resource: model.uri });
-        for (const [configMime, desiredId] of Object.entries(preferredProviders)) {
-            const editIndex = edits.findIndex(edit => desiredId === edit.providerId
+        for (const [configMime, desiredKindStr] of Object.entries(preferredProviders)) {
+            const desiredKind = ( new HierarchicalKind(desiredKindStr));
+            const editIndex = edits.findIndex(edit => desiredKind.value === edit.providerId
                 && edit.handledMimeType && matchesMimeType(configMime, [edit.handledMimeType]));
             if (editIndex >= 0) {
                 return editIndex;

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/edit.js

@@ -18,8 +18,10 @@ function createCombinedWorkspaceEdit(uri, ranges, edit) {
 }
 function sortEditsByYieldTo(edits) {
     function yieldsTo(yTo, other) {
-        return ('providerId' in yTo && yTo.providerId === other.providerId)
-            || ('mimeType' in yTo && yTo.mimeType === other.handledMimeType);
+        if ('mimeType' in yTo) {
+            return yTo.mimeType === other.handledMimeType;
+        }
+        return !!other.kind && yTo.kind.contains(other.kind);
     }
     const yieldsToMap = ( new Map());
     for (const edit of edits) {
@@ -50,7 +52,7 @@ function sortEditsByYieldTo(edits) {
         }
         const node = nodes[0];
         if (tempStack.includes(node)) {
-            console.warn(`Yield to cycle detected for ${node.providerId}`);
+            console.warn('Yield to cycle detected', node);
             return nodes;
         }
         if (( visited.has(node))) {

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js

@@ -76,7 +76,7 @@ let PostEditWidget = class PostEditWidget extends Disposable {
             getActions: () => {
                 return ( this.edits.allEdits.map((edit, i) => toAction({
                     id: '',
-                    label: edit.label,
+                    label: edit.title,
                     checked: i === this.edits.activeEditIndex,
                     run: () => {
                         if (i !== this.edits.activeEditIndex) {
@@ -105,16 +105,17 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
         this._currentWidget = this._register(( new MutableDisposable()));
         this._register(Event.any(_editor.onDidChangeModel, _editor.onDidChangeModelContent)(() => this.clear()));
     }
-    async applyEditAndShowIfNeeded(ranges, edits, canShowWidget, token) {
+    async applyEditAndShowIfNeeded(ranges, edits, canShowWidget, resolve, token) {
         const model = this._editor.getModel();
         if (!model || !ranges.length) {
             return;
         }
-        const edit = edits.allEdits[edits.activeEditIndex];
+        const edit = edits.allEdits.at(edits.activeEditIndex);
         if (!edit) {
             return;
         }
-        const combinedWorkspaceEdit = createCombinedWorkspaceEdit(model.uri, ranges, edit);
+        const resolvedEdit = await resolve(edit, token);
+        const combinedWorkspaceEdit = createCombinedWorkspaceEdit(model.uri, ranges, resolvedEdit);
         const primaryRange = ranges[0];
         const editTrackingDecoration = model.deltaDecorations([], [{
                 range: primaryRange,
@@ -136,14 +137,14 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
                     return;
                 }
                 await model.undo();
-                this.applyEditAndShowIfNeeded(ranges, { activeEditIndex: newEditIndex, allEdits: edits.allEdits }, canShowWidget, token);
+                this.applyEditAndShowIfNeeded(ranges, { activeEditIndex: newEditIndex, allEdits: edits.allEdits }, canShowWidget, resolve, token);
             });
         }
     }
     show(range, edits, onDidSelectEdit) {
         this.clear();
         if (this._editor.hasModel()) {
-            this._currentWidget.value = this._instantiationService.createInstance(PostEditWidget, this._id, this._editor, this._visibleContext, this._showCommand, range, edits, onDidSelectEdit);
+            this._currentWidget.value = this._instantiationService.createInstance((PostEditWidget), this._id, this._editor, this._visibleContext, this._showCommand, range, edits, onDidSelectEdit);
         }
     }
     clear() {

package/vscode/src/vs/editor/contrib/find/browser/findDecorations.js

@@ -1,7 +1,17 @@
 import { Range } from '../../../common/core/range.js';
-import { OverviewRulerLane, MinimapPosition } from '../../../common/model.js';
+import { OverviewRulerLane } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
-import { overviewRulerFindMatchForeground, minimapFindMatch } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { overviewRulerFindMatchForeground } 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 { minimapFindMatch } from '../../../../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';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 class FindDecorations {
     constructor(editor) {
@@ -245,7 +255,7 @@ class FindDecorations {
         },
         minimap: {
             color: themeColorFromId(minimapFindMatch),
-            position: MinimapPosition.Inline
+            position: 1
         }
     }); }
     static { this._FIND_MATCH_DECORATION = ModelDecorationOptions.register({
@@ -260,7 +270,7 @@ class FindDecorations {
         },
         minimap: {
             color: themeColorFromId(minimapFindMatch),
-            position: MinimapPosition.Inline
+            position: 1
         }
     }); }
     static { this._FIND_MATCH_NO_OVERVIEW_DECORATION = ModelDecorationOptions.register({

package/vscode/src/vs/editor/contrib/find/browser/findModel.js

@@ -245,10 +245,10 @@ class FindModelBoundToEditorModel {
         const { lineNumber, column } = before;
         const model = this._editor.getModel();
         let position = ( new Position(lineNumber, column));
-        let prevMatch = model.findPreviousMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(130 ) : null, false);
+        let prevMatch = model.findPreviousMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, false);
         if (prevMatch && prevMatch.range.isEmpty() && prevMatch.range.getStartPosition().equals(position)) {
             position = this._prevSearchPosition(position);
-            prevMatch = model.findPreviousMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(130 ) : null, false);
+            prevMatch = model.findPreviousMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, false);
         }
         if (!prevMatch) {
             return;
@@ -319,10 +319,10 @@ class FindModelBoundToEditorModel {
         const { lineNumber, column } = after;
         const model = this._editor.getModel();
         let position = ( new Position(lineNumber, column));
-        let nextMatch = model.findNextMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(130 ) : null, captureMatches);
+        let nextMatch = model.findNextMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, captureMatches);
         if (forceMove && nextMatch && nextMatch.range.isEmpty() && nextMatch.range.getStartPosition().equals(position)) {
             position = this._nextSearchPosition(position);
-            nextMatch = model.findNextMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(130 ) : null, captureMatches);
+            nextMatch = model.findNextMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, captureMatches);
         }
         if (!nextMatch) {
             return null;
@@ -375,7 +375,7 @@ class FindModelBoundToEditorModel {
         const searchRanges = ( (findScopes || [null]).map(
             (scope) => FindModelBoundToEditorModel._getSearchRange(this._editor.getModel(), scope)
         ));
-        return this._editor.getModel().findMatches(this._state.searchString, searchRanges, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(130 ) : null, captureMatches, limitResultCount);
+        return this._editor.getModel().findMatches(this._state.searchString, searchRanges, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, captureMatches, limitResultCount);
     }
     replaceAll() {
         if (!this._hasMatches()) {
@@ -395,7 +395,7 @@ class FindModelBoundToEditorModel {
             this._state.searchString,
             this._state.isRegex,
             this._state.matchCase,
-            this._state.wholeWord ? this._editor.getOption(130 ) : null
+            this._state.wholeWord ? this._editor.getOption(131 ) : null
         ));
         const searchData = searchParams.parseSearchRequest();
         if (!searchData) {

package/vscode/src/vs/editor/contrib/find/browser/findOptionsWidget.js

@@ -4,7 +4,18 @@ import { CaseSensitiveToggle, WholeWordsToggle, RegexToggle } from '../../../../
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { FIND_IDS } from './findModel.js';
-import { asCssVariable, inputActiveOptionBorder, inputActiveOptionForeground, inputActiveOptionBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import { inputActiveOptionBorder, inputActiveOptionForeground, inputActiveOptionBackground } from '../../../../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';
+import { createInstantHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 class FindOptionsWidget extends Widget {
     static { this.ID = 'editor.contrib.findOptionsWidget'; }
     constructor(editor, state, keybindingService) {
@@ -26,9 +37,11 @@ class FindOptionsWidget extends Widget {
             inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
             inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground),
         };
+        const hoverDelegate = this._register(createInstantHoverDelegate());
         this.caseSensitive = this._register(( new CaseSensitiveToggle({
             appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleCaseSensitiveCommand),
             isChecked: this._state.matchCase,
+            hoverDelegate,
             ...toggleStyles
         })));
         this._domNode.appendChild(this.caseSensitive.domNode);
@@ -40,6 +53,7 @@ class FindOptionsWidget extends Widget {
         this.wholeWords = this._register(( new WholeWordsToggle({
             appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleWholeWordCommand),
             isChecked: this._state.wholeWord,
+            hoverDelegate,
             ...toggleStyles
         })));
         this._domNode.appendChild(this.wholeWords.domNode);
@@ -51,6 +65,7 @@ class FindOptionsWidget extends Widget {
         this.regex = this._register(( new RegexToggle({
             appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleRegexCommand),
             isChecked: this._state.isRegex,
+            hoverDelegate,
             ...toggleStyles
         })));
         this._domNode.appendChild(this.regex.domNode);

package/vscode/src/vs/editor/contrib/find/browser/findWidget.js

@@ -15,13 +15,25 @@ import { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_REPLACE_INPUT_FOCUSED, MATCHES_LIMI
 import { localizeWithPath } from '../../../../nls.js';
 import { ContextScopedFindInput, ContextScopedReplaceInput } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
-import { asCssVariable, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground, editorFindMatchHighlightBorder, editorFindRangeHighlightBorder, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorFindMatchHighlightBorder, editorFindRangeHighlightBorder } from '../../../../platform/theme/common/colors/editorColors.js';
+import { inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from '../../../../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';
 import { registerIcon, widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
+import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localizeWithPath(
     'vs/editor/contrib/find/browser/findWidget',
     'findSelectionIcon',
@@ -179,7 +191,7 @@ class FindWidget extends Widget {
                 }
                 this._updateButtons();
             }
-            if (e.hasChanged(144 )) {
+            if (e.hasChanged(145 )) {
                 this._tryUpdateWidgetWidth();
             }
             if (e.hasChanged(2 )) {
@@ -875,9 +887,11 @@ class FindWidget extends Widget {
         this._matchesCount = document.createElement('div');
         this._matchesCount.className = 'matchesCount';
         this._updateMatchesCount();
+        const hoverDelegate = this._register(createInstantHoverDelegate());
         this._prevBtn = this._register(( new SimpleButton({
             label: NLS_PREVIOUS_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.PreviousMatchFindAction),
             icon: findPreviousMatchIcon,
+            hoverDelegate,
             onTrigger: () => {
                 assertIsDefined(this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction)).run().then(undefined, onUnexpectedError);
             }
@@ -885,6 +899,7 @@ class FindWidget extends Widget {
         this._nextBtn = this._register(( new SimpleButton({
             label: NLS_NEXT_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.NextMatchFindAction),
             icon: findNextMatchIcon,
+            hoverDelegate,
             onTrigger: () => {
                 assertIsDefined(this._codeEditor.getAction(FIND_IDS.NextMatchFindAction)).run().then(undefined, onUnexpectedError);
             }
@@ -902,6 +917,7 @@ class FindWidget extends Widget {
             icon: findSelectionIcon,
             title: NLS_TOGGLE_SELECTION_FIND_TITLE + this._keybindingLabelFor(FIND_IDS.ToggleSearchScopeCommand),
             isChecked: false,
+            hoverDelegate: hoverDelegate,
             inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground),
             inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
             inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
@@ -932,6 +948,7 @@ class FindWidget extends Widget {
         this._closeBtn = this._register(( new SimpleButton({
             label: NLS_CLOSE_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.CloseFindWidgetCommand),
             icon: widgetClose,
+            hoverDelegate,
             onTrigger: () => {
                 this._state.change({ isRevealed: false, searchScope: null }, false);
             },
@@ -993,9 +1010,11 @@ class FindWidget extends Widget {
                 e.preventDefault();
             }
         }));
+        const replaceHoverDelegate = this._register(createInstantHoverDelegate());
         this._replaceBtn = this._register(( new SimpleButton({
             label: NLS_REPLACE_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.ReplaceOneAction),
             icon: findReplaceIcon,
+            hoverDelegate: replaceHoverDelegate,
             onTrigger: () => {
                 this._controller.replace();
             },
@@ -1009,6 +1028,7 @@ class FindWidget extends Widget {
         this._replaceAllBtn = this._register(( new SimpleButton({
             label: NLS_REPLACE_ALL_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.ReplaceAllAction),
             icon: findReplaceAllIcon,
+            hoverDelegate: replaceHoverDelegate,
             onTrigger: () => {
                 this._controller.replaceAll();
             }
@@ -1124,11 +1144,11 @@ class SimpleButton extends Widget {
             className = className + ' ' + ThemeIcon.asClassName(this._opts.icon);
         }
         this._domNode = document.createElement('div');
-        this._domNode.title = this._opts.label;
         this._domNode.tabIndex = 0;
         this._domNode.className = className;
         this._domNode.setAttribute('role', 'button');
         this._domNode.setAttribute('aria-label', this._opts.label);
+        this._register(setupCustomHover(opts.hoverDelegate ?? getDefaultHoverDelegate('element'), this._domNode, this._opts.label));
         this.onclick(this._domNode, (e) => {
             this._opts.onTrigger();
             e.preventDefault();

package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js

@@ -1,8 +1,17 @@
 import { Codicon } from '../../../../base/common/codicons.js';
-import { MinimapPosition } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { registerColor, transparent, editorSelectionBackground, iconForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
+import { iconForeground } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorSelectionBackground } 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';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -36,7 +45,7 @@ const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldin
     'foldingManualExpandedIcon',
     'Icon for manually expanded ranges in the editor glyph margin.'
 )));
-const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };
+const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: 1  };
 const collapsed = ( localizeWithPath(
     'vs/editor/contrib/folding/browser/foldingDecorations',
     'linesCollapsed',

package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js

@@ -19,7 +19,17 @@ import { ILabelService } from '../../../../platform/label/common/label.js';
 import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
-import { registerColor, contrastBorder, transparent, editorBackground, oneOf, editorErrorBorder, editorErrorForeground, editorWarningBorder, editorWarningForeground, editorInfoBorder, editorInfoForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent, oneOf } from '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorBackground, editorErrorBorder, editorErrorForeground, editorWarningBorder, editorWarningForeground, editorInfoBorder, editorInfoForeground } 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';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 var MarkerNavigationWidget_1;
 class MessageWidget {

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js

@@ -1,5 +1,5 @@
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { createCancelablePromise, raceCancellation } from '../../../../base/common/async.js';
+import { raceCancellation, createCancelablePromise } from '../../../../base/common/async.js';
 import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -7,7 +7,7 @@ import { EditorStateCancellationTokenSource } from '../../editorState/browser/ed
 import { isCodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorAction2 } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
-import { EmbeddedCodeEditorWidget } from '../../../browser/widget/embeddedCodeEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
@@ -24,7 +24,7 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
-import { getReferencesAtPosition, getDefinitionsAtPosition, getDeclarationsAtPosition, getTypeDefinitionsAtPosition, getImplementationsAtPosition } from './goToSymbol.js';
+import { getDefinitionsAtPosition, getDeclarationsAtPosition, getTypeDefinitionsAtPosition, getImplementationsAtPosition, getReferencesAtPosition } from './goToSymbol.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js

@@ -136,9 +136,10 @@ let FileReferencesRenderer = class FileReferencesRenderer {
 FileReferencesRenderer = FileReferencesRenderer_1 = ( __decorate([
     ( __param(0, IInstantiationService))
 ], FileReferencesRenderer));
-class OneReferenceTemplate {
+class OneReferenceTemplate extends Disposable {
     constructor(container) {
-        this.label = ( new HighlightedLabel(container));
+        super();
+        this.label = this._register(( new HighlightedLabel(container)));
     }
     set(element, score) {
         const preview = element.parent.getPreview(element)?.preview(element.range);
@@ -169,7 +170,8 @@ class OneReferenceRenderer {
     renderElement(node, index, templateData) {
         templateData.set(node.element, node.filterData);
     }
-    disposeTemplate() {
+    disposeTemplate(templateData) {
+        templateData.dispose();
     }
 }
 class AccessibilityProvider {

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js

@@ -7,7 +7,7 @@ import { DisposableStore, dispose } from '../../../../../base/common/lifecycle.j
 import { Schemas } from '../../../../../base/common/network.js';
 import { basenameOrAuthority, dirname } from '../../../../../base/common/resources.js';
 import './referencesWidget.css.js';
-import { EmbeddedCodeEditorWidget } from '../../../../browser/widget/embeddedCodeEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from '../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { Range } from '../../../../common/core/range.js';
 import { ModelDecorationOptions, TextModel } from '../../../../common/model/textModel.js';
 import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';

package/vscode/src/vs/editor/contrib/hover/browser/hover.js

@@ -10,7 +10,17 @@ import { ContentHoverWidget, ContentHoverController } from './contentHover.js';
 import { MarginHoverWidget } from './marginHover.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { editorHoverBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorHoverBorder } 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';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { HoverParticipantRegistry } from './hoverTypes.js';
 import { MarkdownHoverParticipant } from './markdownHoverParticipant.js';
@@ -174,7 +184,7 @@ let HoverController = class HoverController extends Disposable {
         }
         const target = mouseEvent.target;
         const mouseOnDecorator = target.element?.classList.contains('colorpicker-color-decoration');
-        const decoratorActivatedOn = this._editor.getOption(147 );
+        const decoratorActivatedOn = this._editor.getOption(148 );
         const enabled = this._hoverSettings.enabled;
         const activatedByDecoratorClick = this._hoverState.activatedByDecoratorClick;
         if ((mouseOnDecorator && ((decoratorActivatedOn === 'click' && !activatedByDecoratorClick) ||