@codingame/monaco-vscode-api 8.0.4 → 9.0.2

package/vscode/src/vs/editor/browser/controller/mouseHandler.js

@@ -16,8 +16,6 @@ class MouseHandler extends ViewEventHandler {
     constructor(context, viewController, viewHelper) {
         super();
         this._mouseLeaveMonitor = null;
-        this._mouseOnOverflowWidgetsDomNode = false;
-        this._mouseOnViewDomNode = false;
         this._context = context;
         this.viewController = viewController;
         this.viewHelper = viewHelper;
@@ -27,7 +25,7 @@ class MouseHandler extends ViewEventHandler {
             this.viewController,
             this.viewHelper,
             this.mouseTargetFactory,
-            (e, testEventTarget) => this._createMouseTargetForView(e, testEventTarget),
+            (e, testEventTarget) => this._createMouseTarget(e, testEventTarget),
             (e) => this._getMouseColumn(e)
         )));
         this.lastMouseLeaveTime = -1;
@@ -35,47 +33,17 @@ class MouseHandler extends ViewEventHandler {
         const mouseEvents = ( new EditorMouseEventFactory(this.viewHelper.viewDomNode));
         this._register(mouseEvents.onContextMenu(this.viewHelper.viewDomNode, (e) => this._onContextMenu(e, true)));
         this._register(mouseEvents.onMouseMove(this.viewHelper.viewDomNode, (e) => {
-            this._mouseOnViewDomNode = true;
-            this._onMouseMoveOverView(e);
+            this._onMouseMove(e);
             if (!this._mouseLeaveMonitor) {
                 this._mouseLeaveMonitor = addDisposableListener(this.viewHelper.viewDomNode.ownerDocument, 'mousemove', (e) => {
                     if (!this.viewHelper.viewDomNode.contains(e.target)) {
-                        this._mouseOnViewDomNode = false;
-                        setTimeout(() => {
-                            if (!this._mouseOnOverflowWidgetsDomNode) {
-                                this._onMouseLeave(( new EditorMouseEvent(e, false, this.viewHelper.viewDomNode)));
-                            }
-                        }, 0);
+                        this._onMouseLeave(( new EditorMouseEvent(e, false, this.viewHelper.viewDomNode)));
                     }
                 });
             }
         }));
         this._register(mouseEvents.onMouseUp(this.viewHelper.viewDomNode, (e) => this._onMouseUp(e)));
-        this._register(mouseEvents.onMouseLeave(this.viewHelper.viewDomNode, (e) => {
-            this._mouseOnViewDomNode = false;
-            setTimeout(() => {
-                if (!this._mouseOnOverflowWidgetsDomNode) {
-                    this._onMouseLeave(e);
-                }
-            }, 0);
-        }));
-        const overflowWidgetsDomNode = this.viewHelper.overflowWidgetsDomNode;
-        if (overflowWidgetsDomNode) {
-            this._register(mouseEvents.onMouseMove(overflowWidgetsDomNode, (e) => {
-                this._mouseOnOverflowWidgetsDomNode = true;
-                this._mouseLeaveMonitor?.dispose();
-                this._mouseLeaveMonitor = null;
-                this._onMouseMoveOverOverflowWidgetsDomNode(e);
-            }));
-            this._register(mouseEvents.onMouseLeave(overflowWidgetsDomNode, (e) => {
-                this._mouseOnOverflowWidgetsDomNode = false;
-                setTimeout(() => {
-                    if (!this._mouseOnViewDomNode) {
-                        this._onMouseLeave(e);
-                    }
-                }, 0);
-            }));
-        }
+        this._register(mouseEvents.onMouseLeave(this.viewHelper.viewDomNode, (e) => this._onMouseLeave(e)));
         let capturePointerId = 0;
         this._register(mouseEvents.onPointerDown(this.viewHelper.viewDomNode, (e, pointerId) => {
             capturePointerId = pointerId;
@@ -164,9 +132,9 @@ class MouseHandler extends ViewEventHandler {
             return null;
         }
         const relativePos = createCoordinatesRelativeToEditor(this.viewHelper.viewDomNode, editorPos, pos);
-        return this.mouseTargetFactory.createMouseTargetForView(this.viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
+        return this.mouseTargetFactory.createMouseTarget(this.viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
     }
-    _createMouseTargetForView(e, testEventTarget) {
+    _createMouseTarget(e, testEventTarget) {
         let target = e.target;
         if (!this.viewHelper.viewDomNode.contains(target)) {
             const shadowRoot = getShadowRoot(this.viewHelper.viewDomNode);
@@ -174,10 +142,7 @@ class MouseHandler extends ViewEventHandler {
                 target = shadowRoot.elementsFromPoint(e.posx, e.posy).find((el) => this.viewHelper.viewDomNode.contains(el));
             }
         }
-        return this.mouseTargetFactory.createMouseTargetForView(this.viewHelper.getLastRenderData(), e.editorPos, e.pos, e.relativePos, testEventTarget ? target : null);
-    }
-    _createMouseTargetForOverflowWidgetsDomNode(e) {
-        return this.mouseTargetFactory.createMouseTargetForOverflowWidgetsDomNode(this.viewHelper.getLastRenderData(), e.editorPos, e.pos, e.relativePos, e.target);
+        return this.mouseTargetFactory.createMouseTarget(this.viewHelper.getLastRenderData(), e.editorPos, e.pos, e.relativePos, testEventTarget ? target : null);
     }
     _getMouseColumn(e) {
         return this.mouseTargetFactory.getMouseColumn(e.relativePos);
@@ -185,38 +150,25 @@ class MouseHandler extends ViewEventHandler {
     _onContextMenu(e, testEventTarget) {
         this.viewController.emitContextMenu({
             event: e,
-            target: this._createMouseTargetForView(e, testEventTarget)
-        });
-    }
-    _onMouseMoveOverView(e) {
-        this._onMouseMove(e, this._createMouseTargetForView(e, true));
-    }
-    _onMouseMoveOverOverflowWidgetsDomNode(e) {
-        this._onMouseMove(e, this._createMouseTargetForOverflowWidgetsDomNode(e));
-    }
-    _onMouseMove(e, target) {
-        const shouldIgnoreMouseMoveEvent = this._shouldIgnoreMouseMoveEvent(e);
-        if (shouldIgnoreMouseMoveEvent) {
-            return undefined;
-        }
-        this.viewController.emitMouseMove({
-            event: e,
-            target
+            target: this._createMouseTarget(e, testEventTarget)
         });
     }
-    _shouldIgnoreMouseMoveEvent(e) {
+    _onMouseMove(e) {
         const targetIsWidget = this.mouseTargetFactory.mouseTargetIsWidget(e);
         if (!targetIsWidget) {
             e.preventDefault();
         }
         if (this._mouseDownOperation.isActive()) {
-            return true;
+            return;
         }
         const actualMouseMoveTime = e.timestamp;
         if (actualMouseMoveTime < this.lastMouseLeaveTime) {
-            return true;
+            return;
         }
-        return false;
+        this.viewController.emitMouseMove({
+            event: e,
+            target: this._createMouseTarget(e, true)
+        });
     }
     _onMouseLeave(e) {
         if (this._mouseLeaveMonitor) {
@@ -232,11 +184,11 @@ class MouseHandler extends ViewEventHandler {
     _onMouseUp(e) {
         this.viewController.emitMouseUp({
             event: e,
-            target: this._createMouseTargetForView(e, true)
+            target: this._createMouseTarget(e, true)
         });
     }
     _onMouseDown(e, pointerId) {
-        const t = this._createMouseTargetForView(e, true);
+        const t = this._createMouseTarget(e, true);
         const targetIsContent = (t.type === MouseTargetType.CONTENT_TEXT || t.type === MouseTargetType.CONTENT_EMPTY);
         const targetIsGutter = (t.type === MouseTargetType.GUTTER_GLYPH_MARGIN || t.type === MouseTargetType.GUTTER_LINE_NUMBERS || t.type === MouseTargetType.GUTTER_LINE_DECORATIONS);
         const targetIsLineNumbers = (t.type === MouseTargetType.GUTTER_LINE_NUMBERS);
@@ -578,7 +530,7 @@ class TopBottomDragScrollingOperation extends Disposable {
                 editorPos.y + editorPos.height - horizontalScrollbarHeight - 0.1
             ));
             const relativePos = createCoordinatesRelativeToEditor(this._viewHelper.viewDomNode, editorPos, pos);
-            mouseTarget = this._mouseTargetFactory.createMouseTargetForView(this._viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
+            mouseTarget = this._mouseTargetFactory.createMouseTarget(this._viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
         }
         if (!mouseTarget.position || mouseTarget.position.lineNumber !== edgeLineNumber) {
             if (this._position.outsidePosition === 'above') {

package/vscode/src/vs/editor/browser/controller/mouseTarget.js

@@ -182,7 +182,6 @@ class HitTestContext {
         const options = context.configuration.options;
         this.layoutInfo = options.get(EditorOption.layoutInfo);
         this.viewDomNode = viewHelper.viewDomNode;
-        this.overflowWidgetsDomNode = viewHelper.overflowWidgetsDomNode ?? null;
         this.lineHeight = options.get(EditorOption.lineHeight);
         this.stickyTabStops = options.get(EditorOption.stickyTabStops);
         this.typicalHalfwidthCharacterWidth = options.get(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
@@ -314,21 +313,19 @@ class HitTestRequest extends BareHitTestRequest {
         return this._eventTarget;
     }
     get targetPath() {
-        if (this._targetPathCacheElement !== this.target && this._targetElement) {
+        if (this._targetPathCacheElement !== this.target) {
             this._targetPathCacheElement = this.target;
-            this._targetPathCacheValue = PartFingerprints.collect(this.target, this._targetElement);
+            this._targetPathCacheValue = PartFingerprints.collect(this.target, this._ctx.viewDomNode);
         }
         return this._targetPathCacheValue;
     }
-    constructor(ctx, editorPos, pos, relativePos, eventTarget, targetElement = null) {
+    constructor(ctx, editorPos, pos, relativePos, eventTarget) {
         super(ctx, editorPos, pos, relativePos);
         this.hitTestResult = ( new Lazy(() => MouseTargetFactory.doHitTest(this._ctx, this)));
         this._targetPathCacheElement = null;
         this._targetPathCacheValue = ( new Uint8Array(0));
-        this._targetElement = null;
         this._ctx = ctx;
         this._eventTarget = eventTarget;
-        this._targetElement = targetElement;
         const hasEventTarget = Boolean(this._eventTarget);
         this._useHitTestTarget = !hasEventTarget;
     }
@@ -400,9 +397,9 @@ class MouseTargetFactory {
         }
         return false;
     }
-    createMouseTargetForView(lastRenderData, editorPos, pos, relativePos, target) {
+    createMouseTarget(lastRenderData, editorPos, pos, relativePos, target) {
         const ctx = ( new HitTestContext(this._context, this._viewHelper, lastRenderData));
-        const request = ( new HitTestRequest(ctx, editorPos, pos, relativePos, target, ctx.viewDomNode));
+        const request = ( new HitTestRequest(ctx, editorPos, pos, relativePos, target));
         try {
             const r = MouseTargetFactory._createMouseTarget(ctx, request);
             if (r.type === MouseTargetType.CONTENT_TEXT) {
@@ -418,16 +415,6 @@ class MouseTargetFactory {
             return request.fulfillUnknown();
         }
     }
-    createMouseTargetForOverflowWidgetsDomNode(lastRenderData, editorPos, pos, relativePos, target) {
-        const ctx = ( new HitTestContext(this._context, this._viewHelper, lastRenderData));
-        const request = ( new HitTestRequest(ctx, editorPos, pos, relativePos, target, ctx.overflowWidgetsDomNode));
-        try {
-            return MouseTargetFactory._createMouseTarget(ctx, request);
-        }
-        catch (err) {
-            return request.fulfillUnknown();
-        }
-    }
     static _createMouseTarget(ctx, request) {
         if (request.target === null) {
             return request.fulfillUnknown();

package/vscode/src/vs/editor/browser/controller/pointerHandler.js

@@ -31,7 +31,7 @@ class PointerEventHandler extends MouseHandler {
             }
         }));
         const pointerEvents = ( new EditorPointerEventFactory(this.viewHelper.viewDomNode));
-        this._register(pointerEvents.onPointerMove(this.viewHelper.viewDomNode, (e) => this._onMouseMoveOverView(e)));
+        this._register(pointerEvents.onPointerMove(this.viewHelper.viewDomNode, (e) => this._onMouseMove(e)));
         this._register(pointerEvents.onPointerUp(this.viewHelper.viewDomNode, (e) => this._onMouseUp(e)));
         this._register(pointerEvents.onPointerLeave(this.viewHelper.viewDomNode, (e) => this._onMouseLeave(e)));
         this._register(pointerEvents.onPointerDown(this.viewHelper.viewDomNode, (e, pointerId) => this._onMouseDown(e, pointerId)));
@@ -53,7 +53,7 @@ class PointerEventHandler extends MouseHandler {
         }
     }
     _dispatchGesture(event, inSelectionMode) {
-        const target = this._createMouseTargetForView(( new EditorMouseEvent(event, false, this.viewHelper.viewDomNode)), false);
+        const target = this._createMouseTarget(( new EditorMouseEvent(event, false, this.viewHelper.viewDomNode)), false);
         if (target.position) {
             this.viewController.dispatchMouse({
                 position: target.position,
@@ -90,7 +90,7 @@ class TouchHandler extends MouseHandler {
     onTap(event) {
         event.preventDefault();
         this.viewHelper.focusTextArea();
-        const target = this._createMouseTargetForView(( new EditorMouseEvent(event, false, this.viewHelper.viewDomNode)), false);
+        const target = this._createMouseTarget(( new EditorMouseEvent(event, false, this.viewHelper.viewDomNode)), false);
         if (target.position) {
             const event = document.createEvent('CustomEvent');
             event.initEvent(TextAreaSyntethicEvents.Tap, false, true);

package/vscode/src/vs/editor/browser/controller/textAreaHandler.js

@@ -116,7 +116,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         this.textArea.setAttribute('aria-required', options.get(EditorOption.ariaRequired) ? 'true' : 'false');
         this.textArea.setAttribute('tabindex', String(options.get(EditorOption.tabIndex)));
         this.textArea.setAttribute('role', 'textbox');
-        this.textArea.setAttribute('aria-roledescription', ( localize(9840, "editor")));
+        this.textArea.setAttribute('aria-roledescription', ( localize(9870, "editor")));
         this.textArea.setAttribute('aria-multiline', 'true');
         this.textArea.setAttribute('aria-autocomplete', options.get(EditorOption.readOnly) ? 'none' : 'both');
         this._ensureReadOnlyAttribute();
@@ -408,10 +408,10 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             const toggleKeybindingLabel = this._keybindingService.lookupKeybinding('editor.action.toggleScreenReaderAccessibilityMode')?.getAriaLabel();
             const runCommandKeybindingLabel = this._keybindingService.lookupKeybinding('workbench.action.showCommands')?.getAriaLabel();
             const keybindingEditorKeybindingLabel = this._keybindingService.lookupKeybinding('workbench.action.openGlobalKeybindings')?.getAriaLabel();
-            const editorNotAccessibleMessage = ( localize(9841, "The editor is not accessible at this time."));
+            const editorNotAccessibleMessage = ( localize(9871, "The editor is not accessible at this time."));
             if (toggleKeybindingLabel) {
                 return ( localize(
-                    9842,
+                    9872,
                     "{0} To enable screen reader optimized mode, use {1}",
                     editorNotAccessibleMessage,
                     toggleKeybindingLabel
@@ -419,7 +419,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             }
             else if (runCommandKeybindingLabel) {
                 return ( localize(
-                    9843,
+                    9873,
                     "{0} To enable screen reader optimized mode, open the quick pick with {1} and run the command Toggle Screen Reader Accessibility Mode, which is currently not triggerable via keyboard.",
                     editorNotAccessibleMessage,
                     runCommandKeybindingLabel
@@ -427,7 +427,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             }
             else if (keybindingEditorKeybindingLabel) {
                 return ( localize(
-                    9844,
+                    9874,
                     "{0} Please assign a keybinding for the command Toggle Screen Reader Accessibility Mode by accessing the keybindings editor with {1} and run it.",
                     editorNotAccessibleMessage,
                     keybindingEditorKeybindingLabel

package/vscode/src/vs/editor/browser/coreCommands.js

@@ -861,7 +861,7 @@ var CoreNavigationCommands;
                         type: 'object',
                         properties: {
                             'sticky': {
-                                description: ( localize(1322, "Stick to the end even when going to longer lines")),
+                                description: ( localize(1194, "Stick to the end even when going to longer lines")),
                                 type: 'boolean',
                                 default: false
                             }
@@ -889,7 +889,7 @@ var CoreNavigationCommands;
                         type: 'object',
                         properties: {
                             'sticky': {
-                                description: ( localize(1322, "Stick to the end even when going to longer lines")),
+                                description: ( localize(1194, "Stick to the end even when going to longer lines")),
                                 type: 'boolean',
                                 default: false
                             }
@@ -1431,7 +1431,7 @@ var CoreNavigationCommands;
                 viewModel.getPrimaryCursorState()
             ]);
             viewModel.revealAllCursors(args.source, true);
-            status(( localize(1323, "Removed secondary cursors")));
+            status(( localize(1195, "Removed secondary cursors")));
         }
     }));
     CoreNavigationCommands.RevealLine = registerEditorCommand(new (class extends CoreEditorCommand {