@codingame/monaco-vscode-api 6.0.3 → 7.0.1

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

@@ -3,7 +3,7 @@ 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 { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { toExternalVSDataTransfer } from '../../../browser/dnd.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
@@ -54,7 +54,8 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
         editor.focus();
         editor.setPosition(position);
         const p = createCancelablePromise(async (token) => {
-            const tokenSource = ( (new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value, undefined, token)));
+            const disposables = ( (new DisposableStore()));
+            const tokenSource = disposables.add(( (new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value, undefined, token))));
             try {
                 const ourDataTransfer = await this.extractDataTransferData(dragEvent);
                 if (ourDataTransfer.size === 0 || tokenSource.token.isCancellationRequested) {
@@ -74,31 +75,35 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
                          (provider.dropMimeTypes.some(mime => ourDataTransfer.matches(mime)))
                     );
                 });
-                const edits = await this.getDropEdits(providers, model, position, ourDataTransfer, tokenSource);
+                const editSession = disposables.add(await this.getDropEdits(providers, model, position, ourDataTransfer, tokenSource));
                 if (tokenSource.token.isCancellationRequested) {
                     return;
                 }
-                if (edits.length) {
-                    const activeEditIndex = this.getInitialActiveEditIndex(model, edits);
+                if (editSession.edits.length) {
+                    const activeEditIndex = this.getInitialActiveEditIndex(model, editSession.edits);
                     const canShowWidget = editor.getOption(EditorOption.dropIntoEditor).showDropSelector === 'afterDrop';
-                    await this._postDropWidgetManager.applyEditAndShowIfNeeded([Range.fromPositions(position)], { activeEditIndex, allEdits: edits }, canShowWidget, async (edit) => edit, token);
+                    await this._postDropWidgetManager.applyEditAndShowIfNeeded([Range.fromPositions(position)], { activeEditIndex, allEdits: editSession.edits }, canShowWidget, async (edit) => edit, token);
                 }
             }
             finally {
-                tokenSource.dispose();
+                disposables.dispose();
                 if (this._currentOperation === p) {
                     this._currentOperation = undefined;
                 }
             }
         });
-        this._dropProgressManager.showWhile(position, ( localizeWithPath(_moduleId, 2, "Running drop handlers. Click to cancel")), p);
+        this._dropProgressManager.showWhile(position, ( localizeWithPath(_moduleId, 2, "Running drop handlers. Click to cancel")), p, { cancel: () => p.cancel() });
         this._currentOperation = p;
     }
     async getDropEdits(providers, model, position, dataTransfer, tokenSource) {
+        const disposables = ( (new DisposableStore()));
         const results = await raceCancellation(Promise.all(( (providers.map(async (provider) => {
             try {
                 const edits = await provider.provideDocumentDropEdits(model, position, dataTransfer, tokenSource.token);
-                return edits?.map(edit => ({ ...edit, providerId: provider.id }));
+                if (edits) {
+                    disposables.add(edits);
+                }
+                return edits?.edits.map(edit => ({ ...edit, providerId: provider.id }));
             }
             catch (err) {
                 console.error(err);
@@ -106,7 +111,10 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
             return undefined;
         })))), tokenSource.token);
         const edits = coalesce(results ?? []).flat();
-        return sortEditsByYieldTo(edits);
+        return {
+            edits: sortEditsByYieldTo(edits),
+            dispose: () => disposables.dispose()
+        };
     }
     getInitialActiveEditIndex(model, edits) {
         const preferredProviders = this._configService.getValue(defaultProviderConfig, { resource: model.uri });

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

@@ -314,9 +314,7 @@ class FindWidget extends Widget {
         else {
             this._matchesCount.title = '';
         }
-        if (this._matchesCount.firstChild) {
-            this._matchesCount.removeChild(this._matchesCount.firstChild);
-        }
+        this._matchesCount.firstChild?.remove();
         let label;
         if (this._state.matchesCount > 0) {
             let matchesCount = String(this._state.matchesCount);
@@ -1065,7 +1063,7 @@ class SimpleButton extends Widget {
         this._domNode.className = className;
         this._domNode.setAttribute('role', 'button');
         this._domNode.setAttribute('aria-label', this._opts.label);
-        this._register(hoverService.setupUpdatableHover(opts.hoverDelegate ?? getDefaultHoverDelegate('element'), this._domNode, this._opts.label));
+        this._register(hoverService.setupManagedHover(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/folding.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .margin-view-overlays .codicon-folding-collapsed,.monaco-editor .margin-view-overlays .codicon-folding-expanded,.monaco-editor .margin-view-overlays .codicon-folding-manual-collapsed,.monaco-editor .margin-view-overlays .codicon-folding-manual-expanded{align-items:center;cursor:pointer;display:flex;font-size:140%;justify-content:center;margin-left:2px;opacity:0;transition:opacity .5s}.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-collapsed,.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-expanded,.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-collapsed,.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-expanded{transition:initial}.monaco-editor .margin-view-overlays .codicon.alwaysShowFoldIcons,.monaco-editor .margin-view-overlays .codicon.codicon-folding-collapsed,.monaco-editor .margin-view-overlays .codicon.codicon-folding-manual-collapsed,.monaco-editor .margin-view-overlays:hover .codicon{opacity:1}.monaco-editor .inline-folded:after{color:grey;content:\"\\22EF\";cursor:pointer;display:inline;line-height:1em;margin:.1em .2em 0}.monaco-editor .folded-background{background-color:var(--vscode-editor-foldBackground)}.monaco-editor .cldr.codicon.codicon-folding-collapsed,.monaco-editor .cldr.codicon.codicon-folding-expanded,.monaco-editor .cldr.codicon.codicon-folding-manual-collapsed,.monaco-editor .cldr.codicon.codicon-folding-manual-expanded{color:var(--vscode-editorGutter-foldingControlForeground)!important}";
+var css = ".monaco-editor .margin-view-overlays .codicon-folding-collapsed,.monaco-editor .margin-view-overlays .codicon-folding-expanded,.monaco-editor .margin-view-overlays .codicon-folding-manual-collapsed,.monaco-editor .margin-view-overlays .codicon-folding-manual-expanded{align-items:center;cursor:pointer;display:flex;font-size:140%;justify-content:center;margin-left:2px;opacity:0;transition:opacity .5s}.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-collapsed,.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-expanded,.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-collapsed,.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-expanded{transition:initial}.monaco-editor .margin-view-overlays .codicon.alwaysShowFoldIcons,.monaco-editor .margin-view-overlays .codicon.codicon-folding-collapsed,.monaco-editor .margin-view-overlays .codicon.codicon-folding-manual-collapsed,.monaco-editor .margin-view-overlays:hover .codicon{opacity:1}.monaco-editor .inline-folded:after{color:var(--vscode-editor-foldPlaceholderForeground);content:\"\\22EF\";cursor:pointer;display:inline;line-height:1em;margin:.1em .2em 0}.monaco-editor .folded-background{background-color:var(--vscode-editor-foldBackground)}.monaco-editor .cldr.codicon.codicon-folding-collapsed,.monaco-editor .cldr.codicon.codicon-folding-expanded,.monaco-editor .cldr.codicon.codicon-folding-manual-collapsed,.monaco-editor .cldr.codicon.codicon-folding-manual-expanded{color:var(--vscode-editorGutter-foldingControlForeground)!important}";
 n(css,{});
 export { css, css as default };

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

@@ -672,11 +672,30 @@ class FoldRecursivelyAction extends FoldingAction {
         setCollapseStateLevelsDown(foldingModel, true, Number.MAX_VALUE, selectedLines);
     }
 }
+class ToggleFoldRecursivelyAction extends FoldingAction {
+    constructor() {
+        super({
+            id: 'editor.toggleFoldRecursively',
+            label: ( localizeWithPath(_moduleId, 5, "Toggle Fold Recursively")),
+            alias: 'Toggle Fold Recursively',
+            precondition: CONTEXT_FOLDING_ENABLED,
+            kbOpts: {
+                kbExpr: EditorContextKeys.editorTextFocus,
+                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyL),
+                weight: KeybindingWeight.EditorContrib
+            }
+        });
+    }
+    invoke(_foldingController, foldingModel, editor) {
+        const selectedLines = this.getSelectedLines(editor);
+        toggleCollapseState(foldingModel, Number.MAX_VALUE, selectedLines);
+    }
+}
 class FoldAllBlockCommentsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllBlockComments',
-            label: ( localizeWithPath(_moduleId, 5, "Fold All Block Comments")),
+            label: ( localizeWithPath(_moduleId, 6, "Fold All Block Comments")),
             alias: 'Fold All Block Comments',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -707,7 +726,7 @@ class FoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllMarkerRegions',
-            label: ( localizeWithPath(_moduleId, 6, "Fold All Regions")),
+            label: ( localizeWithPath(_moduleId, 7, "Fold All Regions")),
             alias: 'Fold All Regions',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -738,7 +757,7 @@ class UnfoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllMarkerRegions',
-            label: ( localizeWithPath(_moduleId, 7, "Unfold All Regions")),
+            label: ( localizeWithPath(_moduleId, 8, "Unfold All Regions")),
             alias: 'Unfold All Regions',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -769,7 +788,7 @@ class FoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllExcept',
-            label: ( localizeWithPath(_moduleId, 8, "Fold All Except Selected")),
+            label: ( localizeWithPath(_moduleId, 9, "Fold All Except Selected")),
             alias: 'Fold All Except Selected',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -788,7 +807,7 @@ class UnfoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllExcept',
-            label: ( localizeWithPath(_moduleId, 9, "Unfold All Except Selected")),
+            label: ( localizeWithPath(_moduleId, 10, "Unfold All Except Selected")),
             alias: 'Unfold All Except Selected',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -807,7 +826,7 @@ class FoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAll',
-            label: ( localizeWithPath(_moduleId, 10, "Fold All")),
+            label: ( localizeWithPath(_moduleId, 11, "Fold All")),
             alias: 'Fold All',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -825,7 +844,7 @@ class UnfoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAll',
-            label: ( localizeWithPath(_moduleId, 11, "Unfold All")),
+            label: ( localizeWithPath(_moduleId, 12, "Unfold All")),
             alias: 'Unfold All',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -853,7 +872,7 @@ class GotoParentFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoParentFold',
-            label: ( localizeWithPath(_moduleId, 12, "Go to Parent Fold")),
+            label: ( localizeWithPath(_moduleId, 13, "Go to Parent Fold")),
             alias: 'Go to Parent Fold',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -881,7 +900,7 @@ class GotoPreviousFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoPreviousFold',
-            label: ( localizeWithPath(_moduleId, 13, "Go to Previous Folding Range")),
+            label: ( localizeWithPath(_moduleId, 14, "Go to Previous Folding Range")),
             alias: 'Go to Previous Folding Range',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -909,7 +928,7 @@ class GotoNextFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoNextFold',
-            label: ( localizeWithPath(_moduleId, 14, "Go to Next Folding Range")),
+            label: ( localizeWithPath(_moduleId, 15, "Go to Next Folding Range")),
             alias: 'Go to Next Folding Range',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -937,7 +956,7 @@ class FoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.createFoldingRangeFromSelection',
-            label: ( localizeWithPath(_moduleId, 15, "Create Folding Range from Selection")),
+            label: ( localizeWithPath(_moduleId, 16, "Create Folding Range from Selection")),
             alias: 'Create Folding Range from Selection',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -986,7 +1005,7 @@ class RemoveFoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.removeManualFoldingRanges',
-            label: ( localizeWithPath(_moduleId, 16, "Remove Manual Folding Ranges")),
+            label: ( localizeWithPath(_moduleId, 17, "Remove Manual Folding Ranges")),
             alias: 'Remove Manual Folding Ranges',
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
@@ -1014,6 +1033,7 @@ registerEditorAction(UnfoldAction);
 registerEditorAction(UnFoldRecursivelyAction);
 registerEditorAction(FoldAction);
 registerEditorAction(FoldRecursivelyAction);
+registerEditorAction(ToggleFoldRecursivelyAction);
 registerEditorAction(FoldAllAction);
 registerEditorAction(UnfoldAllAction);
 registerEditorAction(FoldAllBlockCommentsAction);
@@ -1030,7 +1050,7 @@ registerEditorAction(RemoveFoldRangeFromSelectionAction);
 for (let i = 1; i <= 7; i++) {
     registerInstantiatedEditorAction(( (new FoldLevelAction({
         id: FoldLevelAction.ID(i),
-        label: ( localizeWithPath(_moduleId, 17, "Fold Level {0}", i)),
+        label: ( localizeWithPath(_moduleId, 18, "Fold Level {0}", i)),
         alias: `Fold Level ${i}`,
         precondition: CONTEXT_FOLDING_ENABLED,
         kbOpts: {

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

@@ -22,22 +22,27 @@ const foldBackground = registerColor('editor.foldBackground', { light: ( (transp
     0,
     "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."
 )), true);
-registerColor('editorGutter.foldingControlForeground', { dark: iconForeground, light: iconForeground, hcDark: iconForeground, hcLight: iconForeground }, ( localizeWithPath(_moduleId, 1, 'Color of the folding control in the editor gutter.')));
-const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localizeWithPath(_moduleId, 2, 'Icon for expanded ranges in the editor glyph margin.')));
-const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localizeWithPath(_moduleId, 3, 'Icon for collapsed ranges in the editor glyph margin.')));
+registerColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, ( localizeWithPath(
+    _moduleId,
+    1,
+    "Color of the collapsed text after the first line of a folded range."
+)));
+registerColor('editorGutter.foldingControlForeground', iconForeground, ( localizeWithPath(_moduleId, 2, 'Color of the folding control in the editor gutter.')));
+const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localizeWithPath(_moduleId, 3, 'Icon for expanded ranges in the editor glyph margin.')));
+const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localizeWithPath(_moduleId, 4, 'Icon for collapsed ranges in the editor glyph margin.')));
 const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, ( localizeWithPath(
     _moduleId,
-    4,
+    5,
     'Icon for manually collapsed ranges in the editor glyph margin.'
 )));
 const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, ( localizeWithPath(
     _moduleId,
-    5,
+    6,
     'Icon for manually expanded ranges in the editor glyph margin.'
 )));
 const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };
-const collapsed = ( localizeWithPath(_moduleId, 6, "Click to expand the range."));
-const expanded = ( localizeWithPath(_moduleId, 7, "Click to collapse the range."));
+const collapsed = ( localizeWithPath(_moduleId, 7, "Click to expand the range."));
+const expanded = ( localizeWithPath(_moduleId, 8, "Click to collapse the range."));
 class FoldingDecorationProvider {
     static { this.COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-collapsed-visual-decoration',

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

@@ -354,5 +354,5 @@ const editorMarkerNavigationWarningHeader = registerColor('editorMarkerNavigatio
 )));
 const editorMarkerNavigationInfo = registerColor('editorMarkerNavigationInfo.background', { dark: infoDefault, light: infoDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 11, 'Editor marker navigation widget info color.')));
 const editorMarkerNavigationInfoHeader = registerColor('editorMarkerNavigationInfo.headerBackground', { dark: ( (transparent(editorMarkerNavigationInfo, .1))), light: ( (transparent(editorMarkerNavigationInfo, .1))), hcDark: null, hcLight: null }, ( localizeWithPath(_moduleId, 12, 'Editor marker navigation widget info heading background.')));
-const editorMarkerNavigationBackground = registerColor('editorMarkerNavigation.background', { dark: editorBackground, light: editorBackground, hcDark: editorBackground, hcLight: editorBackground }, ( localizeWithPath(_moduleId, 13, 'Editor marker navigation widget background.')));
+const editorMarkerNavigationBackground = registerColor('editorMarkerNavigation.background', editorBackground, ( localizeWithPath(_moduleId, 13, 'Editor marker navigation widget background.')));
 export { MarkerNavigationWidget };

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

@@ -304,7 +304,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
                 this._onDidSelectReference.fire({ element, kind, source: 'tree' });
             }
         };
-        this._tree.onDidOpen(e => {
+        this._disposables.add(this._tree.onDidOpen(e => {
             if (e.sideBySide) {
                 onEvent(e.element, 'side');
             }
@@ -314,7 +314,7 @@ let ReferenceWidget = class ReferenceWidget extends PeekViewWidget {
             else {
                 onEvent(e.element, 'show');
             }
-        });
+        }));
         hide(this._treeContainer);
     }
     _onWidth(width) {