@codingame/monaco-vscode-api 36.2.7 → 37.0.0

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

@@ -41,7 +41,9 @@ var Schemas;
     Schemas.vscodeChatCodeCompareBlock = "vscode-chat-code-compare-block";
     Schemas.vscodeChatEditor = "vscode-chat-editor";
     Schemas.vscodeChatInput = "chatSessionInput";
+    Schemas.sessionsChatInput = "sessions-chat";
     Schemas.vscodeLocalChatSession = "vscode-chat-session";
+    Schemas.vscodeChatResponseResource = "vscode-chat-response-resource";
     Schemas.webviewPanel = "webview-panel";
     Schemas.vscodeWebview = "vscode-webview";
     Schemas.vscodeBrowser = "vscode-browser";
@@ -136,6 +138,8 @@ function getServerProductSegment(product) {
     return `${product.quality ?? "oss"}-${product.commit ?? "dev"}`;
 }
 const nodeModulesPath = "vs/../../node_modules";
+const nodeModulesAsarPath = "vs/../../node_modules.asar";
+const nodeModulesAsarUnpackedPath = "vs/../../node_modules.asar.unpacked";
 const VSCODE_AUTHORITY = "vscode-app";
 class FileAccessImpl {
     constructor() {
@@ -270,4 +274,4 @@ var COI;
     COI.addSearchParam = addSearchParam;
 })(COI || (COI = {}));
 
-export { COI, FileAccess, RemoteAuthorities, Schemas, VSCODE_AUTHORITY, connectionTokenQueryName, getServerProductSegment, matchesScheme, matchesSomeScheme, nodeModulesPath };
+export { COI, FileAccess, RemoteAuthorities, Schemas, VSCODE_AUTHORITY, connectionTokenQueryName, getServerProductSegment, matchesScheme, matchesSomeScheme, nodeModulesAsarPath, nodeModulesAsarUnpackedPath, nodeModulesPath };

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

@@ -643,6 +643,8 @@ export interface IAuthorizationJWTClaims {
      * OPTIONAL. Roles assigned to the user.
      */
     roles?: string[];
+    /** Entra ID tenant id; absent on non-Entra tokens. Distinguishes work/school from personal accounts. */
+    tid?: string;
     /**
      * OPTIONAL. Handles optional claims that are not explicitly defined in the standard.
      */

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

@@ -171,19 +171,23 @@ function _stableStringify(value, seen) {
         return "\"[Circular]\"";
     }
     seen.add(value);
+    let result;
     if (Array.isArray(value)) {
-        return "[" + ( value.map(v => _stableStringify(v, seen))).join(",") + "]";
-    }
-    const keys = ( Object.keys(value)).sort();
-    const parts = [];
-    for (const k of keys) {
-        const v = value[k];
-        if (v === undefined) {
-            continue;
+        result = "[" + ( value.map(v => _stableStringify(v, seen))).join(",") + "]";
+    } else {
+        const keys = ( Object.keys(value)).sort();
+        const parts = [];
+        for (const k of keys) {
+            const v = value[k];
+            if (v === undefined) {
+                continue;
+            }
+            parts.push(JSON.stringify(k) + ":" + _stableStringify(v, seen));
         }
-        parts.push(JSON.stringify(k) + ":" + _stableStringify(v, seen));
+        result = "{" + parts.join(",") + "}";
     }
-    return "{" + parts.join(",") + "}";
+    seen.delete(value);
+    return result;
 }
 function distinct(base, target) {
     const result = Object.create(null);

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

@@ -91,7 +91,7 @@ export interface IObservableWithChange<T, TChange = unknown> {
 export interface IObserver {
     /**
      * Signals that the given observable might have changed and a transaction potentially modifying that observable started.
-     * Before the given observable can call this method again, is must call {@link IObserver.endUpdate}.
+     * Every call to this method must eventually be accompanied by a corresponding {@link IObserver.endUpdate} call.
      *
      * Implementations must not get/read the value of other observables, as they might not have received this event yet!
      * The method {@link IObservable.reportChanges} can be used to force the observable to report the changes.
@@ -142,8 +142,8 @@ export interface ISettable<T, TChange = void> {
 }
 export interface ITransaction {
     /**
-     * Calls {@link Observer.beginUpdate} immediately
-     * and {@link Observer.endUpdate} when the transaction ends.
+     * Calls {@link IObserver.beginUpdate} immediately
+     * and {@link IObserver.endUpdate} when the transaction ends.
      */
     updateObserver(observer: IObserver, observable: IObservableWithChange<any, any>): void;
 }

package/vscode/src/vs/base/common/observableInternal/logging/debugger/rpc.js

@@ -37,6 +37,9 @@ class SimpleTypedRpcConnection {
         });
         const requests = ( new Proxy({}, {
             get: (target, key) => {
+                if (key === "then") {
+                    return undefined;
+                }
                 return async (...args) => {
                     const result = await this._channel.sendRequest([key, args]);
                     if (result.type === "error") {
@@ -49,6 +52,9 @@ class SimpleTypedRpcConnection {
         }));
         const notifications = ( new Proxy({}, {
             get: (target, key) => {
+                if (key === "then") {
+                    return undefined;
+                }
                 return (...args) => {
                     this._channel.sendNotification([key, args]);
                 };

package/vscode/src/vs/base/common/observableInternal/observables/observableFromEvent.js

@@ -43,11 +43,13 @@ class FromEventObservable extends BaseObservable {
         this.handleEvent = args => {
             const newValue = this._getValue(args);
             const oldValue = this._value;
-            const didChange = !this._hasValue || !(this._equalityComparator(oldValue, newValue));
+            const hadValue = this._hasValue;
+            const didChange = !hadValue || !(this._equalityComparator(oldValue, newValue));
             let didRunTransaction = false;
             if (didChange) {
                 this._value = newValue;
-                if (this._hasValue) {
+                this._hasValue = true;
+                if (hadValue) {
                     didRunTransaction = true;
                     subtransaction(this._getTransaction(), tx => {
                         getLogger()?.handleObservableUpdated(this, {
@@ -55,7 +57,7 @@ class FromEventObservable extends BaseObservable {
                             newValue,
                             change: undefined,
                             didChange,
-                            hadValue: this._hasValue
+                            hadValue
                         });
                         for (const o of this._observers) {
                             tx.updateObserver(o, this);
@@ -66,7 +68,6 @@ class FromEventObservable extends BaseObservable {
                         return "Event fired" + (name ? `: ${name}` : "");
                     });
                 }
-                this._hasValue = true;
             }
             if (!didRunTransaction) {
                 getLogger()?.handleObservableUpdated(this, {
@@ -74,7 +75,7 @@ class FromEventObservable extends BaseObservable {
                     newValue,
                     change: undefined,
                     didChange,
-                    hadValue: this._hasValue
+                    hadValue
                 });
             }
         };

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

@@ -33,6 +33,7 @@ export declare const isWindows: boolean;
 export declare const isMacintosh: boolean;
 export declare const isLinux: boolean;
 export declare const isLinuxSnap: boolean;
+export declare const isChromeOS: boolean;
 export declare const isNative: boolean;
 export declare const isElectron: boolean;
 export declare const isWeb: boolean;
@@ -96,4 +97,5 @@ export declare const isFirefox: boolean;
 export declare const isSafari: boolean;
 export declare const isEdge: boolean;
 export declare const isAndroid: boolean;
+export declare const hasElectronUserAgent: boolean;
 export declare function isTahoeOrNewer(osVersion: string): boolean;

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

@@ -6,6 +6,7 @@ let _isWindows = false;
 let _isMacintosh = false;
 let _isLinux = false;
 let _isLinuxSnap = false;
+let _isChromeOS = false;
 let _isNative = false;
 let _isWeb = false;
 let _isElectron = false;
@@ -53,6 +54,7 @@ else if (typeof navigator === "object" && !isElectronRenderer) {
     _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;
+    _isChromeOS = _userAgent.indexOf("CrOS") >= 0;
     _isMobile = _userAgent?.indexOf("Mobi") >= 0;
     _isWeb = true;
     _language = getNLSLanguage() || LANGUAGE_DEFAULT;
@@ -93,6 +95,7 @@ const isWindows = _isWindows;
 const isMacintosh = _isMacintosh;
 const isLinux = _isLinux;
 const isLinuxSnap = _isLinuxSnap;
+const isChromeOS = _isChromeOS;
 const isNative = _isNative;
 const isElectron = _isElectron;
 const isWeb = _isWeb;
@@ -182,5 +185,6 @@ const isFirefox = !!(userAgent && userAgent.indexOf("Firefox") >= 0);
 const isSafari = !!(!isChrome && (userAgent && userAgent.indexOf("Safari") >= 0));
 const isEdge = !!(userAgent && userAgent.indexOf("Edg/") >= 0);
 const isAndroid = !!(userAgent && userAgent.indexOf("Android") >= 0);
+!!(userAgent && userAgent.indexOf("Electron") >= 0);
 
-export { LANGUAGE_DEFAULT, Language, OS, OperatingSystem, Platform, PlatformToString, isAndroid, isCI, isChrome, isEdge, isElectron, isFirefox, isIOS, isLinux, isLinuxSnap, isLittleEndian, isMacintosh, isMobile, isNative, isSafari, isWeb, isWebWorker, isWindows, language, locale, platform, platformLocale, setTimeout0, setTimeout0IsFaster, userAgent, webWorkerOrigin };
+export { LANGUAGE_DEFAULT, Language, OS, OperatingSystem, Platform, PlatformToString, isAndroid, isCI, isChrome, isChromeOS, isEdge, isElectron, isFirefox, isIOS, isLinux, isLinuxSnap, isLittleEndian, isMacintosh, isMobile, isNative, isSafari, isWeb, isWebWorker, isWindows, language, locale, platform, platformLocale, setTimeout0, setTimeout0IsFaster, userAgent, webWorkerOrigin };

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

@@ -1,5 +1,4 @@
 
-import './platform.js';
 
 var Source;
 (function(Source) {

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

@@ -83,6 +83,18 @@ export interface IAgentSdkProductConfig {
     readonly version: string;
     readonly urlTemplate: string;
 }
+/**
+ * Configuration for downloading the on-device dictation native runtime (the
+ * Foundry Local addon + core libraries) on demand. Produced per platform build
+ * and stamped by `build/dictation-runtime/produce.ts`; consumed by
+ * `foundryLocalRuntime.ts`, which substitutes `{target}` in `urlTemplate`
+ * against the host's `<platform>-<arch>` key. Absent in local dev builds, in
+ * which case the runtime falls back to the SDK's own `node_modules` payload.
+ */
+export interface IDictationRuntimeProductConfig {
+    readonly version: string;
+    readonly urlTemplate: string;
+}
 export interface IProductConfiguration {
     readonly version: string;
     readonly date?: string;
@@ -131,10 +143,16 @@ export interface IProductConfiguration {
         readonly resourceUrlTemplate: string;
         readonly nlsBaseUrl: string;
         readonly accessSKUs?: string[];
+        readonly accessScopes?: string[];
     };
     readonly agentSdks?: {
         readonly [packageId: string]: IAgentSdkProductConfig;
     };
+    readonly copilotVersions?: {
+        readonly runtime: string;
+        readonly sdk: string;
+    };
+    readonly dictationRuntime?: IDictationRuntimeProductConfig;
     readonly mcpGallery?: {
         readonly serviceUrl: string;
         readonly itemWebUrl: string;
@@ -409,6 +427,10 @@ export interface IDefaultChatAgent {
             id: string;
             name: string;
         };
+        microsoft: {
+            id: string;
+            name: string;
+        };
     };
     readonly providerExtensionId: string;
     readonly providerUriSetting: string;

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

@@ -80,9 +80,16 @@ function truncateMiddle(value, maxLength, suffix = Ellipsis) {
     if (value.length <= maxLength) {
         return value;
     }
-    const prefixLength = Math.ceil(maxLength / 2) - suffix.length / 2;
-    const suffixLength = Math.floor(maxLength / 2) - suffix.length / 2;
-    return `${value.substr(0, prefixLength)}${suffix}${value.substr(value.length - suffixLength)}`;
+    let prefixLength = Math.floor(Math.ceil(maxLength / 2) - suffix.length / 2);
+    const suffixLength = Math.ceil(Math.floor(maxLength / 2) - suffix.length / 2);
+    let suffixStart = value.length - suffixLength;
+    if (isHighSurrogate(value.charCodeAt(prefixLength - 1)) && isLowSurrogate(value.charCodeAt(prefixLength))) {
+        prefixLength--;
+    }
+    if (isHighSurrogate(value.charCodeAt(suffixStart - 1)) && isLowSurrogate(value.charCodeAt(suffixStart))) {
+        suffixStart++;
+    }
+    return `${value.substring(0, prefixLength)}${suffix}${value.substring(suffixStart)}`;
 }
 function trim(haystack, needle = " ") {
     const trimmed = ltrim(haystack, needle);
@@ -551,12 +558,13 @@ function fuzzyContains(target, query) {
     if (target.length < query.length) {
         return false;
     }
-    const queryLen = query.length;
     const targetLower = target.toLowerCase();
+    const queryLower = query.toLowerCase();
+    const queryLen = queryLower.length;
     let index = 0;
     let lastIndexOf = -1;
     while (index < queryLen) {
-        const indexOf = targetLower.indexOf(query[index], lastIndexOf + 1);
+        const indexOf = targetLower.indexOf(queryLower[index], lastIndexOf + 1);
         if (indexOf < 0) {
             return false;
         }

package/vscode/src/vs/base/parts/ipc/common/ipc.d.ts

@@ -230,6 +230,10 @@ export declare namespace ProxyChannel {
         disableMarshalling?: boolean;
     }
     interface ICreateServiceChannelOptions extends IProxyOptions {
+        /**
+         * Events that should subscribe lazily and not replay emissions before the first IPC listener.
+         */
+        unbufferedEvents?: readonly string[];
     }
     function fromService<TContext>(service: unknown, disposables: DisposableStore, options?: ICreateServiceChannelOptions): IServerChannel<TContext>;
     interface ICreateProxyServiceOptions extends IProxyOptions {

package/vscode/src/vs/base/parts/ipc/common/ipc.js

@@ -527,7 +527,7 @@ class ChannelClient {
                 uninitializedPromise.then(() => {
                     uninitializedPromise = null;
                     doRequest();
-                });
+                }, () => {});
             }
             const cancel = () => {
                 if (uninitializedPromise) {
@@ -568,6 +568,8 @@ class ChannelClient {
         let uninitializedPromise = null;
         const emitter = ( new Emitter({
             onWillAddFirstListener: () => {
+                const handler = res => emitter.fire(res.data);
+                this.handlers.set(id, handler);
                 const doRequest = () => {
                     this.activeRequests.add(emitter);
                     this.sendRequest(request);
@@ -579,7 +581,7 @@ class ChannelClient {
                     uninitializedPromise.then(() => {
                         uninitializedPromise = null;
                         doRequest();
-                    });
+                    }, () => {});
                 }
             },
             onDidRemoveLastListener: () => {
@@ -596,8 +598,6 @@ class ChannelClient {
                 this.handlers.delete(id);
             }
         }));
-        const handler = res => emitter.fire(res.data);
-        this.handlers.set(id, handler);
         return emitter.event;
     }
     sendRequest(request) {
@@ -737,7 +737,7 @@ function getDelayedChannel(promise) {
         },
         listen(event, arg) {
             const relay = ( new Relay());
-            promise.then(c => relay.input = c.listen(event, arg));
+            void promise.then(c => relay.input = c.listen(event, arg), () => relay.dispose());
             return relay.event;
         }
     };
@@ -747,9 +747,10 @@ var ProxyChannel;
     function fromService(service, disposables, options) {
         const handler = service;
         const disableMarshalling = options?.disableMarshalling;
+        const unbufferedEvents = options?.unbufferedEvents ? ( new Set(options.unbufferedEvents)) : undefined;
         const mapEventNameToEvent = ( new Map());
         for (const key in handler) {
-            if (propertyIsEvent(key)) {
+            if (propertyIsEvent(key) && !unbufferedEvents?.has(key)) {
                 mapEventNameToEvent.set(key, Event.buffer(handler[key], key, true, undefined, disposables));
             }
         }
@@ -765,6 +766,9 @@ var ProxyChannel;
                         return target.call(handler, arg);
                     }
                     if (propertyIsEvent(event)) {
+                        if (unbufferedEvents?.has(event)) {
+                            return handler[event];
+                        }
                         mapEventNameToEvent.set(event, Event.buffer(handler[event], event, true, undefined, disposables));
                         return mapEventNameToEvent.get(event);
                     }
@@ -798,6 +802,9 @@ var ProxyChannel;
                     if (options?.properties?.has(propKey)) {
                         return options.properties.get(propKey);
                     }
+                    if (propKey === "then") {
+                        return undefined;
+                    }
                     if (propertyIsDynamicEvent(propKey)) {
                         return function(arg) {
                             return channel.listen(propKey, arg);

package/vscode/src/vs/editor/browser/config/fontMeasurements.d.ts

@@ -36,9 +36,9 @@ export declare class FontMeasurementsImpl extends Disposable {
     private _writeToCache;
     private _evictUntrustedReadings;
     /**
-     * Serialized currently cached font information.
+     * Returns trusted cached font information, or undefined when the cache contains only restored readings.
      */
-    serializeFontInfo(targetWindow: Window): ISerializedFontInfo[];
+    serializeFontInfo(targetWindow: Window): ISerializedFontInfo[] | undefined;
     /**
      * Restore previously serialized font informations.
      */

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

@@ -35,9 +35,9 @@ class FontMeasurementsImpl extends Disposable {
         }
         return cache;
     }
-    _writeToCache(targetWindow, item, value) {
+    _writeToCache(targetWindow, item, value, isRestored) {
         const cache = this._ensureCache(targetWindow);
-        cache.put(item, value);
+        cache.put(item, value, isRestored);
         if (!value.isTrusted && this._evictUntrustedReadingsTimeout === -1) {
             this._evictUntrustedReadingsTimeout = targetWindow.setTimeout(() => {
                 this._evictUntrustedReadingsTimeout = -1;
@@ -61,6 +61,9 @@ class FontMeasurementsImpl extends Disposable {
     }
     serializeFontInfo(targetWindow) {
         const cache = this._ensureCache(targetWindow);
+        if (cache.shouldPreservePersistedValues()) {
+            return undefined;
+        }
         return cache.getValues().filter(item => item.isTrusted);
     }
     restoreFontInfo(targetWindow, savedFontInfos) {
@@ -69,7 +72,7 @@ class FontMeasurementsImpl extends Disposable {
                 continue;
             }
             const fontInfo = ( new FontInfo(savedFontInfo, false));
-            this._writeToCache(targetWindow, fontInfo, fontInfo);
+            this._writeToCache(targetWindow, fontInfo, fontInfo, true);
         }
     }
     readFontInfo(targetWindow, bareFontInfo) {
@@ -96,7 +99,7 @@ class FontMeasurementsImpl extends Disposable {
                     maxDigitWidth: Math.max(readConfig.maxDigitWidth, 5)
                 }, false));
             }
-            this._writeToCache(targetWindow, bareFontInfo, readConfig);
+            this._writeToCache(targetWindow, bareFontInfo, readConfig, false);
         }
         return cache.get(bareFontInfo);
     }
@@ -183,6 +186,8 @@ class FontMeasurementsImpl extends Disposable {
 }
 class FontMeasurementsCache {
     constructor() {
+        this._wasPopulatedWithRestoredValues = false;
+        this._wasPopulatedWithCurrentSessionValues = false;
         this._keys = Object.create(null);
         this._values = Object.create(null);
     }
@@ -194,10 +199,15 @@ class FontMeasurementsCache {
         const itemId = item.getId();
         return this._values[itemId];
     }
-    put(item, value) {
+    put(item, value, isRestored) {
         const itemId = item.getId();
         this._keys[itemId] = item;
         this._values[itemId] = value;
+        if (isRestored) {
+            this._wasPopulatedWithRestoredValues = true;
+        } else {
+            this._wasPopulatedWithCurrentSessionValues = true;
+        }
     }
     remove(item) {
         const itemId = item.getId();
@@ -207,6 +217,9 @@ class FontMeasurementsCache {
     getValues() {
         return ( ( Object.keys(this._keys)).map(id => this._values[id]));
     }
+    shouldPreservePersistedValues() {
+        return this._wasPopulatedWithRestoredValues && !this._wasPopulatedWithCurrentSessionValues;
+    }
 }
 const FontMeasurements = ( new FontMeasurementsImpl());
 

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

@@ -3,6 +3,7 @@ import { scheduleAtNextAnimationFrame, getWindow } from '../../../base/browser/d
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { EditorOption } from '../../common/config/editorOptions.js';
 import { Position } from '../../common/core/position.js';
+import { TextDirection } from '../../common/model.js';
 import { NavigationCommandRevealType } from '../coreCommands.js';
 import { createEditorPagePosition, PageCoordinates, createCoordinatesRelativeToEditor } from '../editorDom.js';
 import { MouseTarget } from './mouseTarget.js';
@@ -164,20 +165,13 @@ class LeftRightDragScrollingOperation extends DragScrollingOperation {
         }
         const edgeLineNumber = this._position.position.lineNumber;
         let mouseTarget;
-        {
-            const editorPos = createEditorPagePosition(this._viewHelper.viewDomNode);
-            const horizontalScrollbarHeight = this._context.configuration.options.get(EditorOption.layoutInfo).horizontalScrollbarHeight;
-            const pos = ( new PageCoordinates(
-                this._mouseEvent.pos.x,
-                editorPos.y + editorPos.height - horizontalScrollbarHeight - 0.1
-            ));
-            const relativePos = createCoordinatesRelativeToEditor(this._viewHelper.viewDomNode, editorPos, pos);
-            mouseTarget = this._mouseTargetFactory.createMouseTarget(this._viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
-        }
-        if (this._position.outsidePosition === "left") {
-            mouseTarget = MouseTarget.createOutsideEditor(mouseTarget.mouseColumn, ( new Position(edgeLineNumber, mouseTarget.mouseColumn)), "left", this._position.outsideDistance);
+        const isRtl = this._context.viewModel.getTextDirection(edgeLineNumber) === TextDirection.RTL;
+        const exceedingPosition = isRtl ? "left" : "right";
+        if (this._position.outsidePosition === exceedingPosition) {
+            const lineWidth = this._context.viewModel.getLineMaxColumn(edgeLineNumber);
+            mouseTarget = MouseTarget.createOutsideEditor(lineWidth, ( new Position(edgeLineNumber, lineWidth)), "right", this._position.outsideDistance);
         } else {
-            mouseTarget = MouseTarget.createOutsideEditor(mouseTarget.mouseColumn, ( new Position(edgeLineNumber, mouseTarget.mouseColumn)), "right", this._position.outsideDistance);
+            mouseTarget = MouseTarget.createOutsideEditor(1, ( new Position(edgeLineNumber, 1)), "left", this._position.outsideDistance);
         }
         this._dispatchMouse(mouseTarget, true, NavigationCommandRevealType.None);
         this._animationFrameDisposable = scheduleAtNextAnimationFrame(getWindow(mouseTarget.element), () => this._execute());

package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { addDisposableListener, getShadowRoot, getActiveElement } from '../../../../../base/browser/dom.js';
+import { addDisposableListener, getShadowRoot } from '../../../../../base/browser/dom.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
 
@@ -47,7 +47,7 @@ let FocusTracker = class FocusTracker extends Disposable {
     }
     refreshFocusState() {
         const shadowRoot = getShadowRoot(this._domNode);
-        const activeElement = shadowRoot ? shadowRoot.activeElement : getActiveElement();
+        const activeElement = shadowRoot ? shadowRoot.activeElement : this._domNode.ownerDocument.activeElement;
         const focused = this._domNode === activeElement;
         this._handleFocusedChanged(focused);
     }

package/vscode/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.js

@@ -4,6 +4,7 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import * as textAreaEditContext from './textAreaEditContext.css';
 import { localize } from '../../../../../nls.js';
 import { isFirefox, isSafari, isAndroid, isChrome } from '../../../../../base/browser/browser.js';
+import { createElement, $ } from '../../../../../base/browser/dom.js';
 import { createFastDomNode } from '../../../../../base/browser/fastDomNode.js';
 import { isMacintosh, OS } from '../../../../../base/common/platform.js';
 import { isHighSurrogate } from '../../../../../base/common/strings.js';
@@ -32,7 +33,6 @@ import { ariaLabelForScreenReaderContent, SimplePagedScreenReaderStrategy, newli
 import { TextAreaState } from './textAreaEditContextState.js';
 import { getMapForWordSeparators, WordCharacterClass } from '../../../../common/core/wordCharacterClassifier.js';
 import { TextAreaEditContextRegistry } from './textAreaEditContextRegistry.js';
-import { createElement } from '../../../../../base/browser/dom.js';
 
 registerCss(textAreaEditContext);
 class VisibleTextAreaData {
@@ -361,6 +361,9 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
         this.textAreaCover.domNode.remove();
     }
     _getAndroidWordAtPosition(position) {
+        if (position.lineNumber > this._context.viewModel.getLineCount()) {
+            return ["", 0];
+        }
         const ANDROID_WORD_SEPARATORS = "`~!@#$%^&*()-=+[{]}\\|;:\",.<>/?";
         const lineContent = this._context.viewModel.getLineContent(position.lineNumber);
         const wordSeparators = getMapForWordSeparators(ANDROID_WORD_SEPARATORS, []);
@@ -402,6 +405,9 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
         ];
     }
     _getWordBeforePosition(position) {
+        if (position.lineNumber > this._context.viewModel.getLineCount()) {
+            return "";
+        }
         const lineContent = this._context.viewModel.getLineContent(position.lineNumber);
         const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(EditorOption.wordSeparators), []);
         let column = position.column;
@@ -419,6 +425,9 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
     }
     _getCharacterBeforePosition(position) {
         if (position.column > 1) {
+            if (position.lineNumber > this._context.viewModel.getLineCount()) {
+                return "";
+            }
             const lineContent = this._context.viewModel.getLineContent(position.lineNumber);
             const charBefore = lineContent.charAt(position.column - 2);
             if (!isHighSurrogate(charBefore.charCodeAt(0))) {
@@ -689,11 +698,11 @@ function measureText(targetDocument, text, fontInfo, tabSize) {
     if (text.length === 0) {
         return 0;
     }
-    const container = targetDocument.createElement("div");
+    const container = $("div");
     container.style.position = "absolute";
     container.style.top = "-50000px";
     container.style.width = "50000px";
-    const regularDomNode = targetDocument.createElement("span");
+    const regularDomNode = $("span");
     applyFontInfo(regularDomNode, fontInfo);
     regularDomNode.style.whiteSpace = "pre";
     regularDomNode.style.tabSize = `${tabSize * fontInfo.spaceWidth}px`;

package/vscode/src/vs/editor/browser/editorBrowser.d.ts

@@ -701,6 +701,11 @@ export interface IDiffEditor extends editorCommon.IEditor {
      * Update the editor's options after the editor has been created.
      */
     updateOptions(newOptions: IDiffEditorOptions): void;
+    /**
+     * Restores automatic width-based layout after a temporary inline layout.
+     * @internal
+     */
+    resetWidthBasedLayout(): void;
     /**
      * @internal
      */

package/vscode/src/vs/editor/browser/gpu/viewGpuContext.js

@@ -7,6 +7,7 @@ import { Color } from '../../../base/common/color.js';
 import { BugIndicatingError } from '../../../base/common/errors.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import '../../../base/common/observableInternal/index.js';
+import { isFullWidthCharacter } from '../../../base/common/strings.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { TextureAtlas } from './atlas/textureAtlas.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
@@ -141,7 +142,7 @@ let ViewGpuContext = class ViewGpuContext extends Disposable {
     }
     canRender(options, viewportData, lineNumber) {
         const data = viewportData.getViewLineRenderingData(lineNumber);
-        if (data.containsRTL || data.maxColumn > this.maxGpuCols) {
+        if (data.containsRTL || data.maxColumn > this.maxGpuCols || requiresDomFullwidthCharacterRendering(options, data.content)) {
             return false;
         }
         if (data.inlineDecorations.length > 0) {
@@ -180,6 +181,9 @@ let ViewGpuContext = class ViewGpuContext extends Disposable {
         if (data.maxColumn > this.maxGpuCols) {
             reasons.push("maxColumn > maxGpuCols");
         }
+        if (requiresDomFullwidthCharacterRendering(options, data.content)) {
+            reasons.push("useTwoCellFullwidthCharacters");
+        }
         if (data.inlineDecorations.length > 0) {
             let supported = true;
             const problemTypes = [];
@@ -223,6 +227,18 @@ let ViewGpuContext = class ViewGpuContext extends Disposable {
     }
 };
 ViewGpuContext = ViewGpuContext_1 = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, INotificationService)), ( __param(3, IConfigurationService)), ( __param(4, IThemeService))], ViewGpuContext));
+function requiresDomFullwidthCharacterRendering(options, content) {
+    if (!options.useTwoCellFullwidthCharacters) {
+        return false;
+    }
+    const limit = options.stopRenderingLineAfter === -1 ? content.length : Math.min(options.stopRenderingLineAfter, content.length);
+    for (let offset = 0; offset < limit; offset++) {
+        if (isFullWidthCharacter(content.charCodeAt(offset))) {
+            return true;
+        }
+    }
+    return false;
+}
 const gpuSupportedDecorationCssRules = [
     "color",
     "font-weight",