@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -4,6 +4,7 @@ import { ResourceMap } from './map.js';
 import { isWeb, isNative, webWorkerOrigin } from './platform.js';
 import { equalsIgnoreCase, startsWithIgnoreCase } from './strings.js';
 import { URI } from './uri.js';
+import { posix } from './path.js';
 var Schemas;
 ( (function(Schemas) {
     Schemas.inMemory = 'inmemory';
@@ -40,7 +41,6 @@ var Schemas;
     Schemas.vsls = 'vsls';
     Schemas.vscodeSourceControl = 'vscode-scm';
     Schemas.codeSetting = 'code-setting';
-    Schemas.codeFeature = 'code-feature';
 })(Schemas || (Schemas = {})));
 function matchesScheme(target, scheme) {
     if (URI.isUri(target)) {
@@ -61,7 +61,7 @@ class RemoteAuthoritiesImpl {
         this._connectionTokens = Object.create(null);
         this._preferredWebSchema = 'http';
         this._delegate = null;
-        this._remoteResourcesPath = `/${Schemas.vscodeRemoteResource}`;
+        this._serverRootPath = '/';
     }
     setPreferredWebSchema(schema) {
         this._preferredWebSchema = schema;
@@ -69,8 +69,14 @@ class RemoteAuthoritiesImpl {
     setDelegate(delegate) {
         this._delegate = delegate;
     }
-    setServerRootPath(serverRootPath) {
-        this._remoteResourcesPath = `${serverRootPath}/${Schemas.vscodeRemoteResource}`;
+    setServerRootPath(product, serverBasePath) {
+        this._serverRootPath = getServerRootPath(product, serverBasePath);
+    }
+    getServerRootPath() {
+        return this._serverRootPath;
+    }
+    get _remoteResourcesPath() {
+        return posix.join(this._serverRootPath, Schemas.vscodeRemoteResource);
     }
     set(authority, host, port) {
         this._hosts[authority] = host;
@@ -112,6 +118,9 @@ class RemoteAuthoritiesImpl {
     }
 }
 const RemoteAuthorities = ( new RemoteAuthoritiesImpl());
+function getServerRootPath(product, basePath) {
+    return posix.join(basePath ?? '/', `${product.quality ?? 'oss'}-${product.commit ?? 'dev'}`);
+}
 const nodeModulesPath = 'vs/../../node_modules';
 const nodeModulesAsarPath = 'vs/../../node_modules.asar';
 const nodeModulesAsarUnpackedPath = 'vs/../../node_modules.asar.unpacked';
@@ -236,4 +245,4 @@ var COI;
     }
     COI.addSearchParam = addSearchParam;
 })(COI || (COI = {})));
-export { COI, FileAccess, RemoteAuthorities, Schemas, VSCODE_AUTHORITY, connectionTokenQueryName, matchesScheme, matchesSomeScheme, nodeModulesAsarPath, nodeModulesAsarUnpackedPath, nodeModulesPath };
+export { COI, FileAccess, RemoteAuthorities, Schemas, VSCODE_AUTHORITY, connectionTokenQueryName, getServerRootPath, matchesScheme, matchesSomeScheme, nodeModulesAsarPath, nodeModulesAsarUnpackedPath, nodeModulesPath };

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

@@ -1,6 +1,7 @@
 import { autorun } from './autorun.js';
 import { observableValue, transaction } from './base.js';
 import { derived } from './derived.js';
+import '../cancellation.js';
 class ObservableLazy {
     get cachedValue() { return this._value; }
     constructor(_computeValue) {

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

@@ -168,21 +168,42 @@ class ObservableSignal extends BaseObservable {
     get() {
     }
 }
-function debouncedObservable(observable, debounceMs, disposableStore) {
-    const debouncedObservable = observableValue('debounced', undefined);
+function debouncedObservable2(observable, debounceMs) {
+    let hasValue = false;
+    let lastValue;
     let timeout = undefined;
-    disposableStore.add(autorun(reader => {
-        const value = observable.read(reader);
-        if (timeout) {
-            clearTimeout(timeout);
+    return observableFromEvent(cb => {
+        const d = autorun(reader => {
+            const value = observable.read(reader);
+            if (!hasValue) {
+                hasValue = true;
+                lastValue = value;
+            }
+            else {
+                if (timeout) {
+                    clearTimeout(timeout);
+                }
+                timeout = setTimeout(() => {
+                    lastValue = value;
+                    cb();
+                }, debounceMs);
+            }
+        });
+        return {
+            dispose() {
+                d.dispose();
+                hasValue = false;
+                lastValue = undefined;
+            },
+        };
+    }, () => {
+        if (hasValue) {
+            return lastValue;
         }
-        timeout = setTimeout(() => {
-            transaction(tx => {
-                debouncedObservable.set(value, tx);
-            });
-        }, debounceMs);
-    }));
-    return debouncedObservable;
+        else {
+            return observable.get();
+        }
+    });
 }
 function wasEventTriggeredRecently(event, timeoutMs, disposableStore) {
     const observable = observableValue('triggeredRecently', false);
@@ -322,4 +343,4 @@ class ArrayMap {
         return this._items;
     }
 }
-export { FromEventObservable, KeepAliveObserver, constObservable, debouncedObservable, derivedObservableWithCache, derivedObservableWithWritableCache, keepObserved, mapObservableArrayCached, observableFromEvent, observableFromPromise, observableSignal, observableSignalFromEvent, recomputeInitiallyAndOnChange, wasEventTriggeredRecently };
+export { FromEventObservable, KeepAliveObserver, constObservable, debouncedObservable2, derivedObservableWithCache, derivedObservableWithWritableCache, keepObserved, mapObservableArrayCached, observableFromEvent, observableFromPromise, observableSignal, observableSignalFromEvent, recomputeInitiallyAndOnChange, wasEventTriggeredRecently };

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

@@ -17,7 +17,7 @@ let nodeProcess = undefined;
 if (typeof $globalThis.vscode !== 'undefined' && typeof $globalThis.vscode.process !== 'undefined') {
     nodeProcess = $globalThis.vscode.process;
 }
-else if (typeof process !== 'undefined') {
+else if (typeof process !== 'undefined' && typeof process?.versions?.node === 'string') {
     nodeProcess = process;
 }
 const isElectronProcess = typeof nodeProcess?.versions?.electron === 'string';

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

@@ -184,6 +184,7 @@ interface IProductConfiguration {
     readonly commonlyUsedSettings?: string[];
     readonly aiGeneratedWorkspaceTrust?: IAiGeneratedWorkspaceTrust;
     readonly gitHubEntitlement?: IGitHubEntitlement;
+    readonly chatWelcomeView?: IChatWelcomeView;
 }
 interface ITunnelApplicationConfig {
     authenticationProviders: IStringDictionary<{
@@ -295,5 +296,10 @@ interface IGitHubEntitlement {
     confirmationMessage: string;
     confirmationAction: string;
 }
+interface IChatWelcomeView {
+    welcomeViewId: string;
+    welcomeViewTitle: string;
+    welcomeViewContent: string;
+}
 
-export type { ConfigurationSyncStore, ExtensionUntrustedWorkspaceSupport, ExtensionVirtualWorkspaceSupport, IAiGeneratedWorkspaceTrust, IAppCenterConfiguration, IBuiltInExtension, IConfigBasedExtensionTip, IExeBasedExtensionTip, IExtensionRecommendationCondition, IExtensionRecommendations, IFeaturedExtension, IFileContentCondition, IFileLanguageCondition, IFileOpenCondition, IFilePathCondition, IGitHubEntitlement, IProductConfiguration, IProductWalkthrough, IProductWalkthroughStep, IRemoteExtensionTip, ISettingsEditorOpenCondition, ISurveyData, ITunnelApplicationConfig, IVirtualWorkspaceExtensionTip };
+export type { ConfigurationSyncStore, ExtensionUntrustedWorkspaceSupport, ExtensionVirtualWorkspaceSupport, IAiGeneratedWorkspaceTrust, IAppCenterConfiguration, IBuiltInExtension, IChatWelcomeView, IConfigBasedExtensionTip, IExeBasedExtensionTip, IExtensionRecommendationCondition, IExtensionRecommendations, IFeaturedExtension, IFileContentCondition, IFileLanguageCondition, IFileOpenCondition, IFilePathCondition, IGitHubEntitlement, IProductConfiguration, IProductWalkthrough, IProductWalkthroughStep, IRemoteExtensionTip, ISettingsEditorOpenCondition, ISurveyData, ITunnelApplicationConfig, IVirtualWorkspaceExtensionTip };

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

@@ -38,4 +38,5 @@ var Severity;
     }
     Severity.toString = toString;
 })(Severity || (Severity = {})));
-export { Severity as default };
+var Severity$1 = Severity;
+export { Severity$1 as default };

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

@@ -479,11 +479,23 @@ function lcut(text, n, prefix = '') {
     }
     return prefix + trimmed.substring(i).trimStart();
 }
-const CSI_SEQUENCE = /(:?\x1b\[|\x9B)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~]/g;
-const CSI_CUSTOM_SEQUENCE = /\x1b\].*?\x07/g;
+const CSI_SEQUENCE = /(:?(:?\x1b\[|\x9B)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~])|(:?\x1b\].*?\x07)/g;
+function* forAnsiStringParts(str) {
+    let last = 0;
+    for (const match of str.matchAll(CSI_SEQUENCE)) {
+        if (last !== match.index) {
+            yield { isCode: false, str: str.substring(last, match.index) };
+        }
+        yield { isCode: true, str: match[0] };
+        last = match.index + match[0].length;
+    }
+    if (last !== str.length) {
+        yield { isCode: false, str: str.substring(last) };
+    }
+}
 function removeAnsiEscapeCodes(str) {
     if (str) {
-        str = str.replace(CSI_SEQUENCE, '').replace(CSI_CUSTOM_SEQUENCE, '');
+        str = str.replace(CSI_SEQUENCE, '');
     }
     return str;
 }
@@ -760,4 +772,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, htmlAttributeEncodeValue, isAsciiDigit, isBasicASCII, isEmojiImprecise, isFalsyOrWhitespace, isFullWidthCharacter, isHighSurrogate, isLowSurrogate, isLowerAsciiLetter, isUpperAsciiLetter, lastNonWhitespaceIndex, lcut, ltrim, nextCharLength, noBreakWhitespace, prevCharLength, regExpLeadsToEndlessLoop, removeAnsiEscapeCodes, replaceAsync, rtrim, singleLetterHash, splitLines, splitLinesIncludeSeparators, 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, forAnsiStringParts, 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, splitLinesIncludeSeparators, startsWithIgnoreCase, startsWithUTF8BOM, stripWildcards, trim, truncate, truncateMiddle, uppercaseFirstLetter };

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

@@ -1,4 +1,5 @@
 import { __decorate } from '../../../../../../../external/tslib/tslib.es6.js';
+import '../../../common/arrays.js';
 import { createCancelablePromise } from '../../../common/async.js';
 import { VSBuffer } from '../../../common/buffer.js';
 import { CancellationToken, CancellationTokenSource } from '../../../common/cancellation.js';
@@ -6,6 +7,9 @@ import { memoize } from '../../../common/decorators.js';
 import { CancellationError } from '../../../common/errors.js';
 import { Relay, Emitter, Event } from '../../../common/event.js';
 import { toDisposable, dispose, combinedDisposable } from '../../../common/lifecycle.js';
+import '../../../common/path.js';
+import '../../../common/platform.js';
+import '../../../common/strings.js';
 function requestTypeToStr(type) {
     switch (type) {
         case 100 :

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

@@ -26,7 +26,7 @@ class MouseHandler extends ViewEventHandler {
             (e) => this._getMouseColumn(e)
         )));
         this.lastMouseLeaveTime = -1;
-        this._height = this._context.configuration.options.get(144 ).height;
+        this._height = this._context.configuration.options.get(145 ).height;
         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) => {
@@ -105,8 +105,8 @@ class MouseHandler extends ViewEventHandler {
         super.dispose();
     }
     onConfigurationChanged(e) {
-        if (e.hasChanged(144 )) {
-            const height = this._context.configuration.options.get(144 ).height;
+        if (e.hasChanged(145 )) {
+            const height = this._context.configuration.options.get(145 ).height;
             if (this._height !== height) {
                 this._height = height;
                 this._mouseDownOperation.onHeightChanged();
@@ -498,7 +498,7 @@ class TopBottomDragScrollingOperation extends Disposable {
     }
     _getScrollSpeed() {
         const lineHeight = this._context.configuration.options.get(67 );
-        const viewportInLines = this._context.configuration.options.get(144 ).height / lineHeight;
+        const viewportInLines = this._context.configuration.options.get(145 ).height / lineHeight;
         const outsideDistanceInLines = this._position.outsideDistance / lineHeight;
         if (outsideDistanceInLines <= 1.5) {
             return Math.max(30, viewportInLines * (1 + outsideDistanceInLines));
@@ -521,7 +521,7 @@ class TopBottomDragScrollingOperation extends Disposable {
         let mouseTarget;
         {
             const editorPos = createEditorPagePosition(this._viewHelper.viewDomNode);
-            const horizontalScrollbarHeight = this._context.configuration.options.get(144 ).horizontalScrollbarHeight;
+            const horizontalScrollbarHeight = this._context.configuration.options.get(145 ).horizontalScrollbarHeight;
             const pos = ( new PageCoordinates(
                 this._mouseEvent.pos.x,
                 editorPos.y + editorPos.height - horizontalScrollbarHeight - 0.1

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

@@ -6,6 +6,7 @@ import { Range } from '../../common/core/range.js';
 import { CursorColumns } from '../../common/core/cursorColumns.js';
 import { getWindow, getShadowRoot } from '../../../base/browser/dom.js';
 import { AtomicTabMoveOperations } from '../../common/cursor/cursorAtomicMoveOperations.js';
+import { Lazy } from '../../../base/common/lazy.js';
 class UnknownHitTestResult {
     constructor(hitTarget = null) {
         this.hitTarget = hitTarget;
@@ -13,6 +14,7 @@ class UnknownHitTestResult {
     }
 }
 class ContentHitTestResult {
+    get hitTarget() { return this.spanNode; }
     constructor(position, spanNode, injectedText) {
         this.position = position;
         this.spanNode = spanNode;
@@ -160,7 +162,7 @@ class HitTestContext {
     constructor(context, viewHelper, lastRenderData) {
         this.viewModel = context.viewModel;
         const options = context.configuration.options;
-        this.layoutInfo = options.get(144 );
+        this.layoutInfo = options.get(145 );
         this.viewDomNode = viewHelper.viewDomNode;
         this.lineHeight = options.get(67 );
         this.stickyTabStops = options.get(116 );
@@ -286,21 +288,40 @@ class BareHitTestRequest {
     }
 }
 class HitTestRequest extends BareHitTestRequest {
-    constructor(ctx, editorPos, pos, relativePos, target) {
-        super(ctx, editorPos, pos, relativePos);
-        this._ctx = ctx;
-        if (target) {
-            this.target = target;
-            this.targetPath = PartFingerprints.collect(target, ctx.viewDomNode);
+    get target() {
+        if (this._useHitTestTarget) {
+            return this.hitTestResult.value.hitTarget;
         }
-        else {
-            this.target = null;
-            this.targetPath = ( new Uint8Array(0));
+        return this._eventTarget;
+    }
+    get targetPath() {
+        if (this._targetPathCacheElement !== this.target) {
+            this._targetPathCacheElement = this.target;
+            this._targetPathCacheValue = PartFingerprints.collect(this.target, this._ctx.viewDomNode);
         }
+        return this._targetPathCacheValue;
+    }
+    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._ctx = ctx;
+        this._eventTarget = eventTarget;
+        const hasEventTarget = Boolean(this._eventTarget);
+        this._useHitTestTarget = !hasEventTarget;
     }
     toString() {
         return `pos(${this.pos.x},${this.pos.y}), editorPos(${this.editorPos.x},${this.editorPos.y}), relativePos(${this.relativePos.x},${this.relativePos.y}), mouseVerticalOffset: ${this.mouseVerticalOffset}, mouseContentHorizontalOffset: ${this.mouseContentHorizontalOffset}\n\ttarget: ${this.target ? this.target.outerHTML : null}`;
     }
+    get wouldBenefitFromHitTestTargetSwitch() {
+        return (!this._useHitTestTarget
+            && this.hitTestResult.value.hitTarget !== null
+            && this.target !== this.hitTestResult.value.hitTarget);
+    }
+    switchToHitTestTarget() {
+        this._useHitTestTarget = true;
+    }
     _getMouseColumn(position = null) {
         if (position && position.column < this._ctx.viewModel.getLineMaxColumn(position.lineNumber)) {
             return CursorColumns.visibleColumnFromColumn(this._ctx.viewModel.getLineContent(position.lineNumber), position.column, this._ctx.viewModel.model.getOptions().tabSize) + 1;
@@ -334,9 +355,6 @@ class HitTestRequest extends BareHitTestRequest {
     fulfillOverlayWidget(detail) {
         return MouseTarget.createOverlayWidget(this.target, this._getMouseColumn(), detail);
     }
-    withTarget(target) {
-        return ( new HitTestRequest(this._ctx, this.editorPos, this.pos, this.relativePos, target));
-    }
 }
 const EMPTY_CONTENT_AFTER_LINES = { isAfterLines: true };
 function createEmptyContentDataInLines(horizontalDistanceToText) {
@@ -365,7 +383,7 @@ class MouseTargetFactory {
         const ctx = ( new HitTestContext(this._context, this._viewHelper, lastRenderData));
         const request = ( new HitTestRequest(ctx, editorPos, pos, relativePos, target));
         try {
-            const r = MouseTargetFactory._createMouseTarget(ctx, request, false);
+            const r = MouseTargetFactory._createMouseTarget(ctx, request);
             if (r.type === 6 ) {
                 if (ctx.stickyTabStops && r.position !== null) {
                     const position = MouseTargetFactory._snapToSoftTabBoundary(r.position, ctx.viewModel);
@@ -379,16 +397,9 @@ class MouseTargetFactory {
             return request.fulfillUnknown();
         }
     }
-    static _createMouseTarget(ctx, request, domHitTestExecuted) {
+    static _createMouseTarget(ctx, request) {
         if (request.target === null) {
-            if (domHitTestExecuted) {
-                return request.fulfillUnknown();
-            }
-            const hitTestResult = MouseTargetFactory._doHitTest(ctx, request);
-            if (hitTestResult.type === 1 ) {
-                return MouseTargetFactory.createMouseTargetFromHitTestPosition(ctx, request, hitTestResult.spanNode, hitTestResult.position, hitTestResult.injectedText);
-            }
-            return this._createMouseTarget(ctx, request.withTarget(hitTestResult.hitTarget), true);
+            return request.fulfillUnknown();
         }
         const resolvedRequest = request;
         let result = null;
@@ -403,7 +414,7 @@ class MouseTargetFactory {
         result = result || MouseTargetFactory._hitTestMargin(ctx, resolvedRequest);
         result = result || MouseTargetFactory._hitTestViewCursor(ctx, resolvedRequest);
         result = result || MouseTargetFactory._hitTestTextArea(ctx, resolvedRequest);
-        result = result || MouseTargetFactory._hitTestViewLines(ctx, resolvedRequest, domHitTestExecuted);
+        result = result || MouseTargetFactory._hitTestViewLines(ctx, resolvedRequest);
         result = result || MouseTargetFactory._hitTestScrollbar(ctx, resolvedRequest);
         return (result || request.fulfillUnknown());
     }
@@ -505,7 +516,7 @@ class MouseTargetFactory {
         }
         return null;
     }
-    static _hitTestViewLines(ctx, request, domHitTestExecuted) {
+    static _hitTestViewLines(ctx, request) {
         if (!ElementPath.isChildOfViewLines(request.targetPath)) {
             return null;
         }
@@ -517,28 +528,29 @@ class MouseTargetFactory {
             const maxLineColumn = ctx.viewModel.getLineMaxColumn(lineCount);
             return request.fulfillContentEmpty(( new Position(lineCount, maxLineColumn)), EMPTY_CONTENT_AFTER_LINES);
         }
-        if (domHitTestExecuted) {
-            if (ElementPath.isStrictChildOfViewLines(request.targetPath)) {
-                const lineNumber = ctx.getLineNumberAtVerticalOffset(request.mouseVerticalOffset);
-                if (ctx.viewModel.getLineLength(lineNumber) === 0) {
-                    const lineWidth = ctx.getLineWidth(lineNumber);
-                    const detail = createEmptyContentDataInLines(request.mouseContentHorizontalOffset - lineWidth);
-                    return request.fulfillContentEmpty(( new Position(lineNumber, 1)), detail);
-                }
+        if (ElementPath.isStrictChildOfViewLines(request.targetPath)) {
+            const lineNumber = ctx.getLineNumberAtVerticalOffset(request.mouseVerticalOffset);
+            if (ctx.viewModel.getLineLength(lineNumber) === 0) {
                 const lineWidth = ctx.getLineWidth(lineNumber);
-                if (request.mouseContentHorizontalOffset >= lineWidth) {
-                    const detail = createEmptyContentDataInLines(request.mouseContentHorizontalOffset - lineWidth);
-                    const pos = ( new Position(lineNumber, ctx.viewModel.getLineMaxColumn(lineNumber)));
-                    return request.fulfillContentEmpty(pos, detail);
-                }
+                const detail = createEmptyContentDataInLines(request.mouseContentHorizontalOffset - lineWidth);
+                return request.fulfillContentEmpty(( new Position(lineNumber, 1)), detail);
+            }
+            const lineWidth = ctx.getLineWidth(lineNumber);
+            if (request.mouseContentHorizontalOffset >= lineWidth) {
+                const detail = createEmptyContentDataInLines(request.mouseContentHorizontalOffset - lineWidth);
+                const pos = ( new Position(lineNumber, ctx.viewModel.getLineMaxColumn(lineNumber)));
+                return request.fulfillContentEmpty(pos, detail);
             }
-            return request.fulfillUnknown();
         }
-        const hitTestResult = MouseTargetFactory._doHitTest(ctx, request);
+        const hitTestResult = request.hitTestResult.value;
         if (hitTestResult.type === 1 ) {
             return MouseTargetFactory.createMouseTargetFromHitTestPosition(ctx, request, hitTestResult.spanNode, hitTestResult.position, hitTestResult.injectedText);
         }
-        return this._createMouseTarget(ctx, request.withTarget(hitTestResult.hitTarget), true);
+        if (request.wouldBenefitFromHitTestTargetSwitch) {
+            request.switchToHitTestTarget();
+            return this._createMouseTarget(ctx, request);
+        }
+        return request.fulfillUnknown();
     }
     static _hitTestMinimap(ctx, request) {
         if (ElementPath.isChildOfMinimap(request.targetPath)) {
@@ -571,7 +583,7 @@ class MouseTargetFactory {
     }
     getMouseColumn(relativePos) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         const mouseContentHorizontalOffset = this._context.viewLayout.getCurrentScrollLeft() + relativePos.x - layoutInfo.contentLeft;
         return MouseTargetFactory._getMouseColumn(mouseContentHorizontalOffset, options.get(50 ).typicalHalfwidthCharacterWidth);
     }
@@ -739,7 +751,7 @@ class MouseTargetFactory {
         }
         return position;
     }
-    static _doHitTest(ctx, request) {
+    static doHitTest(ctx, request) {
         let result = ( new UnknownHitTestResult());
         if (typeof ctx.viewDomNode.ownerDocument.caretRangeFromPoint === 'function') {
             result = this._doHitTestWithCaretRangeFromPoint(ctx, request);

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

@@ -84,7 +84,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         this._scrollLeft = 0;
         this._scrollTop = 0;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._setAccessibilityOptions(options);
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
@@ -326,7 +326,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     _getAndroidWordAtPosition(position) {
         const ANDROID_WORD_SEPARATORS = '`~!@#$%^&*()-=+[{]}\\|;:",.<>/?';
         const lineContent = this._context.viewModel.getLineContent(position.lineNumber);
-        const wordSeparators = getMapForWordSeparators(ANDROID_WORD_SEPARATORS);
+        const wordSeparators = getMapForWordSeparators(ANDROID_WORD_SEPARATORS, []);
         let goingLeft = true;
         let startColumn = position.column;
         let goingRight = true;
@@ -365,7 +365,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     _getWordBeforePosition(position) {
         const lineContent = this._context.viewModel.getLineContent(position.lineNumber);
-        const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(130 ));
+        const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(131 ), []);
         let column = position.column;
         let distance = 0;
         while (column > 1) {
@@ -442,7 +442,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         else {
             this._accessibilityPageSize = accessibilityPageSize;
         }
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         const wrappingColumn = layoutInfo.wrappingColumn;
         if (wrappingColumn !== -1 && this._accessibilitySupport !== 1 ) {
             const fontInfo = options.get(50 );
@@ -456,7 +456,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._setAccessibilityOptions(options);
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;

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

@@ -269,7 +269,7 @@ var CoreNavigationCommands;
                 CursorMoveCommands.moveTo(viewModel, viewModel.getPrimaryCursorState(), this._inSelectionMode, args.position, args.viewPosition)
             ]);
             if (cursorStateChanged && args.revealType !== 2 ) {
-                viewModel.revealPrimaryCursor(args.source, true, true);
+                viewModel.revealAllCursors(args.source, true, true);
             }
         }
     }
@@ -438,7 +438,7 @@ var CoreNavigationCommands;
         _runCursorMove(viewModel, source, args) {
             viewModel.model.pushStackElement();
             viewModel.setCursorStates(source, 3 , CursorMoveImpl._move(viewModel, viewModel.getCursorStates(), args));
-            viewModel.revealPrimaryCursor(source, true);
+            viewModel.revealAllCursors(source, true);
         }
         static _move(viewModel, cursors, args) {
             const inSelectionMode = args.select;
@@ -485,7 +485,7 @@ var CoreNavigationCommands;
             }
             viewModel.model.pushStackElement();
             viewModel.setCursorStates(dynamicArgs.source, 3 , CursorMoveCommands.simpleMove(viewModel, viewModel.getCursorStates(), args.direction, args.select, args.value, args.unit));
-            viewModel.revealPrimaryCursor(dynamicArgs.source, true);
+            viewModel.revealAllCursors(dynamicArgs.source, true);
         }
     }
     CoreNavigationCommands.CursorLeft = registerEditorCommand(( new CursorMoveBasedCommand({
@@ -746,7 +746,7 @@ var CoreNavigationCommands;
         runCoreEditorCommand(viewModel, args) {
             viewModel.model.pushStackElement();
             viewModel.setCursorStates(args.source, 3 , CursorMoveCommands.moveToBeginningOfLine(viewModel, viewModel.getCursorStates(), this._inSelectionMode));
-            viewModel.revealPrimaryCursor(args.source, true);
+            viewModel.revealAllCursors(args.source, true);
         }
     }
     CoreNavigationCommands.CursorHome = registerEditorCommand(( new HomeCommand({
@@ -779,7 +779,7 @@ var CoreNavigationCommands;
         runCoreEditorCommand(viewModel, args) {
             viewModel.model.pushStackElement();
             viewModel.setCursorStates(args.source, 3 , this._exec(viewModel.getCursorStates()));
-            viewModel.revealPrimaryCursor(args.source, true);
+            viewModel.revealAllCursors(args.source, true);
         }
         _exec(cursors) {
             const result = [];
@@ -821,7 +821,7 @@ var CoreNavigationCommands;
         runCoreEditorCommand(viewModel, args) {
             viewModel.model.pushStackElement();
             viewModel.setCursorStates(args.source, 3 , CursorMoveCommands.moveToEndOfLine(viewModel, viewModel.getCursorStates(), this._inSelectionMode, args.sticky || false));
-            viewModel.revealPrimaryCursor(args.source, true);
+            viewModel.revealAllCursors(args.source, true);
         }
     }
     CoreNavigationCommands.CursorEnd = registerEditorCommand(( new EndCommand({
@@ -896,7 +896,7 @@ var CoreNavigationCommands;
         runCoreEditorCommand(viewModel, args) {
             viewModel.model.pushStackElement();
             viewModel.setCursorStates(args.source, 3 , this._exec(viewModel, viewModel.getCursorStates()));
-            viewModel.revealPrimaryCursor(args.source, true);
+            viewModel.revealAllCursors(args.source, true);
         }
         _exec(viewModel, cursors) {
             const result = [];
@@ -939,7 +939,7 @@ var CoreNavigationCommands;
         runCoreEditorCommand(viewModel, args) {
             viewModel.model.pushStackElement();
             viewModel.setCursorStates(args.source, 3 , CursorMoveCommands.moveToBeginningOfBuffer(viewModel, viewModel.getCursorStates(), this._inSelectionMode));
-            viewModel.revealPrimaryCursor(args.source, true);
+            viewModel.revealAllCursors(args.source, true);
         }
     }
     CoreNavigationCommands.CursorTop = registerEditorCommand(( new TopCommand({
@@ -972,7 +972,7 @@ var CoreNavigationCommands;
         runCoreEditorCommand(viewModel, args) {
             viewModel.model.pushStackElement();
             viewModel.setCursorStates(args.source, 3 , CursorMoveCommands.moveToEndOfBuffer(viewModel, viewModel.getCursorStates(), this._inSelectionMode));
-            viewModel.revealPrimaryCursor(args.source, true);
+            viewModel.revealAllCursors(args.source, true);
         }
     }
     CoreNavigationCommands.CursorBottom = registerEditorCommand(( new BottomCommand({
@@ -1292,7 +1292,7 @@ var CoreNavigationCommands;
                 CursorMoveCommands.word(viewModel, viewModel.getPrimaryCursorState(), this._inSelectionMode, args.position)
             ]);
             if (args.revealType !== 2 ) {
-                viewModel.revealPrimaryCursor(args.source, true, true);
+                viewModel.revealAllCursors(args.source, true, true);
             }
         }
     }
@@ -1340,7 +1340,7 @@ var CoreNavigationCommands;
                 CursorMoveCommands.line(viewModel, viewModel.getPrimaryCursorState(), this._inSelectionMode, args.position, args.viewPosition)
             ]);
             if (args.revealType !== 2 ) {
-                viewModel.revealPrimaryCursor(args.source, false, true);
+                viewModel.revealAllCursors(args.source, false, true);
             }
         }
     }
@@ -1399,7 +1399,7 @@ var CoreNavigationCommands;
             viewModel.setCursorStates(args.source, 3 , [
                 CursorMoveCommands.cancelSelection(viewModel, viewModel.getPrimaryCursorState())
             ]);
-            viewModel.revealPrimaryCursor(args.source, true);
+            viewModel.revealAllCursors(args.source, true);
         }
     }));
     CoreNavigationCommands.RemoveSecondaryCursors = registerEditorCommand(new (class extends CoreEditorCommand {
@@ -1420,7 +1420,7 @@ var CoreNavigationCommands;
             viewModel.setCursorStates(args.source, 3 , [
                 viewModel.getPrimaryCursorState()
             ]);
-            viewModel.revealPrimaryCursor(args.source, true);
+            viewModel.revealAllCursors(args.source, true);
             status(( localizeWithPath(
                 'vs/editor/browser/coreCommands',
                 'removedCursor',

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

@@ -3,7 +3,17 @@ import { GlobalPointerMoveMonitor } from '../../base/browser/globalPointerMoveMo
 import { StandardMouseEvent } from '../../base/browser/mouseEvent.js';
 import { RunOnceScheduler } from '../../base/common/async.js';
 import { DisposableStore, Disposable } from '../../base/common/lifecycle.js';
-import { asCssVariable } from '../../platform/theme/common/colorRegistry.js';
+import { asCssVariable } from '../../platform/theme/common/colorUtils.js';
+import '../../platform/theme/common/colors/baseColors.js';
+import '../../platform/theme/common/colors/chartsColors.js';
+import '../../platform/theme/common/colors/editorColors.js';
+import '../../platform/theme/common/colors/inputColors.js';
+import '../../platform/theme/common/colors/listColors.js';
+import '../../platform/theme/common/colors/menuColors.js';
+import '../../platform/theme/common/colors/minimapColors.js';
+import '../../platform/theme/common/colors/miscColors.js';
+import '../../platform/theme/common/colors/quickpickColors.js';
+import '../../platform/theme/common/colors/searchColors.js';
 class PageCoordinates {
     constructor(x, y) {
         this.x = x;

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

@@ -4,7 +4,7 @@ import { ICodeEditorService } from './services/codeEditorService.js';
 import { Position } from '../common/core/position.js';
 import { IModelService } from '../common/services/model.js';
 import { ITextModelService } from '../common/services/resolverService.js';
-import { MenuId, MenuRegistry, Action2 } from '../../platform/actions/common/actions.js';
+import { Action2, MenuId, MenuRegistry } from '../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../platform/commands/common/commands.js';
 import { IContextKeyService, ContextKeyExpr } from '../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';