@codingame/monaco-vscode-api 2.0.3 → 2.1.0

package/vscode/src/vs/base/common/observableInternal/utils.js

@@ -1,7 +1,7 @@
-import { toDisposable } from '../lifecycle.js';
+import { toDisposable, DisposableStore } from '../lifecycle.js';
 import { autorun } from './autorun.js';
-import { ConvenientObservable, BaseObservable, subtransaction, getFunctionName, transaction, getDebugName, _setRecomputeInitiallyAndOnChange, observableValue } from './base.js';
-import { derived } from './derived.js';
+import { ConvenientObservable, BaseObservable, subtransaction, getFunctionName, transaction, getDebugName, _setKeepObserved, _setRecomputeInitiallyAndOnChange, observableValue } from './base.js';
+import { derived, derivedOpts } from './derived.js';
 function constObservable(value) {
     return ( new ConstObservable(value));
 }
@@ -168,7 +168,7 @@ function observableSignal(debugNameOrOwner) {
 }
 class ObservableSignal extends BaseObservable {
     get debugName() {
-        return getDebugName(this, this._debugName, undefined, this._owner, this) ?? 'Observable Signal';
+        return getDebugName(this, this._debugName, undefined, this._owner) ?? 'Observable Signal';
     }
     constructor(_debugName, _owner) {
         super();
@@ -227,6 +227,7 @@ function keepObserved(observable) {
         observable.removeObserver(o);
     });
 }
+_setKeepObserved(keepObserved);
 function recomputeInitiallyAndOnChange(observable, handleValue) {
     const o = ( new KeepAliveObserver(true, handleValue));
     observable.addObserver(o);
@@ -289,4 +290,58 @@ function derivedObservableWithWritableCache(owner, computeFn) {
         },
     });
 }
-export { FromEventObservable, constObservable, debouncedObservable, derivedObservableWithCache, derivedObservableWithWritableCache, keepObserved, observableFromEvent, observableFromPromise, observableSignal, observableSignalFromEvent, recomputeInitiallyAndOnChange, waitForState, wasEventTriggeredRecently };
+function mapObservableArrayCached(owner, items, map, keySelector) {
+    let m = ( new ArrayMap(map, keySelector));
+    const self = derivedOpts({
+        debugName: () => getDebugName(m, undefined, map, owner),
+        owner,
+        onLastObserverRemoved: () => {
+            m.dispose();
+            m = ( new ArrayMap(map));
+        }
+    }, (reader) => {
+        m.setItems(items.read(reader));
+        return m.getItems();
+    });
+    return self;
+}
+class ArrayMap {
+    constructor(_map, _keySelector) {
+        this._map = _map;
+        this._keySelector = _keySelector;
+        this._cache = ( new Map());
+        this._items = [];
+    }
+    dispose() {
+        this._cache.forEach(entry => entry.store.dispose());
+        this._cache.clear();
+    }
+    setItems(items) {
+        const newItems = [];
+        const itemsToRemove = ( new Set(( this._cache.keys())));
+        for (const item of items) {
+            const key = this._keySelector ? this._keySelector(item) : item;
+            let entry = this._cache.get(key);
+            if (!entry) {
+                const store = ( new DisposableStore());
+                const out = this._map(item, store);
+                entry = { out, store };
+                this._cache.set(key, entry);
+            }
+            else {
+                itemsToRemove.delete(key);
+            }
+            newItems.push(entry.out);
+        }
+        for (const item of itemsToRemove) {
+            const entry = this._cache.get(item);
+            entry.store.dispose();
+            this._cache.delete(item);
+        }
+        this._items = newItems;
+    }
+    getItems() {
+        return this._items;
+    }
+}
+export { FromEventObservable, constObservable, debouncedObservable, derivedObservableWithCache, derivedObservableWithWritableCache, keepObserved, mapObservableArrayCached, observableFromEvent, observableFromPromise, observableSignal, observableSignalFromEvent, recomputeInitiallyAndOnChange, waitForState, wasEventTriggeredRecently };

package/vscode/src/vs/base/common/platform.js

@@ -22,26 +22,7 @@ else if (typeof process !== 'undefined') {
 }
 const isElectronProcess = typeof nodeProcess?.versions?.electron === 'string';
 const isElectronRenderer = isElectronProcess && nodeProcess?.type === 'renderer';
-if (typeof navigator === 'object' && !isElectronRenderer) {
-    _userAgent = navigator.userAgent;
-    _isWindows = _userAgent.indexOf('Windows') >= 0;
-    _isMacintosh = _userAgent.indexOf('Macintosh') >= 0;
-    _isIOS = (_userAgent.indexOf('Macintosh') >= 0 || _userAgent.indexOf('iPad') >= 0 || _userAgent.indexOf('iPhone') >= 0) && !!navigator.maxTouchPoints && navigator.maxTouchPoints > 0;
-    _isLinux = _userAgent.indexOf('Linux') >= 0;
-    _isMobile = _userAgent?.indexOf('Mobi') >= 0;
-    _isWeb = true;
-    const configuredLocale = getConfiguredDefaultLocale(
-    (
-    localizeWithPath(
-        'vs/base/common/platform',
-        { key: 'ensureLoaderPluginIsLoaded', comment: ['{Locked}'] },
-        '_'
-    )));
-    _locale = configuredLocale || LANGUAGE_DEFAULT;
-    _language = _locale;
-    _platformLocale = navigator.language;
-}
-else if (typeof nodeProcess === 'object') {
+if (typeof nodeProcess === 'object') {
     _isWindows = (nodeProcess.platform === 'win32');
     _isMacintosh = (nodeProcess.platform === 'darwin');
     _isLinux = (nodeProcess.platform === 'linux');
@@ -62,6 +43,25 @@ else if (typeof nodeProcess === 'object') {
     }
     _isNative = true;
 }
+else if (typeof navigator === 'object' && !isElectronRenderer) {
+    _userAgent = navigator.userAgent;
+    _isWindows = _userAgent.indexOf('Windows') >= 0;
+    _isMacintosh = _userAgent.indexOf('Macintosh') >= 0;
+    _isIOS = (_userAgent.indexOf('Macintosh') >= 0 || _userAgent.indexOf('iPad') >= 0 || _userAgent.indexOf('iPhone') >= 0) && !!navigator.maxTouchPoints && navigator.maxTouchPoints > 0;
+    _isLinux = _userAgent.indexOf('Linux') >= 0;
+    _isMobile = _userAgent?.indexOf('Mobi') >= 0;
+    _isWeb = true;
+    const configuredLocale = getConfiguredDefaultLocale(
+    (
+    localizeWithPath(
+        'vs/base/common/platform',
+        { key: 'ensureLoaderPluginIsLoaded', comment: ['{Locked}'] },
+        '_'
+    )));
+    _locale = configuredLocale || LANGUAGE_DEFAULT;
+    _language = _locale;
+    _platformLocale = navigator.language;
+}
 else {
     console.error('Unable to resolve platform.');
 }

package/vscode/src/vs/base/common/prefixTree.js

@@ -11,8 +11,8 @@ class WellDefinedPrefixTree {
     get nodes() {
         return this.root.children?.values() || Iterable.empty();
     }
-    insert(key, value) {
-        this.opNode(key, n => n._value = value);
+    insert(key, value, onNode) {
+        this.opNode(key, n => n._value = value, onNode);
     }
     mutate(key, mutate) {
         this.opNode(key, n => n._value = mutate(n._value === unset ? undefined : n._value));
@@ -89,7 +89,7 @@ class WellDefinedPrefixTree {
         }
         return node._value !== unset;
     }
-    opNode(key, fn) {
+    opNode(key, fn, onDescend) {
         let node = this.root;
         for (const part of key) {
             if (!node.children) {
@@ -105,6 +105,7 @@ class WellDefinedPrefixTree {
             else {
                 node = node.children.get(part);
             }
+            onDescend?.(node);
         }
         if (node._value === unset) {
             this._size++;

package/vscode/src/vs/base/common/product.d.ts

@@ -44,7 +44,7 @@ type ConfigurationSyncStore = {
     url: string;
     insidersUrl: string;
     stableUrl: string;
-    canSwitch: boolean;
+    canSwitch?: boolean;
     authenticationProviders: IStringDictionary<{
         scopes: string[];
     }>;
@@ -197,7 +197,7 @@ interface IExtensionRecommendations {
     readonly onSettingsEditorOpen?: ISettingsEditorOpenCondition;
 }
 interface ISettingsEditorOpenCondition {
-    readonly prerelease: boolean | string;
+    readonly prerelease?: boolean | string;
 }
 interface IExtensionRecommendationCondition {
     readonly important?: boolean;
@@ -216,8 +216,11 @@ type IFileContentCondition = (IFileLanguageCondition | IFilePathCondition) & {
 };
 interface IAppCenterConfiguration {
     readonly 'win32-x64': string;
+    readonly 'win32-arm64': string;
     readonly 'linux-x64': string;
     readonly 'darwin': string;
+    readonly 'darwin-universal': string;
+    readonly 'darwin-arm64': string;
 }
 interface IConfigBasedExtensionTip {
     configPath: string;

package/vscode/src/vs/base/common/strings.js

@@ -25,6 +25,18 @@ function format2(template, values) {
     }
     return template.replace(_format2Regexp, (match, group) => (values[group] ?? match));
 }
+function htmlAttributeEncodeValue(value) {
+    return value.replace(/[<>"'&]/g, ch => {
+        switch (ch) {
+            case '<': return '&lt;';
+            case '>': return '&gt;';
+            case '"': return '&quot;';
+            case '\'': return '&apos;';
+            case '&': return '&amp;';
+        }
+        return ch;
+    });
+}
 function escape(html) {
     return html.replace(/[<>&]/g, function (match) {
         switch (match) {
@@ -440,20 +452,24 @@ function isEmojiImprecise(x) {
         || (x >= 128992 && x <= 129008) || (x >= 129280 && x <= 129535)
         || (x >= 129648 && x <= 129782));
 }
-function lcut(text, n) {
-    if (text.length < n) {
-        return text;
+function lcut(text, n, prefix = '') {
+    const trimmed = text.trimStart();
+    if (trimmed.length < n) {
+        return trimmed;
     }
     const re = /\b/g;
     let i = 0;
-    while (re.test(text)) {
-        if (text.length - re.lastIndex < n) {
+    while (re.test(trimmed)) {
+        if (trimmed.length - re.lastIndex < n) {
             break;
         }
         i = re.lastIndex;
         re.lastIndex += 1;
     }
-    return text.substring(i).replace(/^\s/, '');
+    if (i === 0) {
+        return trimmed;
+    }
+    return prefix + trimmed.substring(i).trimStart();
 }
 const CSI_SEQUENCE = /(:?\x1b\[|\x9B)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~]/g;
 const CSI_CUSTOM_SEQUENCE = /\x1b\].*?\x07/g;
@@ -736,4 +752,4 @@ class InvisibleCharacters {
         return InvisibleCharacters.getData();
     }
 }
-export { AmbiguousCharacters, CodePointIterator, GraphemeIterator, InvisibleCharacters, UNUSUAL_LINE_TERMINATORS, UTF8_BOM_CHARACTER, commonPrefixLength, commonSuffixLength, compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase, computeCodePoint, containsRTL, containsUnusualLineTerminators, containsUppercaseCharacter, convertSimple2RegExpPattern, count, createRegExp, equalsIgnoreCase, escape, escapeRegExpCharacters, firstNonWhitespaceIndex, format, format2, fuzzyContains, getCharContainingOffset, getLeadingWhitespace, getLeftDeleteOffset, getNLines, getNextCodePoint, isAsciiDigit, isBasicASCII, isEmojiImprecise, isFalsyOrWhitespace, isFullWidthCharacter, isHighSurrogate, isLowSurrogate, isLowerAsciiLetter, isUpperAsciiLetter, lastNonWhitespaceIndex, lcut, ltrim, nextCharLength, noBreakWhitespace, prevCharLength, regExpLeadsToEndlessLoop, removeAnsiEscapeCodes, replaceAsync, rtrim, singleLetterHash, splitLines, startsWithIgnoreCase, startsWithUTF8BOM, stripWildcards, trim, truncate, truncateMiddle, uppercaseFirstLetter };
+export { AmbiguousCharacters, CodePointIterator, GraphemeIterator, InvisibleCharacters, UNUSUAL_LINE_TERMINATORS, UTF8_BOM_CHARACTER, commonPrefixLength, commonSuffixLength, compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase, computeCodePoint, containsRTL, containsUnusualLineTerminators, containsUppercaseCharacter, convertSimple2RegExpPattern, count, createRegExp, equalsIgnoreCase, escape, escapeRegExpCharacters, firstNonWhitespaceIndex, format, format2, fuzzyContains, getCharContainingOffset, getLeadingWhitespace, getLeftDeleteOffset, getNLines, getNextCodePoint, htmlAttributeEncodeValue, isAsciiDigit, isBasicASCII, isEmojiImprecise, isFalsyOrWhitespace, isFullWidthCharacter, isHighSurrogate, isLowSurrogate, isLowerAsciiLetter, isUpperAsciiLetter, lastNonWhitespaceIndex, lcut, ltrim, nextCharLength, noBreakWhitespace, prevCharLength, regExpLeadsToEndlessLoop, removeAnsiEscapeCodes, replaceAsync, rtrim, singleLetterHash, splitLines, startsWithIgnoreCase, startsWithUTF8BOM, stripWildcards, trim, truncate, truncateMiddle, uppercaseFirstLetter };

package/vscode/src/vs/base/common/themables.js

@@ -6,6 +6,9 @@ var ThemeColor;
     }
     ThemeColor.isThemeColor = isThemeColor;
 })(ThemeColor || (ThemeColor = {})));
+function themeColorFromId(id) {
+    return { id };
+}
 var ThemeIcon;
 ( (function(ThemeIcon) {
     ThemeIcon.iconNameSegment = '[A-Za-z0-9]+';
@@ -81,4 +84,4 @@ var ThemeIcon;
     }
     ThemeIcon.isEqual = isEqual;
 })(ThemeIcon || (ThemeIcon = {})));
-export { ThemeColor, ThemeIcon };
+export { ThemeColor, ThemeIcon, themeColorFromId };

package/vscode/src/vs/base/common/uri.js

@@ -205,6 +205,16 @@ class URI {
         }
     }
 }
+function isUriComponents(thing) {
+    if (!thing || typeof thing !== 'object') {
+        return false;
+    }
+    return typeof thing.scheme === 'string'
+        && (typeof thing.authority === 'string' || typeof thing.authority === 'undefined')
+        && (typeof thing.path === 'string' || typeof thing.path === 'undefined')
+        && (typeof thing.query === 'string' || typeof thing.query === 'undefined')
+        && (typeof thing.fragment === 'string' || typeof thing.fragment === 'undefined');
+}
 const _pathSepMarker = isWindows ? 1 : undefined;
 class Uri extends URI {
     constructor() {
@@ -451,4 +461,4 @@ function percentDecode(str) {
     }
     return str.replace(_rEncodedAsHex, (match) => decodeURIComponentGraceful(match));
 }
-export { URI, uriToFsPath };
+export { URI, isUriComponents, uriToFsPath };

package/vscode/src/vs/base/common/worker/simpleWorker.js

@@ -382,7 +382,7 @@ class SimpleWorkerServer {
                     delete loaderConfig.paths['vs'];
                 }
             }
-            if (typeof loaderConfig.trustedTypesPolicy !== undefined) {
+            if (typeof loaderConfig.trustedTypesPolicy !== 'undefined') {
                 delete loaderConfig['trustedTypesPolicy'];
             }
             loaderConfig.catchError = true;

package/vscode/src/vs/editor/browser/config/migrateOptions.js

@@ -182,4 +182,9 @@ registerEditorSettingMigration('codeActionWidget.includeNearbyQuickfixes', (valu
         }
     }
 });
+registerEditorSettingMigration('lightbulb.enabled', (value, read, write) => {
+    if (typeof value === 'boolean') {
+        write('lightbulb.enabled', value ? undefined : 'off');
+    }
+});
 export { EditorSettingMigration, migrateOptions };

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

@@ -484,6 +484,7 @@ class TopBottomDragScrollingOperation extends Disposable {
     }
     dispose() {
         this._animationFrameDisposable.dispose();
+        super.dispose();
     }
     setPosition(position, mouseEvent) {
         this._position = position;

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

@@ -120,23 +120,23 @@ class MouseTarget {
 class ElementPath {
     static isTextArea(path) {
         return (path.length === 2
-            && path[0] === 3  && path[1] === 6) ;
+            && path[0] === 3  && path[1] === 7) ;
     }
     static isChildOfViewLines(path) {
         return (path.length >= 4
-            && path[0] === 3  && path[3] === 7) ;
+            && path[0] === 3  && path[3] === 8) ;
     }
     static isStrictChildOfViewLines(path) {
         return (path.length > 4
-            && path[0] === 3  && path[3] === 7) ;
+            && path[0] === 3  && path[3] === 8) ;
     }
     static isChildOfScrollableElement(path) {
         return (path.length >= 2
-            && path[0] === 3  && path[1] === 5) ;
+            && path[0] === 3  && path[1] === 6) ;
     }
     static isChildOfMinimap(path) {
         return (path.length >= 2
-            && path[0] === 3  && path[1] === 8) ;
+            && path[0] === 3  && path[1] === 9) ;
     }
     static isChildOfContentWidgets(path) {
         return (path.length >= 4
@@ -152,6 +152,9 @@ class ElementPath {
         return (path.length >= 2
             && path[0] === 3  && path[1] === 4) ;
     }
+    static isChildOfOverflowingOverlayWidgets(path) {
+        return (path.length >= 1 && path[0] === 5) ;
+    }
 }
 class HitTestContext {
     constructor(context, viewHelper, lastRenderData) {
@@ -353,7 +356,7 @@ class MouseTargetFactory {
         if (ElementPath.isChildOfContentWidgets(path) || ElementPath.isChildOfOverflowingContentWidgets(path)) {
             return true;
         }
-        if (ElementPath.isChildOfOverlayWidgets(path)) {
+        if (ElementPath.isChildOfOverlayWidgets(path) || ElementPath.isChildOfOverflowingOverlayWidgets(path)) {
             return true;
         }
         return false;
@@ -389,7 +392,7 @@ class MouseTargetFactory {
         }
         const resolvedRequest = request;
         let result = null;
-        if (!ElementPath.isChildOfOverflowGuard(request.targetPath) && !ElementPath.isChildOfOverflowingContentWidgets(request.targetPath)) {
+        if (!ElementPath.isChildOfOverflowGuard(request.targetPath) && !ElementPath.isChildOfOverflowingContentWidgets(request.targetPath) && !ElementPath.isChildOfOverflowingOverlayWidgets(request.targetPath)) {
             result = result || request.fulfillUnknown();
         }
         result = result || MouseTargetFactory._hitTestContentWidget(ctx, resolvedRequest);
@@ -417,7 +420,7 @@ class MouseTargetFactory {
         return null;
     }
     static _hitTestOverlayWidget(ctx, request) {
-        if (ElementPath.isChildOfOverlayWidgets(request.targetPath)) {
+        if (ElementPath.isChildOfOverlayWidgets(request.targetPath) || ElementPath.isChildOfOverflowingOverlayWidgets(request.targetPath)) {
             const widgetId = ctx.findAttribute(request.target, 'widgetId');
             if (widgetId) {
                 return request.fulfillOverlayWidget(widgetId);
@@ -488,6 +491,9 @@ class MouseTargetFactory {
             };
             offset -= ctx.layoutInfo.glyphMarginLeft;
             if (offset <= ctx.layoutInfo.glyphMarginWidth) {
+                const modelCoordinate = ctx.viewModel.coordinatesConverter.convertViewPositionToModelPosition(res.range.getStartPosition());
+                const lanes = ctx.viewModel.glyphLanes.getLanesAtLine(modelCoordinate.lineNumber);
+                detail.glyphMarginLane = lanes[Math.floor(offset / ctx.lineHeight)];
                 return request.fulfillMargin(2 , pos, res.range, detail);
             }
             offset -= ctx.layoutInfo.glyphMarginWidth;

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

@@ -1,12 +1,12 @@
+import { BrowserFeatures } from '../../../base/browser/canIUse.js';
 import { addDisposableListener } from '../../../base/browser/dom.js';
-import { isIOS } from '../../../base/common/platform.js';
 import { Gesture, EventType } from '../../../base/browser/touch.js';
+import { mainWindow } from '../../../base/browser/window.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
+import { isIOS, isAndroid, isMobile } from '../../../base/common/platform.js';
 import { MouseHandler } from './mouseHandler.js';
-import { EditorMouseEvent, EditorPointerEventFactory } from '../editorDom.js';
-import { BrowserFeatures } from '../../../base/browser/canIUse.js';
 import { TextAreaSyntethicEvents } from './textAreaInput.js';
-import { mainWindow } from '../../../base/browser/window.js';
+import { EditorMouseEvent, EditorPointerEventFactory } from '../editorDom.js';
 class PointerEventHandler extends MouseHandler {
     constructor(context, viewController, viewHelper) {
         super(context, viewController, viewHelper);
@@ -40,6 +40,17 @@ class PointerEventHandler extends MouseHandler {
         }
         event.preventDefault();
         this.viewHelper.focusTextArea();
+        this._dispatchGesture(event,  false);
+    }
+    onChange(event) {
+        if (this._lastPointerType === 'touch') {
+            this._context.viewModel.viewLayout.deltaScrollNow(-event.translationX, -event.translationY);
+        }
+        if (this._lastPointerType === 'pen') {
+            this._dispatchGesture(event,  true);
+        }
+    }
+    _dispatchGesture(event, inSelectionMode) {
         const target = this._createMouseTarget(( new EditorMouseEvent(event, false, this.viewHelper.viewDomNode)), false);
         if (target.position) {
             this.viewController.dispatchMouse({
@@ -48,7 +59,7 @@ class PointerEventHandler extends MouseHandler {
                 startedOnLineNumbers: false,
                 revealType: 1 ,
                 mouseDownCount: event.tapCount,
-                inSelectionMode: false,
+                inSelectionMode,
                 altKey: false,
                 ctrlKey: false,
                 metaKey: false,
@@ -59,11 +70,6 @@ class PointerEventHandler extends MouseHandler {
             });
         }
     }
-    onChange(e) {
-        if (this._lastPointerType === 'touch') {
-            this._context.viewModel.viewLayout.deltaScrollNow(-e.translationX, -e.translationY);
-        }
-    }
     _onMouseDown(e, pointerId) {
         if (e.browserEvent.pointerType === 'touch') {
             return;
@@ -97,7 +103,8 @@ class TouchHandler extends MouseHandler {
 class PointerHandler extends Disposable {
     constructor(context, viewController, viewHelper) {
         super();
-        if ((isIOS && BrowserFeatures.pointerEvents)) {
+        const isPhone = isIOS || (isAndroid && isMobile);
+        if (isPhone && BrowserFeatures.pointerEvents) {
             this.handler = this._register(( new PointerEventHandler(context, viewController, viewHelper)));
         }
         else if (mainWindow.TouchEvent) {

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

@@ -98,7 +98,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         this._modelSelections = [( new Selection(1, 1, 1, 1))];
         this._lastRenderPosition = null;
         this.textArea = createFastDomNode(document.createElement('textarea'));
-        PartFingerprints.write(this.textArea, 6 );
+        PartFingerprints.write(this.textArea, 7 );
         this.textArea.setClassName(`inputarea ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`);
         this.textArea.setAttribute('wrap', this._textAreaWrapping && !this._visibleTextArea ? 'on' : 'off');
         const { tabSize } = this._context.viewModel.model.getOptions();

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { isFirefox } from '../../../base/browser/browser.js';
-import { addDisposableListener, getShadowRoot, getWindow, restoreParentsScrollTop, saveParentsScrollTop } from '../../../base/browser/dom.js';
+import { addDisposableListener, getShadowRoot, getActiveElement, getWindow, restoreParentsScrollTop, saveParentsScrollTop } from '../../../base/browser/dom.js';
 import { DomEmitter } from '../../../base/browser/event.js';
 import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
 import { inputLatency } from '../../../base/browser/performance.js';
@@ -442,7 +442,7 @@ class TextAreaWrapper extends Disposable {
             return shadowRoot.activeElement === this._actual;
         }
         else if (this._actual.isConnected) {
-            return this._actual.ownerDocument.activeElement === this._actual;
+            return getActiveElement() === this._actual;
         }
         else {
             return false;
@@ -482,7 +482,7 @@ class TextAreaWrapper extends Disposable {
             activeElement = shadowRoot.activeElement;
         }
         else {
-            activeElement = textArea.ownerDocument.activeElement;
+            activeElement = getActiveElement();
         }
         const activeWindow = getWindow(activeElement);
         const currentIsFocused = (activeElement === textArea);

package/vscode/src/vs/{workbench/services/hover/browser → editor/browser/services}/hoverService.d.ts

@@ -1,9 +1,10 @@
-import { IHoverService, IHoverOptions, IHoverWidget } from './hover.js';
-import { IContextViewService, IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IHoverService, IHoverOptions } from '../../../platform/hover/browser/hover.js';
+import { IContextViewService, IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { ILayoutService } from '../../../platform/layout/browser/layoutService.js';
+import { IHoverWidget } from '../../../base/browser/ui/iconLabel/iconHoverDelegate.js';
 
 declare class HoverService implements IHoverService {
     private readonly _instantiationService;