@codingame/monaco-vscode-api 5.3.0 → 6.0.0

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

@@ -1,13 +1,15 @@
-import { registerEditorContribution, registerEditorCommand, EditorCommand } from '../../../browser/editorExtensions.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
+import { registerEditorContribution, registerEditorCommand, EditorCommand, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { editorConfigurationBaseNode } from '../../../common/config/editorConfigurationSchema.js';
 import { registerEditorFeature } from '../../../common/editorFeatures.js';
 import { DefaultDropProvidersFeature } from './defaultProviders.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Extensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { changeDropTypeCommandId, dropWidgetVisibleCtx, DropIntoEditorController, defaultProviderConfig } from './dropIntoEditorController.js';
 const _moduleId = "vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution";
-registerEditorContribution(DropIntoEditorController.ID, DropIntoEditorController, 2 );
+registerEditorContribution(DropIntoEditorController.ID, DropIntoEditorController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorFeature(DefaultDropProvidersFeature);
 registerEditorCommand(new (class extends EditorCommand {
     constructor() {
@@ -15,8 +17,8 @@ registerEditorCommand(new (class extends EditorCommand {
             id: changeDropTypeCommandId,
             precondition: dropWidgetVisibleCtx,
             kbOpts: {
-                weight: 100 ,
-                primary: 2048  | 89 ,
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyMod$1.CtrlCmd | KeyCode.Period,
             }
         });
     }
@@ -30,8 +32,8 @@ registerEditorCommand(new (class extends EditorCommand {
             id: 'editor.hideDropWidget',
             precondition: dropWidgetVisibleCtx,
             kbOpts: {
-                weight: 100 ,
-                primary: 9 ,
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.Escape,
             }
         });
     }
@@ -44,7 +46,7 @@ registerEditorCommand(new (class extends EditorCommand {
     properties: {
         [defaultProviderConfig]: {
             type: 'object',
-            scope: 5 ,
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             description: ( localizeWithPath(
                 _moduleId,
                 0,

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

@@ -5,11 +5,12 @@ import { matchesMimeType, VSDataTransfer } from '../../../../base/common/dataTra
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } 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';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { DraggedTreeItemsIdentifier } from '../../../common/services/treeViewsDnd.js';
 import { ITreeViewsDnDService } from '../../../common/services/treeViewsDndService.js';
-import { EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { EditorStateCancellationTokenSource, CodeEditorStateFlag } from '../../editorState/browser/editorState.js';
 import { InlineProgressManager } from '../../inlineProgress/browser/inlineProgress.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -53,7 +54,7 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
         editor.focus();
         editor.setPosition(position);
         const p = createCancelablePromise(async (token) => {
-            const tokenSource = ( (new EditorStateCancellationTokenSource(editor, 1 , undefined, token)));
+            const tokenSource = ( (new EditorStateCancellationTokenSource(editor, CodeEditorStateFlag.Value, undefined, token)));
             try {
                 const ourDataTransfer = await this.extractDataTransferData(dragEvent);
                 if (ourDataTransfer.size === 0 || tokenSource.token.isCancellationRequested) {
@@ -79,7 +80,7 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
                 }
                 if (edits.length) {
                     const activeEditIndex = this.getInitialActiveEditIndex(model, edits);
-                    const canShowWidget = editor.getOption(36 ).showDropSelector === 'afterDrop';
+                    const canShowWidget = editor.getOption(EditorOption.dropIntoEditor).showDropSelector === 'afterDrop';
                     await this._postDropWidgetManager.applyEditAndShowIfNeeded([Range.fromPositions(position)], { activeEditIndex, allEdits: edits }, canShowWidget, async (edit) => edit, token);
                 }
             }

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

@@ -2,16 +2,23 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { $, addDisposableListener, getDomNodePagePosition, EventType } from '../../../../base/browser/dom.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { toAction } from '../../../../base/common/actions.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
 import { Disposable, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import './postEditWidget.css.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
 import { createCombinedWorkspaceEdit } from './edit.js';
+import { localizeWithPath } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 var PostEditWidget_1;
+const _moduleId = "vs/editor/contrib/dropOrPasteInto/browser/postEditWidget";
 let PostEditWidget = class PostEditWidget extends Disposable {
     static { PostEditWidget_1 = this; }
     static { this.baseId = 'editor.widget.postEditWidget'; }
@@ -49,9 +56,9 @@ let PostEditWidget = class PostEditWidget extends Disposable {
     }
     create() {
         this.domNode = $('.post-edit-widget');
-        this.button = this._register(( new Button(this.domNode, {
+        this.button = this._register(( (new Button(this.domNode, {
             supportIcons: true,
-        })));
+        }))));
         this.button.label = '$(insert)';
         this._register(addDisposableListener(this.domNode, EventType.CLICK, () => this.showSelector()));
     }
@@ -64,7 +71,7 @@ let PostEditWidget = class PostEditWidget extends Disposable {
     getPosition() {
         return {
             position: this.range.getEndPosition(),
-            preference: [2 ]
+            preference: [ContentWidgetPositionPreference.BELOW]
         };
     }
     showSelector() {
@@ -74,27 +81,29 @@ let PostEditWidget = class PostEditWidget extends Disposable {
                 return { x: pos.left + pos.width, y: pos.top + pos.height };
             },
             getActions: () => {
-                return ( this.edits.allEdits.map((edit, i) => toAction({
-                    id: '',
-                    label: edit.title,
-                    checked: i === this.edits.activeEditIndex,
-                    run: () => {
-                        if (i !== this.edits.activeEditIndex) {
-                            return this.onSelectNewEdit(i);
-                        }
-                    },
-                })));
+                return (
+                     (this.edits.allEdits.map((edit, i) => toAction({
+                        id: '',
+                        label: edit.title,
+                        checked: i === this.edits.activeEditIndex,
+                        run: () => {
+                            if (i !== this.edits.activeEditIndex) {
+                                return this.onSelectNewEdit(i);
+                            }
+                        },
+                    })))
+                );
             }
         });
     }
 };
-PostEditWidget = PostEditWidget_1 = ( __decorate([
-    ( __param(7, IContextMenuService)),
-    ( __param(8, IContextKeyService)),
-    ( __param(9, IKeybindingService))
-], PostEditWidget));
+PostEditWidget = PostEditWidget_1 = ( (__decorate([
+    ( (__param(7, IContextMenuService))),
+    ( (__param(8, IContextKeyService))),
+    ( (__param(9, IKeybindingService)))
+], PostEditWidget)));
 let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
-    constructor(_id, _editor, _visibleContext, _showCommand, _instantiationService, _bulkEditService) {
+    constructor(_id, _editor, _visibleContext, _showCommand, _instantiationService, _bulkEditService, _notificationService) {
         super();
         this._id = _id;
         this._editor = _editor;
@@ -102,7 +111,8 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
         this._showCommand = _showCommand;
         this._instantiationService = _instantiationService;
         this._bulkEditService = _bulkEditService;
-        this._currentWidget = this._register(( new MutableDisposable()));
+        this._notificationService = _notificationService;
+        this._currentWidget = this._register(( (new MutableDisposable())));
         this._register(Event.any(_editor.onDidChangeModel, _editor.onDidChangeModelContent)(() => this.clear()));
     }
     async applyEditAndShowIfNeeded(ranges, edits, canShowWidget, resolve, token) {
@@ -114,7 +124,36 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
         if (!edit) {
             return;
         }
-        const resolvedEdit = await resolve(edit, token);
+        const onDidSelectEdit = async (newEditIndex) => {
+            const model = this._editor.getModel();
+            if (!model) {
+                return;
+            }
+            await model.undo();
+            this.applyEditAndShowIfNeeded(ranges, { activeEditIndex: newEditIndex, allEdits: edits.allEdits }, canShowWidget, resolve, token);
+        };
+        const handleError = (e, message) => {
+            if (isCancellationError(e)) {
+                return;
+            }
+            this._notificationService.error(message);
+            if (canShowWidget) {
+                this.show(ranges[0], edits, onDidSelectEdit);
+            }
+        };
+        let resolvedEdit;
+        try {
+            resolvedEdit = await resolve(edit, token);
+        }
+        catch (e) {
+            return handleError(e, ( localizeWithPath(
+                _moduleId,
+                0,
+                "Error resolving edit '{0}':\n{1}",
+                edit.title,
+                toErrorMessage(e)
+            )));
+        }
         if (token.isCancellationRequested) {
             return;
         }
@@ -122,7 +161,7 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
         const primaryRange = ranges[0];
         const editTrackingDecoration = model.deltaDecorations([], [{
                 range: primaryRange,
-                options: { description: 'paste-line-suffix', stickiness: 0  }
+                options: { description: 'paste-line-suffix', stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges }
             }]);
         this._editor.focus();
         let editResult;
@@ -131,6 +170,15 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
             editResult = await this._bulkEditService.apply(combinedWorkspaceEdit, { editor: this._editor, token });
             editRange = model.getDecorationRange(editTrackingDecoration[0]);
         }
+        catch (e) {
+            return handleError(e, ( localizeWithPath(
+                _moduleId,
+                1,
+                "Error applying edit '{0}':\n{1}",
+                edit.title,
+                toErrorMessage(e)
+            )));
+        }
         finally {
             model.deltaDecorations(editTrackingDecoration, []);
         }
@@ -138,14 +186,7 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
             return;
         }
         if (canShowWidget && editResult.isApplied && edits.allEdits.length > 1) {
-            this.show(editRange ?? primaryRange, edits, async (newEditIndex) => {
-                const model = this._editor.getModel();
-                if (!model) {
-                    return;
-                }
-                await model.undo();
-                this.applyEditAndShowIfNeeded(ranges, { activeEditIndex: newEditIndex, allEdits: edits.allEdits }, canShowWidget, resolve, token);
-            });
+            this.show(editRange ?? primaryRange, edits, onDidSelectEdit);
         }
     }
     show(range, edits, onDidSelectEdit) {
@@ -161,8 +202,9 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
         this._currentWidget.value?.showSelector();
     }
 };
-PostEditWidgetManager = ( __decorate([
-    ( __param(4, IInstantiationService)),
-    ( __param(5, IBulkEditService))
-], PostEditWidgetManager));
+PostEditWidgetManager = ( (__decorate([
+    ( (__param(4, IInstantiationService))),
+    ( (__param(5, IBulkEditService))),
+    ( (__param(6, INotificationService)))
+], PostEditWidgetManager)));
 export { PostEditWidgetManager };

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

@@ -3,29 +3,36 @@ import { Range } from '../../../common/core/range.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { EditorKeybindingCancellationTokenSource } from './keybindingCancellation.js';
+var CodeEditorStateFlag;
+( (function(CodeEditorStateFlag) {
+    CodeEditorStateFlag[CodeEditorStateFlag["Value"] = 1] = "Value";
+    CodeEditorStateFlag[CodeEditorStateFlag["Selection"] = 2] = "Selection";
+    CodeEditorStateFlag[CodeEditorStateFlag["Position"] = 4] = "Position";
+    CodeEditorStateFlag[CodeEditorStateFlag["Scroll"] = 8] = "Scroll";
+})(CodeEditorStateFlag || (CodeEditorStateFlag = {})));
 class EditorState {
     constructor(editor, flags) {
         this.flags = flags;
-        if (((this.flags & 1) ) !== 0) {
+        if ((this.flags & CodeEditorStateFlag.Value) !== 0) {
             const model = editor.getModel();
             this.modelVersionId = model ? format('{0}#{1}', ( model.uri.toString()), model.getVersionId()) : null;
         }
         else {
             this.modelVersionId = null;
         }
-        if (((this.flags & 4) ) !== 0) {
+        if ((this.flags & CodeEditorStateFlag.Position) !== 0) {
             this.position = editor.getPosition();
         }
         else {
             this.position = null;
         }
-        if (((this.flags & 2) ) !== 0) {
+        if ((this.flags & CodeEditorStateFlag.Selection) !== 0) {
             this.selection = editor.getSelection();
         }
         else {
             this.selection = null;
         }
-        if (((this.flags & 8) ) !== 0) {
+        if ((this.flags & CodeEditorStateFlag.Scroll) !== 0) {
             this.scrollLeft = editor.getScrollLeft();
             this.scrollTop = editor.getScrollTop();
         }
@@ -61,24 +68,24 @@ class EditorStateCancellationTokenSource extends EditorKeybindingCancellationTok
     constructor(editor, flags, range, parent) {
         super(editor, parent);
         this._listener = ( new DisposableStore());
-        if (flags & 4 ) {
+        if (flags & CodeEditorStateFlag.Position) {
             this._listener.add(editor.onDidChangeCursorPosition(e => {
                 if (!range || !Range.containsPosition(range, e.position)) {
                     this.cancel();
                 }
             }));
         }
-        if (flags & 2 ) {
+        if (flags & CodeEditorStateFlag.Selection) {
             this._listener.add(editor.onDidChangeCursorSelection(e => {
                 if (!range || !Range.containsRange(range, e.selection)) {
                     this.cancel();
                 }
             }));
         }
-        if (flags & 8 ) {
+        if (flags & CodeEditorStateFlag.Scroll) {
             this._listener.add(editor.onDidScrollChange(_ => this.cancel()));
         }
-        if (flags & 1 ) {
+        if (flags & CodeEditorStateFlag.Value) {
             this._listener.add(editor.onDidChangeModel(_ => this.cancel()));
             this._listener.add(editor.onDidChangeModelContent(_ => this.cancel()));
         }
@@ -98,4 +105,4 @@ class TextModelCancellationTokenSource extends CancellationTokenSource {
         super.dispose();
     }
 }
-export { EditorState, EditorStateCancellationTokenSource, TextModelCancellationTokenSource };
+export { CodeEditorStateFlag, EditorState, EditorStateCancellationTokenSource, TextModelCancellationTokenSource };

package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js

@@ -1,10 +1,12 @@
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { registerEditorCommand, EditorCommand } from '../../../browser/editorExtensions.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { LinkedList } from '../../../../base/common/linkedList.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { localizeWithPath } from '../../../../nls.js';
 const _moduleId = "vs/editor/contrib/editorState/browser/keybindingCancellation";
 const IEditorCancellationTokens = ( (createDecorator('IEditorCancelService')));
@@ -49,7 +51,7 @@ registerSingleton(IEditorCancellationTokens, class {
             data.key.set(!data.tokens.isEmpty());
         }
     }
-}, 1 );
+}, InstantiationType.Delayed);
 class EditorKeybindingCancellationTokenSource extends CancellationTokenSource {
     constructor(editor, parent) {
         super(parent);
@@ -66,8 +68,8 @@ registerEditorCommand(new (class extends EditorCommand {
         super({
             id: 'editor.cancelOperation',
             kbOpts: {
-                weight: 100 ,
-                primary: 9
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.Escape
             },
             precondition: ctxCancellableOperation
         });