@codingame/monaco-vscode-api 1.81.8-next.3 → 1.82.0-next.0

package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js

@@ -0,0 +1,204 @@
+import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { isMarkdownString, MarkdownString } from 'monaco-editor/esm/vs/base/common/htmlContent.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+class ChatRequestModel {
+    static { this.nextId = 0; }
+    get id() {
+        return this._id;
+    }
+    get providerRequestId() {
+        return this._providerRequestId;
+    }
+    get username() {
+        return this.session.requesterUsername;
+    }
+    get avatarIconUri() {
+        return this.session.requesterAvatarIconUri;
+    }
+    constructor(session, message, _providerRequestId) {
+        this.session = session;
+        this.message = message;
+        this._providerRequestId = _providerRequestId;
+        this._id = 'request_' + ChatRequestModel.nextId++;
+    }
+    setProviderRequestId(providerRequestId) {
+        this._providerRequestId = providerRequestId;
+    }
+}
+class Response {
+    get onDidChangeValue() {
+        return this._onDidChangeValue.event;
+    }
+    get value() {
+        return this._responseData;
+    }
+    constructor(value) {
+        this._onDidChangeValue = ( new Emitter());
+        this._responseData = Array.isArray(value) ? value : [value];
+        this._responseParts = Array.isArray(value) ? ( value.map((v) => ('value' in v ? { string: v } : { treeData: v }))) : [{ string: value }];
+        this._responseRepr = ( this._responseParts.map((part) => {
+            if (isCompleteInteractiveProgressTreeData(part)) {
+                return '';
+            }
+            return part.string.value;
+        })).join('\n');
+    }
+    asString() {
+        return this._responseRepr;
+    }
+    updateContent(responsePart, quiet) {
+        if (typeof responsePart === 'string' || isMarkdownString(responsePart)) {
+            const responsePartLength = this._responseParts.length - 1;
+            const lastResponsePart = this._responseParts[responsePartLength];
+            if (lastResponsePart.isPlaceholder === true || isCompleteInteractiveProgressTreeData(lastResponsePart)) {
+                this._responseParts.push({ string: typeof responsePart === 'string' ? ( new MarkdownString(responsePart)) : responsePart });
+            }
+            else {
+                if (isMarkdownString(responsePart)) {
+                    this._responseParts[responsePartLength] = { string: ( new MarkdownString(lastResponsePart.string.value + responsePart.value, responsePart)) };
+                }
+                else {
+                    this._responseParts[responsePartLength] = { string: ( new MarkdownString(lastResponsePart.string.value + responsePart, lastResponsePart.string)) };
+                }
+            }
+            this._updateRepr(quiet);
+        }
+        else if ('placeholder' in responsePart) {
+            const responsePosition = this._responseParts.push({ string: ( new MarkdownString(responsePart.placeholder)), isPlaceholder: true }) - 1;
+            this._updateRepr(quiet);
+            responsePart.resolvedContent?.then((content) => {
+                if (typeof content === 'string') {
+                    this._responseParts[responsePosition] = { string: ( new MarkdownString(content)), isPlaceholder: true };
+                    this._updateRepr(quiet);
+                }
+                else if (content.treeData) {
+                    this._responseParts[responsePosition] = { treeData: content.treeData };
+                    this._updateRepr(quiet);
+                }
+            });
+        }
+        else if (isCompleteInteractiveProgressTreeData(responsePart)) {
+            this._responseParts.push(responsePart);
+            this._updateRepr(quiet);
+        }
+    }
+    _updateRepr(quiet) {
+        this._responseData = ( this._responseParts.map(part => {
+            if (isCompleteInteractiveProgressTreeData(part)) {
+                return part.treeData;
+            }
+            else if (part.isPlaceholder) {
+                return { ...part.string, isPlaceholder: true };
+            }
+            return part.string;
+        }));
+        this._responseRepr = ( this._responseParts.map(part => {
+            if (isCompleteInteractiveProgressTreeData(part)) {
+                return '';
+            }
+            return part.string.value;
+        })).join('\n\n');
+        if (!quiet) {
+            this._onDidChangeValue.fire();
+        }
+    }
+}
+class ChatResponseModel extends Disposable {
+    static { this.nextId = 0; }
+    get id() {
+        return this._id;
+    }
+    get providerResponseId() {
+        return this._providerResponseId;
+    }
+    get isComplete() {
+        return this._isComplete;
+    }
+    get isCanceled() {
+        return this._isCanceled;
+    }
+    get vote() {
+        return this._vote;
+    }
+    get followups() {
+        return this._followups;
+    }
+    get response() {
+        return this._response;
+    }
+    get errorDetails() {
+        return this._errorDetails;
+    }
+    get providerId() {
+        return this.session.providerId;
+    }
+    get username() {
+        return this.session.responderUsername;
+    }
+    get avatarIconUri() {
+        return this.session.responderAvatarIconUri;
+    }
+    constructor(_response, session, _isComplete = false, _isCanceled = false, _vote, _providerResponseId, _errorDetails, _followups) {
+        super();
+        this.session = session;
+        this._isComplete = _isComplete;
+        this._isCanceled = _isCanceled;
+        this._vote = _vote;
+        this._providerResponseId = _providerResponseId;
+        this._errorDetails = _errorDetails;
+        this._followups = _followups;
+        this._onDidChange = this._register(( new Emitter()));
+        this.onDidChange = this._onDidChange.event;
+        this._response = ( new Response(_response));
+        this._register(this._response.onDidChangeValue(() => this._onDidChange.fire()));
+        this._id = 'response_' + ChatResponseModel.nextId++;
+    }
+    updateContent(responsePart, quiet) {
+        this._response.updateContent(responsePart, quiet);
+    }
+    setProviderResponseId(providerResponseId) {
+        this._providerResponseId = providerResponseId;
+    }
+    setErrorDetails(errorDetails) {
+        this._errorDetails = errorDetails;
+        this._onDidChange.fire();
+    }
+    complete() {
+        this._isComplete = true;
+        this._onDidChange.fire();
+    }
+    cancel() {
+        this._isComplete = true;
+        this._isCanceled = true;
+        this._onDidChange.fire();
+    }
+    setFollowups(followups) {
+        this._followups = followups;
+        this._onDidChange.fire();
+    }
+    setVote(vote) {
+        this._vote = vote;
+        this._onDidChange.fire();
+    }
+}
+class ChatWelcomeMessageModel {
+    static { this.nextId = 0; }
+    get id() {
+        return this._id;
+    }
+    constructor(session, content) {
+        this.session = session;
+        this.content = content;
+        this._id = 'welcome_' + ChatWelcomeMessageModel.nextId++;
+    }
+    get username() {
+        return this.session.responderUsername;
+    }
+    get avatarIconUri() {
+        return this.session.responderAvatarIconUri;
+    }
+}
+function isCompleteInteractiveProgressTreeData(item) {
+    return typeof item === 'object' && !!item && 'treeData' in item;
+}
+export { ChatRequestModel, ChatResponseModel, ChatWelcomeMessageModel, Response, isCompleteInteractiveProgressTreeData };

package/vscode/src/vs/workbench/contrib/chat/common/chatProvider.js

@@ -0,0 +1,3 @@
+import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+const IChatProviderService = ( createDecorator('chatProviderService'));
+export { IChatProviderService };

package/vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.js

@@ -0,0 +1,3 @@
+import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+const IChatSlashCommandService = ( createDecorator('chatSlashCommandService'));
+export { IChatSlashCommandService };

package/vscode/src/vs/workbench/contrib/chat/common/chatVariables.js

@@ -0,0 +1,3 @@
+import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+const IChatVariablesService = ( createDecorator('IChatVariablesService'));
+export { IChatVariablesService };

package/vscode/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".accessible-view{background-color:var(--vscode-editorWidget-background);border:2px solid var(--vscode-focusBorder);box-shadow:0 2px 8px var(--vscode-widget-shadow);color:var(--vscode-editorWidget-foreground);position:absolute}";
+var css = ".accessible-view{background-color:var(--vscode-editorWidget-background);border:2px solid var(--vscode-focusBorder);border-radius:6px;box-shadow:0 2px 8px var(--vscode-widget-shadow);color:var(--vscode-editorWidget-foreground);margin-top:-1px;position:absolute;z-index:2550}.accessible-view-container .actions-container{display:flex;justify-content:flex-end;margin:0 auto;padding:0;width:100%}.accessible-view-title-bar{align-items:center;border-top-left-radius:5px;border-top-right-radius:5px;display:flex}.accessible-view-title{overflow:hidden;padding:3px 0;text-align:center;text-overflow:ellipsis;width:100%}.accessible-view-action-bar{flex:1;justify-content:flex-end;margin-right:4px}.accessible-view-action-bar>.actions-container{justify-content:flex-end}.accessible-view-title-bar .monaco-action-bar .action-label.codicon{background-position:50%;background-repeat:no-repeat;padding:2px}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.js

@@ -3,7 +3,7 @@ import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
 import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { accessibilityHelpIsShown } from '../../../accessibility/browser/accessibilityContribution.js';
+import { accessibilityHelpIsShown } from '../../../accessibility/browser/accessibilityConfiguration.js';
 import { alert } from 'monaco-editor/esm/vs/base/browser/ui/aria/aria.js';
 import { AccessibilityHelpNLS } from 'monaco-editor/esm/vs/editor/common/standaloneStrings.js';
 class ToggleScreenReaderMode extends Action2 {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js

@@ -1,22 +1,23 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { observableFromEvent, autorunWithStore } from 'monaco-editor/esm/vs/base/common/observable.js';
 import { registerDiffEditorContribution } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
 import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev } from 'monaco-editor/esm/vs/editor/browser/widget/diffEditor.contribution.js';
 import { DiffEditorWidget2 } from 'monaco-editor/esm/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.js';
 import { EmbeddedDiffEditorWidget, EmbeddedDiffEditorWidget2 } from 'monaco-editor/esm/vs/editor/browser/widget/embeddedCodeEditorWidget.js';
+import { localize } from 'monaco-editor/esm/vs/nls.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { ContextKeyExpr, ContextKeyEqualsExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
 import { Severity, INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { FloatingClickWidget } from '../../../browser/codeeditor.js';
-import { AccessibilityHelpAction } from '../../accessibility/browser/accessibilityContribution.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { FloatingEditorClickWidget } from '../../../browser/codeeditor.js';
 import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
-import { observableFromEvent } from 'monaco-editor/esm/vs/base/common/observable.js';
-import { autorunWithStore2 } from 'monaco-editor/esm/vs/base/common/observableImpl/autorun.js';
+import { AccessibilityHelpAction } from '../../accessibility/browser/accessibleViewActions.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Extensions } from '../../../common/configuration.js';
 let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Disposable {
     static { this.ID = 'editor.contrib.diffEditorHelper'; }
     constructor(_diffEditor, _instantiationService, _configurationService, _notificationService) {
@@ -30,9 +31,9 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
         if (!isEmbeddedDiffEditor) {
             const computationResult = observableFromEvent(e => this._diffEditor.onDidUpdateDiff(e), () => this._diffEditor.getDiffComputationResult());
             const onlyWhiteSpaceChange = ( computationResult.map(r => r && !r.identical && r.changes2.length === 0));
-            this._register(autorunWithStore2('update state', (reader, store) => {
+            this._register(autorunWithStore((reader, store) => {
                 if (onlyWhiteSpaceChange.read(reader)) {
-                    const helperWidget = store.add(this._instantiationService.createInstance(FloatingClickWidget, this._diffEditor.getModifiedEditor(), ( localize('hintWhitespace', "Show Whitespace Differences")), null));
+                    const helperWidget = store.add(this._instantiationService.createInstance(FloatingEditorClickWidget, this._diffEditor.getModifiedEditor(), ( localize('hintWhitespace', "Show Whitespace Differences")), null));
                     store.add(helperWidget.onClick(() => {
                         this._configurationService.updateValue('diffEditor.ignoreTrimWhitespace', false);
                     }));
@@ -93,11 +94,11 @@ function createScreenReaderHelp() {
                     "To control which audio cues should be played, the following settings can be configured: {0}.",
                     keys.join(', ')
                 )),
-            ].join('\n'),
+            ].join('\n\n'),
             onClose: () => {
                 codeEditor.focus();
             },
-            options: { type: "help" , ariaLabel: ( localize('chat-help-label', "Diff editor accessibility help")) }
+            options: { type: "help"  }
         });
     }, ( ContextKeyExpr.and(
         ContextKeyEqualsExpr.create('diffEditorVersion', 2),
@@ -105,3 +106,13 @@ function createScreenReaderHelp() {
     )));
 }
 registerDiffEditorContribution(DiffEditorHelperContribution.ID, DiffEditorHelperContribution);
+( Registry.as(Extensions.ConfigurationMigration))
+    .registerConfigurationMigrations([{
+        key: 'diffEditor.experimental.collapseUnchangedRegions',
+        migrateFn: (value, accessor) => {
+            return [
+                ['diffEditor.hideUnchangedRegions.enabled', { value }],
+                ['diffEditor.experimental.collapseUnchangedRegions', { value: undefined }]
+            ];
+        }
+    }]);

package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .simple-find-part-wrapper{max-width:calc(100% - 64px);overflow:hidden;padding:0 10px 10px;pointer-events:none;position:absolute;right:18px;top:0;z-index:10}.simple-find-part .monaco-inputbox>.ibwrapper>input{text-overflow:clip}.monaco-workbench .simple-find-part{align-items:center;background-color:var(--vscode-editorWidget-background)!important;border:1px solid var(--vscode-contrastBorder);border-bottom-left-radius:4px;border-bottom-right-radius:4px;box-shadow:0 0 8px 2px var(--vscode-widget-shadow);color:var(--vscode-editorWidget-foreground);display:flex;font-size:12px;padding:4px;pointer-events:all;position:relative;top:-45px;transition:top .2s linear;visibility:hidden;z-index:10}.monaco-workbench.reduce-motion .monaco-editor .find-widget{transition:top 0ms linear}.monaco-workbench .simple-find-part.visible{visibility:visible}.monaco-workbench .simple-find-part.suppress-transition{transition:none}.monaco-workbench .simple-find-part.visible-transition{top:0}.monaco-workbench .simple-find-part .monaco-findInput{flex:1}.monaco-workbench .simple-find-part .matchesCount{max-width:73px;min-width:73px;padding-left:5px;width:73px}.monaco-workbench .simple-find-part.reduced-find-widget .matchesCount{display:none}.monaco-workbench .simple-find-part .button{background-position:50%;background-repeat:no-repeat;cursor:pointer;display:flex;flex:initial;height:20px;justify-content:center;line-height:20px;margin-left:3px;min-width:20px;width:20px}.monaco-workbench div.simple-find-part div.button.disabled{cursor:default;opacity:.3!important}div.simple-find-part-wrapper div.button{border-radius:5px}.no-results.matchesCount{color:var(--vscode-errorForeground)}div.simple-find-part-wrapper div.button:hover:not(.disabled){background-color:var(--vscode-toolbar-hoverBackground);outline:1px dashed var(--vscode-toolbar-hoverOutline);outline-offset:-1px}";
+var css = ".monaco-workbench .simple-find-part-wrapper{max-width:calc(100% - 64px);overflow:hidden;padding:0 10px 10px;pointer-events:none;position:absolute;right:18px;top:0;z-index:10}.simple-find-part .monaco-inputbox>.ibwrapper>input{text-overflow:clip}.monaco-workbench .simple-find-part{align-items:center;background-color:var(--vscode-editorWidget-background)!important;border:1px solid var(--vscode-widget-border);border-bottom-left-radius:4px;border-bottom-right-radius:4px;box-shadow:0 0 8px 2px var(--vscode-widget-shadow);color:var(--vscode-editorWidget-foreground);display:flex;font-size:12px;padding:4px;pointer-events:all;position:relative;top:-45px;transition:top .2s linear;visibility:hidden;z-index:10}.monaco-workbench.reduce-motion .monaco-editor .find-widget{transition:top 0ms linear}.monaco-workbench .simple-find-part.visible{visibility:visible}.monaco-workbench .simple-find-part.suppress-transition{transition:none}.monaco-workbench .simple-find-part.visible-transition{top:0}.monaco-workbench .simple-find-part .monaco-findInput{flex:1}.monaco-workbench .simple-find-part .matchesCount{max-width:73px;min-width:73px;padding-left:5px;width:73px}.monaco-workbench .simple-find-part.reduced-find-widget .matchesCount{display:none}.monaco-workbench .simple-find-part .button{background-position:50%;background-repeat:no-repeat;cursor:pointer;display:flex;flex:initial;height:20px;justify-content:center;line-height:20px;margin-left:3px;min-width:20px;width:20px}.monaco-workbench div.simple-find-part div.button.disabled{cursor:default;opacity:.3!important}div.simple-find-part-wrapper div.button{border-radius:5px}.no-results.matchesCount{color:var(--vscode-errorForeground)}div.simple-find-part-wrapper div.button:hover:not(.disabled){background-color:var(--vscode-toolbar-hoverBackground);outline:1px dashed var(--vscode-toolbar-hoverOutline);outline-offset:-1px}.monaco-workbench .simple-find-part .monaco-sash{border-bottom-left-radius:4px;border-left:1px solid;left:0!important}.monaco-workbench .simple-find-part .monaco-sash.vertical:before{left:calc(50% - var(--vscode-sash-hover-size)/4);width:2px}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js

@@ -7,10 +7,13 @@ import { FindReplaceState } from 'monaco-editor/esm/vs/editor/contrib/find/brows
 import { SimpleButton, findPreviousMatchIcon, findNextMatchIcon, NLS_MATCHES_LOCATION, NLS_NO_RESULTS } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findWidget.js';
 import { ContextScopedFindInput } from 'monaco-editor/esm/vs/platform/history/browser/contextScopedHistoryWidget.js';
 import { widgetClose } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
+import { registerThemingParticipant } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
 import { showHistoryKeybindingHint } from 'monaco-editor/esm/vs/platform/history/browser/historyWidgetKeybindingHint.js';
 import { status } from 'monaco-editor/esm/vs/base/browser/ui/aria/aria.js';
 import { defaultInputBoxStyles, defaultToggleStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+import { Sash } from 'monaco-editor/esm/vs/base/browser/ui/sash/sash.js';
+import { registerColor } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 const NLS_FIND_INPUT_LABEL = ( nls.localize('label.find', "Find"));
 const NLS_FIND_INPUT_PLACEHOLDER = ( nls.localize('placeholder.find', "Find (\u21C5 for history)"));
 const NLS_PREVIOUS_MATCH_BTN_LABEL = ( nls.localize('label.previousMatchButton', "Previous Match"));
@@ -140,6 +143,42 @@ class SimpleFindWidget extends Widget {
                 this._delayedUpdateHistory();
             }));
         }
+        let initialMinWidth = options?.initialWidth;
+        if (initialMinWidth) {
+            initialMinWidth = initialMinWidth < SIMPLE_FIND_WIDGET_INITIAL_WIDTH ? SIMPLE_FIND_WIDGET_INITIAL_WIDTH : initialMinWidth;
+            this._domNode.style.width = `${initialMinWidth}px`;
+        }
+        if (options?.enableSash) {
+            const _initialMinWidth = initialMinWidth ?? SIMPLE_FIND_WIDGET_INITIAL_WIDTH;
+            let originalWidth = _initialMinWidth;
+            const resizeSash = ( new Sash(
+                this._innerDomNode,
+                this,
+                { orientation: 0 , size: 1 }
+            ));
+            this._register(resizeSash.onDidStart(() => {
+                originalWidth = parseFloat(dom.getComputedStyle(this._domNode).width);
+            }));
+            this._register(resizeSash.onDidChange((e) => {
+                const width = originalWidth + e.startX - e.currentX;
+                if (width < _initialMinWidth) {
+                    return;
+                }
+                this._domNode.style.width = `${width}px`;
+            }));
+            this._register(resizeSash.onDidReset(e => {
+                const currentWidth = parseFloat(dom.getComputedStyle(this._domNode).width);
+                if (currentWidth === _initialMinWidth) {
+                    this._domNode.style.width = '100%';
+                }
+                else {
+                    this._domNode.style.width = `${_initialMinWidth}px`;
+                }
+            }));
+        }
+    }
+    getVerticalSashLeft(_sash) {
+        return 0;
     }
     get inputValue() {
         return this._findInput.getValue();
@@ -298,4 +337,9 @@ class SimpleFindWidget extends Widget {
         ));
     }
 }
-export { SimpleFindWidget };
+const simpleFindWidgetSashBorder = registerColor('simpleFindWidget.sashBorder', { dark: '#454545', light: '#C8C8C8', hcDark: '#6FC3DF', hcLight: '#0F4A85' }, ( nls.localize('simpleFindWidget.sashBorder', 'Border color of the sash border.')));
+registerThemingParticipant((theme, collector) => {
+    const resizeBorderBackground = theme.getColor(simpleFindWidgetSashBorder);
+    collector.addRule(`.monaco-workbench .simple-find-part .monaco-sash { background-color: ${resizeBorderBackground}; border-color: ${resizeBorderBackground} }`);
+});
+export { SimpleFindWidget, simpleFindWidgetSashBorder };

package/vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js

@@ -18,11 +18,13 @@ import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configurati
 import { SEMANTIC_HIGHLIGHTING_SETTING_ID } from 'monaco-editor/esm/vs/editor/contrib/semanticTokens/common/semanticTokensConfig.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
+var InspectEditorTokensController_1;
 const $ = dom.$;
 let InspectEditorTokensController = class InspectEditorTokensController extends Disposable {
+    static { InspectEditorTokensController_1 = this; }
     static { this.ID = 'editor.contrib.inspectEditorTokens'; }
     static get(editor) {
-        return editor.getContribution(InspectEditorTokensController.ID);
+        return editor.getContribution(InspectEditorTokensController_1.ID);
     }
     constructor(editor, textMateService, languageService, themeService, notificationService, configurationService, languageFeaturesService) {
         super();
@@ -77,7 +79,7 @@ let InspectEditorTokensController = class InspectEditorTokensController extends
         }
     }
 };
-InspectEditorTokensController = ( __decorate([
+InspectEditorTokensController = InspectEditorTokensController_1 = ( __decorate([
     ( __param(1, ITextMateTokenizationService)),
     ( __param(2, ILanguageService)),
     ( __param(3, IWorkbenchThemeService)),

package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js

@@ -26,7 +26,7 @@ let LargeFileOptimizationsWarner = class LargeFileOptimizationsWarner extends Di
                 comment: [
                     'Variable 0 will be a file name.'
                 ]
-            }, "{0}: tokenization, wrapping and folding have been turned off for this large file in order to reduce memory usage and avoid freezing or crashing.", path.basename(model.uri.path)));
+            }, "{0}: tokenization, wrapping, folding and sticky scroll have been turned off for this large file in order to reduce memory usage and avoid freezing or crashing.", path.basename(model.uri.path)));
             this._notificationService.prompt(Severity.Info, message, [
                 {
                     label: ( nls.localize('removeOptimizations', "Forcefully Enable Features")),

package/vscode/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.js

@@ -15,6 +15,7 @@ import { listErrorForeground, listWarningForeground } from 'monaco-editor/esm/vs
 import { IdleValue } from 'monaco-editor/esm/vs/base/common/async.js';
 import { ITextResourceConfigurationService } from 'monaco-editor/esm/vs/editor/common/services/textResourceConfiguration.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+var DocumentSymbolFilter_1;
 class DocumentSymbolNavigationLabelProvider {
     getKeyboardNavigationLabel(element) {
         if (element instanceof OutlineGroup) {
@@ -173,6 +174,7 @@ DocumentSymbolRenderer = ( __decorate([
     ( __param(2, IThemeService))
 ], DocumentSymbolRenderer));
 let DocumentSymbolFilter = class DocumentSymbolFilter {
+    static { DocumentSymbolFilter_1 = this; }
     static { this.kindToConfigName = ( Object.freeze({
         [0 ]: 'showFiles',
         [1 ]: 'showModules',
@@ -210,12 +212,12 @@ let DocumentSymbolFilter = class DocumentSymbolFilter {
         if (!(element instanceof OutlineElement)) {
             return true;
         }
-        const configName = DocumentSymbolFilter.kindToConfigName[element.symbol.kind];
+        const configName = DocumentSymbolFilter_1.kindToConfigName[element.symbol.kind];
         const configKey = `${this._prefix}.${configName}`;
         return this._textResourceConfigService.getValue(outline?.uri, configKey);
     }
 };
-DocumentSymbolFilter = ( __decorate([
+DocumentSymbolFilter = DocumentSymbolFilter_1 = ( __decorate([
     ( __param(1, ITextResourceConfigurationService))
 ], DocumentSymbolFilter));
 class DocumentSymbolComparator {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js

@@ -18,7 +18,9 @@ import { isCompositeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBro
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { IOutlineModelService } from 'monaco-editor/esm/vs/editor/contrib/documentSymbols/browser/outlineModel.js';
 import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
+var GotoSymbolQuickAccessProvider_1;
 let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccessProvider {
+    static { GotoSymbolQuickAccessProvider_1 = this; }
     constructor(editorService, editorGroupService, configurationService, languageFeaturesService, outlineService, outlineModelService) {
         super(languageFeaturesService, outlineModelService, {
             openSideBySideDirection: () => this.configuration.openSideBySideDirection
@@ -60,7 +62,7 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
     async getSymbolPicks(model, filter, options, disposables, token) {
         const result = await Promise.race([
             this.waitForLanguageSymbolRegistry(model, disposables),
-            timeout(GotoSymbolQuickAccessProvider.SYMBOL_PICKS_TIMEOUT)
+            timeout(GotoSymbolQuickAccessProvider_1.SYMBOL_PICKS_TIMEOUT)
         ]);
         if (!result || token.isCancellationRequested) {
             return [];
@@ -165,7 +167,7 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
         return disposables;
     }
 };
-GotoSymbolQuickAccessProvider = ( __decorate([
+GotoSymbolQuickAccessProvider = GotoSymbolQuickAccessProvider_1 = ( __decorate([
     ( __param(0, IEditorService)),
     ( __param(1, IEditorGroupsService)),
     ( __param(2, IConfigurationService)),
@@ -210,8 +212,16 @@ registerAction2(GotoSymbolAction);
     contextKey: 'inFileSymbolsPicker',
     placeholder: ( localize('gotoSymbolQuickAccessPlaceholder', "Type the name of a symbol to go to.")),
     helpEntries: [
-        { description: ( localize('gotoSymbolQuickAccess', "Go to Symbol in Editor")), prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX, commandId: GotoSymbolAction.ID },
-        { description: ( localize('gotoSymbolByCategoryQuickAccess', "Go to Symbol in Editor by Category")), prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX_BY_CATEGORY }
+        {
+            description: ( localize('gotoSymbolQuickAccess', "Go to Symbol in Editor")),
+            prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
+            commandId: GotoSymbolAction.ID,
+            commandCenterOrder: 40
+        },
+        {
+            description: ( localize('gotoSymbolByCategoryQuickAccess', "Go to Symbol in Editor by Category")),
+            prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX_BY_CATEGORY
+        }
     ]
 });
 export { GotoSymbolQuickAccessProvider };

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js

@@ -22,7 +22,7 @@ class ToggleRenderControlCharacterAction extends Action2 {
             menu: {
                 id: MenuId.MenubarAppearanceMenu,
                 group: '4_editor',
-                order: 4
+                order: 5
             }
         });
     }

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js

@@ -22,7 +22,7 @@ class ToggleRenderWhitespaceAction extends Action2 {
             menu: {
                 id: MenuId.MenubarAppearanceMenu,
                 group: '4_editor',
-                order: 3
+                order: 4
             }
         });
     }

package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js

@@ -12,15 +12,10 @@ const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBo
     'Color of borders and arrow for unresolved comments.'
 )));
 registerColor('editorCommentsWidget.rangeBackground', { dark: ( transparent(unresolvedCommentBorder, .1)), light: ( transparent(unresolvedCommentBorder, .1)), hcDark: ( transparent(unresolvedCommentBorder, .1)), hcLight: ( transparent(unresolvedCommentBorder, .1)) }, ( nls.localize('commentThreadRangeBackground', 'Color of background for comment ranges.')));
-registerColor('editorCommentsWidget.rangeBorder', { dark: ( transparent(unresolvedCommentBorder, .4)), light: ( transparent(unresolvedCommentBorder, .4)), hcDark: ( transparent(unresolvedCommentBorder, .4)), hcLight: ( transparent(unresolvedCommentBorder, .4)) }, ( nls.localize('commentThreadRangeBorder', 'Color of border for comment ranges.')));
 registerColor('editorCommentsWidget.rangeActiveBackground', { dark: ( transparent(unresolvedCommentBorder, .1)), light: ( transparent(unresolvedCommentBorder, .1)), hcDark: ( transparent(unresolvedCommentBorder, .1)), hcLight: ( transparent(unresolvedCommentBorder, .1)) }, ( nls.localize(
     'commentThreadActiveRangeBackground',
     'Color of background for currently selected or hovered comment range.'
 )));
-registerColor('editorCommentsWidget.rangeActiveBorder', { dark: ( transparent(unresolvedCommentBorder, .4)), light: ( transparent(unresolvedCommentBorder, .4)), hcDark: ( transparent(unresolvedCommentBorder, .4)), hcLight: ( transparent(unresolvedCommentBorder, .2)) }, ( nls.localize(
-    'commentThreadActiveRangeBorder',
-    'Color of border for currently selected or hovered comment range.'
-)));
 const commentThreadStateBorderColors = ( new Map([
     [languages.CommentThreadState.Unresolved, unresolvedCommentBorder],
     [languages.CommentThreadState.Resolved, resolvedCommentBorder],

package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js

@@ -106,6 +106,13 @@ let CommentReply = class CommentReply extends Disposable {
     focusCommentEditor() {
         this.commentEditor.focus();
     }
+    expandReplyAreaAndFocusCommentEditor() {
+        this.expandReplyArea();
+        this.commentEditor.focus();
+    }
+    isCommentEditorFocused() {
+        return this.commentEditor.hasWidgetFocus();
+    }
     getCommentModel() {
         return this.commentEditor.getModel();
     }

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadRangeDecorator.js

@@ -24,14 +24,16 @@ class CommentThreadRangeDecorator extends Disposable {
             description: CommentThreadRangeDecorator.description,
             isWholeLine: false,
             zIndex: 20,
-            className: 'comment-thread-range'
+            className: 'comment-thread-range',
+            shouldFillLineOnLineBreak: true
         };
         this.decorationOptions = ModelDecorationOptions.createDynamic(decorationOptions);
         const activeDecorationOptions = {
             description: CommentThreadRangeDecorator.description,
             isWholeLine: false,
             zIndex: 20,
-            className: 'comment-thread-range-current'
+            className: 'comment-thread-range-current',
+            shouldFillLineOnLineBreak: true
         };
         this.activeDecorationOptions = ModelDecorationOptions.createDynamic(activeDecorationOptions);
         this._register(commentService.onDidChangeCurrentCommentThread(thread => {

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js

@@ -13,6 +13,7 @@ import { textLinkForeground, textLinkActiveForeground, focusBorder, textBlockQuo
 import { PANEL_BORDER } from '../../../common/theme.js';
 import { commentThreadStateColorVar, commentThreadStateBackgroundColorVar } from './commentColors.js';
 import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 let CommentThreadWidget = class CommentThreadWidget extends Disposable {
     get commentThread() {
         return this._commentThread;
@@ -43,6 +44,20 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this._header.updateCommentThread(this._commentThread);
         const bodyElement = dom.$('.body');
         container.appendChild(bodyElement);
+        const tracker = this._register(dom.trackFocus(bodyElement));
+        this._register(registerNavigableContainer({
+            focusNotifiers: [tracker],
+            focusNextWidget: () => {
+                if (!this._commentReply?.isCommentEditorFocused()) {
+                    this._commentReply?.expandReplyAreaAndFocusCommentEditor();
+                }
+            },
+            focusPreviousWidget: () => {
+                if (this._commentReply?.isCommentEditorFocused() && this._commentThread.comments?.length) {
+                    this._body.focus();
+                }
+            }
+        }));
         this._body = this._scopedInstatiationService.createInstance(CommentThreadBody, this._owner, this._parentResourceUri, bodyElement, this._markdownOptions, this._commentThread, this._pendingEdits, this._scopedInstatiationService, this);
         this._register(this._body);
         this._styleElement = dom.createStyleSheet(this.container);

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js

@@ -2,7 +2,6 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Color } from 'monaco-editor/esm/vs/base/common/color.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
 import { ZoneWidget } from 'monaco-editor/esm/vs/editor/contrib/zoneWidget/browser/zoneWidget.js';
@@ -60,7 +59,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         return this._isExpanded;
     }
     constructor(editor, _owner, _commentThread, _pendingComment, _pendingEdits, instantiationService, themeService, commentService, contextKeyService, configurationService) {
-        super(editor, { keepEditorSelection: true });
+        super(editor, { keepEditorSelection: true, isAccessible: true });
         this._owner = _owner;
         this._commentThread = _commentThread;
         this._pendingComment = _pendingComment;
@@ -101,7 +100,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
             return this.position;
         }
         if (this._commentGlyph) {
-            return withNullAsUndefined(this._commentGlyph.getPosition().position);
+            return this._commentGlyph.getPosition().position ?? undefined;
         }
         return undefined;
     }