@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js

@@ -1,29 +1,31 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Dimension } from '../../../../base/browser/dom.js';
+import { addDisposableListener, Dimension } from '../../../../base/browser/dom.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { assertType } from '../../../../base/common/types.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, ACTION_ACCEPT_CHANGES } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_ACCEPT_CHANGES, InlineChatConfigKeys, EditMode } from '../common/inlineChat.js';
 import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { StableEditorBottomScrollState } from '../../../../editor/browser/stableEditorScroll.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget";
 let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
-    constructor(editor, _instaService, contextKeyService, configurationService) {
+    constructor(location, editor, _instaService, contextKeyService, configurationService) {
         super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 10000 });
         this._instaService = _instaService;
         this._ctxCursorPosition = CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.bindTo(contextKeyService);
         this._disposables.add(toDisposable(() => {
             this._ctxCursorPosition.reset();
         }));
-        this.widget = this._instaService.createInstance(EditorBasedInlineChatWidget, this.editor, {
+        this.widget = this._instaService.createInstance(EditorBasedInlineChatWidget, location, this.editor, {
             telemetrySource: 'interactiveEditorWidget-toolbar',
             inputMenuId: MenuId.ChatExecute,
             widgetMenuId: MENU_INLINE_CHAT_WIDGET,
@@ -31,10 +33,10 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
                 menu: MENU_INLINE_CHAT_WIDGET_STATUS,
                 options: {
                     buttonConfigProvider: action => {
-                        if (action.id === ACTION_REGENERATE_RESPONSE || action.id === ACTION_TOGGLE_DIFF) {
-                            return { showIcon: true, showLabel: false, isSecondary: true };
+                        if (( (( (new Set([ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF]))).has(action.id)))) {
+                            return { isSecondary: true, showIcon: true, showLabel: false };
                         }
-                        else if (action.id === ACTION_VIEW_IN_CHAT || action.id === ACTION_ACCEPT_CHANGES) {
+                        else if (action.id === ACTION_ACCEPT_CHANGES) {
                             return { isSecondary: false };
                         }
                         else {
@@ -46,17 +48,22 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
             rendererOptions: {
                 renderTextEditsAsSummary: (uri) => {
                     return isEqual(uri, editor.getModel()?.uri)
-                        && configurationService.getValue("inlineChat.mode" ) === "live" ;
+                        && configurationService.getValue(InlineChatConfigKeys.Mode) === EditMode.Live;
                 },
             }
         });
         this._disposables.add(this.widget.onDidChangeHeight(() => {
             if (this.position) {
-                this._relayout(this._computeHeightInLines());
+                this._relayout(this._computeHeight().linesValue);
             }
         }));
         this._disposables.add(this.widget);
         this.create();
+        this._disposables.add(addDisposableListener(this.domNode, 'click', e => {
+            if (!this.editor.hasWidgetFocus() && !this.widget.hasFocus()) {
+                this.editor.focus();
+            }
+        }, true));
         const updateCursorIsAboveContextKey = () => {
             if (!this.position || !this.editor.hasModel()) {
                 this._ctxCursorPosition.reset();
@@ -79,8 +86,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         container.appendChild(this.widget.domNode);
     }
     _doLayout(heightInPixel) {
-        const maxWidth = !this.widget.showsAnyPreview() ? 640 : Number.MAX_SAFE_INTEGER;
-        const width = Math.min(maxWidth, this._availableSpaceGivenIndentation(this._indentationWidth));
+        const width = Math.min(640, this._availableSpaceGivenIndentation(this._indentationWidth));
         this._dimension = ( (new Dimension(width, heightInPixel)));
         this.widget.layout(this._dimension);
     }
@@ -88,12 +94,12 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         const info = this.editor.getLayoutInfo();
         return info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth + (indentationWidth ?? 0));
     }
-    _computeHeightInLines() {
+    _computeHeight() {
         const chatContentHeight = this.widget.contentHeight;
         const editorHeight = this.editor.getLayoutInfo().height;
         const contentHeight = Math.min(chatContentHeight, Math.max(this.widget.minHeight, editorHeight * 0.42));
-        const heightInLines = contentHeight / this.editor.getOption(67 );
-        return heightInLines;
+        const heightInLines = contentHeight / this.editor.getOption(EditorOption.lineHeight);
+        return { linesValue: heightInLines, pixelsValue: contentHeight };
     }
     _onWidth(_widthInPixel) {
         if (this._dimension) {
@@ -106,14 +112,28 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         const info = this.editor.getLayoutInfo();
         const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
         this.container.style.marginLeft = `${marginWithoutIndentation}px`;
-        super.show(position, this._computeHeightInLines());
+        const height = this._computeHeight();
+        super.show(position, height.linesValue);
         this._setWidgetMargins(position);
+        this.widget.chatWidget.setVisible(true);
         this.widget.focus();
         scrollState.restore(this.editor);
-        this.editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(position.delta(-1)), 1 );
+        if (position.lineNumber > 1) {
+            this.editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(position.delta(-1)), ScrollType.Immediate);
+        }
+        else {
+            const lineTop = this.editor.getTopForLineNumber(position.lineNumber);
+            const zoneTop = lineTop - height.pixelsValue;
+            const spaceBelowLine = this.editor.getScrollHeight() - this.editor.getBottomForLineNumber(position.lineNumber);
+            const minTop = this.editor.getScrollTop() - spaceBelowLine;
+            const newTop = Math.max(zoneTop, minTop);
+            if (newTop < this.editor.getScrollTop()) {
+                this.editor.setScrollTop(newTop, ScrollType.Immediate);
+            }
+        }
     }
     updatePositionAndHeight(position) {
-        super.updatePositionAndHeight(position, this._computeHeightInLines());
+        super.updatePositionAndHeight(position, this._computeHeight().linesValue);
         this._setWidgetMargins(position);
     }
     _getWidth(info) {
@@ -158,13 +178,14 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this.container.classList.remove('inside-selection');
         this._ctxCursorPosition.reset();
         this.widget.reset();
+        this.widget.chatWidget.setVisible(false);
         super.hide();
         status(( localizeWithPath(_moduleId, 0, 'Closed inline chat widget')));
     }
 };
 InlineChatZoneWidget = ( (__decorate([
-    ( (__param(1, IInstantiationService))),
-    ( (__param(2, IContextKeyService))),
-    ( (__param(3, IConfigurationService)))
+    ( (__param(2, IInstantiationService))),
+    ( (__param(3, IContextKeyService))),
+    ( (__param(4, IConfigurationService)))
 ], InlineChatZoneWidget)));
 export { InlineChatZoneWidget };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .zone-widget.inline-chat-widget{z-index:3}.monaco-workbench .zone-widget.inline-chat-widget .interactive-session{max-width:unset}.monaco-workbench .zone-widget-container.inside-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:6px;box-shadow:0 -1px 6px var(--vscode-inlineChat-shadow);color:inherit;margin-top:8px;padding:6px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-and-execute-toolbar{width:100%}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact{padding:4px}.monaco-workbench .inline-chat .progress{position:relative}.monaco-workbench .part.editor>.content .inline-chat .progress .monaco-progress-container{top:0}.monaco-workbench .inline-chat .status{align-items:center;display:flex;justify-content:space-between}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:inline-flex;font-size:11px;overflow:hidden;padding-left:10px;padding-top:4px}.monaco-workbench .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .inline-chat .status .label.status{margin-left:auto}.monaco-workbench .inline-chat .status .label.hidden{display:none}.monaco-workbench .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .inline-chat .status .label>.codicon{font-size:12px;line-height:18px;padding:0 5px}.monaco-workbench .inline-chat .chatMessage .chatMessageContent .value{overflow:hidden;-webkit-user-select:text;user-select:text}.monaco-workbench .inline-chat .followUps{padding:5px}.monaco-workbench .inline-chat .followUps .interactive-session-followups .monaco-button{color:var(--vscode-textLink-foreground);display:block;font-size:12px}.monaco-workbench .inline-chat .followUps.hidden{display:none}.monaco-workbench .inline-chat .chatMessage{padding:0 3px}.monaco-workbench .inline-chat .chatMessage .chatMessageContent{padding:2px}.monaco-workbench .inline-chat .chatMessage.hidden{display:none}.monaco-workbench .inline-chat .status .actions{display:flex;padding-top:4px}.monaco-workbench .inline-chat .status .actions>.monaco-button,.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown{margin-right:6px}.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon{display:flex}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon:before{align-self:center}.monaco-workbench .inline-chat .status .actions .monaco-text-button{padding:2px 4px;white-space:nowrap}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item{padding:0 2px}.monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .inline-chat .preview{display:none}.monaco-workbench .inline-chat .previewCreate,.monaco-workbench .inline-chat .previewDiff{border:1px solid var(--vscode-inlineChat-border);border-radius:2px;display:inherit;margin:6px 0}.monaco-workbench .inline-chat .previewCreateTitle{padding-top:6px}.monaco-workbench .inline-chat .diff-review.hidden,.monaco-workbench .inline-chat .previewCreate.hidden,.monaco-workbench .inline-chat .previewCreateTitle.hidden,.monaco-workbench .inline-chat .previewDiff.hidden{display:none}.monaco-workbench .inline-chat-toolbar{display:flex}.monaco-workbench .inline-chat-toolbar>.monaco-button{margin-right:6px}.monaco-workbench .inline-chat-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-workbench .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-workbench .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .inline-chat-block-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .interactive-session .interactive-input-and-execute-toolbar .monaco-editor .inline-chat-slash-command{background-color:var(--vscode-chat-slashCommandBackground);border-radius:4px;color:var(--vscode-chat-slashCommandForeground);padding:1px}.monaco-workbench .inline-chat-slash-command-detail{opacity:.5}.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-editor-background,.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-workbench .margin-view-overlays,.monaco-workbench .inline-chat-newfile-widget{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .inline-chat-newfile-widget .title{align-items:center;display:flex;justify-content:space-between}.monaco-workbench .inline-chat-newfile-widget .title .detail{margin-left:4px}.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget{display:flex;margin-left:auto;margin-right:8px}.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget>.monaco-button{display:inline-flex;margin-left:4px;white-space:nowrap}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
+var css = ".monaco-workbench .zone-widget.inline-chat-widget{z-index:3}.monaco-workbench .zone-widget.inline-chat-widget .interactive-session{max-width:unset}.monaco-workbench .zone-widget-container.inside-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:4px;box-shadow:0 2px 4px 0 var(--vscode-widget-shadow);color:inherit;margin-top:8px;padding:0 8px 8px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-and-execute-toolbar{border-radius:2px;width:100%}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list{padding:4px 0 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact{gap:6px;padding:6px 4px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .header .avatar{outline-offset:-1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request{border:none}.monaco-workbench .inline-chat .progress{position:relative}.monaco-workbench .part.editor>.content .inline-chat .progress .monaco-progress-container{top:0}.monaco-workbench .inline-chat .status{align-items:center;display:flex;justify-content:space-between;margin-top:3px}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:inline-flex;font-size:12px;overflow:hidden}.monaco-workbench .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .inline-chat .status .label.status{margin-left:auto}.monaco-workbench .inline-chat .status .label.hidden{display:none}.monaco-workbench .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .inline-chat .status .label>.codicon{font-size:12px;line-height:18px;padding:0 5px}.monaco-workbench .inline-chat .chatMessage .chatMessageContent .value{overflow:hidden;-webkit-user-select:text;user-select:text}.monaco-workbench .inline-chat .followUps{padding:5px}.monaco-workbench .inline-chat .followUps .interactive-session-followups .monaco-button{color:var(--vscode-textLink-foreground);display:block;font-size:12px}.monaco-workbench .inline-chat .followUps.hidden{display:none}.monaco-workbench .inline-chat .chatMessage{padding:0 3px}.monaco-workbench .inline-chat .chatMessage .chatMessageContent{padding:2px}.monaco-workbench .inline-chat .chatMessage.hidden{display:none}.monaco-workbench .inline-chat .status .actions{display:flex;padding-top:3px}.monaco-workbench .inline-chat .status .actions>.monaco-button,.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown{margin-right:6px}.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon{display:flex}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon:before{align-self:center}.monaco-workbench .inline-chat .status .actions .monaco-text-button{padding:2px 4px;white-space:nowrap}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item{padding:0 2px}.monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .inline-chat .preview{display:none}.monaco-workbench .inline-chat .previewCreate,.monaco-workbench .inline-chat .previewDiff{border:1px solid var(--vscode-inlineChat-border);border-radius:2px;display:inherit;margin:6px 0}.monaco-workbench .inline-chat .previewCreateTitle{padding-top:6px}.monaco-workbench .inline-chat .diff-review.hidden,.monaco-workbench .inline-chat .previewCreate.hidden,.monaco-workbench .inline-chat .previewCreateTitle.hidden,.monaco-workbench .inline-chat .previewDiff.hidden{display:none}.monaco-workbench .inline-chat-toolbar{display:flex}.monaco-workbench .inline-chat-toolbar>.monaco-button{margin-right:6px}.monaco-workbench .inline-chat-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-workbench .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-workbench .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .inline-chat-block-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .interactive-session .interactive-input-and-execute-toolbar .monaco-editor .inline-chat-slash-command{background-color:var(--vscode-chat-slashCommandBackground);border-radius:2px;color:var(--vscode-chat-slashCommandForeground);padding:1px}.monaco-workbench .inline-chat-slash-command-detail{opacity:.5}.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-editor-background,.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-workbench .margin-view-overlays,.monaco-workbench .inline-chat-newfile-widget{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .inline-chat-newfile-widget .title{align-items:center;display:flex;justify-content:space-between}.monaco-workbench .inline-chat-newfile-widget .title .detail{margin-left:4px}.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget{display:flex;margin-left:auto;margin-right:8px}.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget>.monaco-button{display:inline-flex;margin-left:4px;white-space:nowrap}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/utils.js

@@ -1,4 +1,5 @@
 import { EditOperation } from '../../../../editor/common/core/editOperation.js';
+import { TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { AsyncIterableSource } from '../../../../base/common/async.js';
 import { getNWords } from '../../chat/common/chatWordCounter.js';
 async function performAsyncTextEdit(model, edit, progress, obs) {
@@ -6,7 +7,7 @@ async function performAsyncTextEdit(model, edit, progress, obs) {
             range: edit.range,
             options: {
                 description: 'asyncTextEdit',
-                stickiness: 0
+                stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
             }
         }]);
     let first = true;
@@ -37,6 +38,9 @@ function asProgressiveEdit(interval, edit, wordsPerSec, token) {
     const stream = ( new AsyncIterableSource());
     let newText = edit.text ?? '';
     interval.cancelAndSet(() => {
+        if (token.isCancellationRequested) {
+            return;
+        }
         const r = getNWords(newText, 1);
         stream.emitOne(r.value);
         newText = newText.substring(r.value.length);

package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js

@@ -16,9 +16,20 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { Extensions } from '../../../common/configuration.js';
 const _moduleId = "vs/workbench/contrib/inlineChat/common/inlineChat";
+var InlineChatResponseTypes;
+( ((function(InlineChatResponseTypes) {
+    InlineChatResponseTypes["Empty"] = "empty";
+    InlineChatResponseTypes["OnlyEdits"] = "onlyEdits";
+    InlineChatResponseTypes["OnlyMessages"] = "onlyMessages";
+    InlineChatResponseTypes["Mixed"] = "mixed";
+})(InlineChatResponseTypes || (InlineChatResponseTypes = {}))));
 const INLINE_CHAT_ID = 'interactiveEditor';
-const INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID = 'interactiveEditorAccessiblityHelp';
-const CTX_INLINE_CHAT_HAS_PROVIDER = ( (new RawContextKey('inlineChatHasProvider', false, ( localizeWithPath(_moduleId, 0, "Whether a provider for interactive editors exists")))));
+var EditMode;
+( ((function(EditMode) {
+    EditMode["Live"] = "live";
+    EditMode["Preview"] = "preview";
+})(EditMode || (EditMode = {}))));
+const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localizeWithPath(_moduleId, 0, "Whether a provider for interactive editors exists")))));
 const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localizeWithPath(_moduleId, 1, "Whether the interactive editor input is visible")))));
 const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localizeWithPath(_moduleId, 2, "Whether the interactive editor input is focused")))));
 const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localizeWithPath(_moduleId, 3, "Whether the interactive widget's response is focused")))));
@@ -40,73 +51,60 @@ const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOu
 )))));
 const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localizeWithPath(
     _moduleId,
-    11,
+    10,
     "Whether interactive editor has kept a session for quick restore"
 )))));
-const CTX_INLINE_CHAT_LAST_RESPONSE_TYPE = ( (new RawContextKey('inlineChatLastResponseType', undefined, ( localizeWithPath(
-    _moduleId,
-    12,
-    "What type was the last response of the current interactive editor session"
-)))));
-const CTX_INLINE_CHAT_RESPONSE_TYPES = ( (new RawContextKey(
-    'inlineChatResponseTypes',
-    "empty" ,
-    ( localizeWithPath(_moduleId, 13, "What type was the responses have been receieved"))
-)));
-const CTX_INLINE_CHAT_DID_EDIT = ( (new RawContextKey('inlineChatDidEdit', undefined, ( localizeWithPath(_moduleId, 14, "Whether interactive editor did change any code")))));
-const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localizeWithPath(_moduleId, 15, "Whether the user did changes ontop of the inline chat")))));
-const CTX_INLINE_CHAT_LAST_FEEDBACK = ( (new RawContextKey('inlineChatLastFeedbackKind', '', ( localizeWithPath(_moduleId, 16, "The last kind of feedback that was provided")))));
-const CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING = ( (new RawContextKey('inlineChatSupportIssueReporting', false, ( localizeWithPath(_moduleId, 17, "Whether the interactive editor supports issue reporting")))));
-const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localizeWithPath(_moduleId, 18, "Whether the document has changed concurrently")))));
-const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localizeWithPath(_moduleId, 19, "Whether the current change supports showing a diff")))));
-const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localizeWithPath(_moduleId, 20, "Whether the current change showing a diff")))));
-const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', "live" )));
+const CTX_INLINE_CHAT_RESPONSE_TYPES = ( (new RawContextKey('inlineChatResponseTypes', InlineChatResponseTypes.Empty, ( localizeWithPath(_moduleId, 11, "What type was the responses have been receieved")))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localizeWithPath(_moduleId, 12, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localizeWithPath(_moduleId, 13, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localizeWithPath(_moduleId, 14, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localizeWithPath(_moduleId, 15, "Whether the current change showing a diff")))));
+const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', EditMode.Live)));
 const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
 const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
 const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
 const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
 const MENU_INLINE_CHAT_WIDGET = MenuId.for('inlineChatWidget');
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
-const MENU_INLINE_CHAT_WIDGET_DISCARD = MenuId.for('inlineChatWidget.undo');
-const inlineChatBackground = registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localizeWithPath(_moduleId, 21, "Background color of the interactive editor widget")));
-registerColor('inlineChat.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 22, "Border color of the interactive editor widget")));
-registerColor('inlineChat.shadow', { dark: widgetShadow, light: widgetShadow, hcDark: widgetShadow, hcLight: widgetShadow }, ( localizeWithPath(_moduleId, 23, "Shadow color of the interactive editor widget")));
+const inlineChatBackground = registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localizeWithPath(_moduleId, 16, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 17, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', { dark: widgetShadow, light: widgetShadow, hcDark: widgetShadow, hcLight: widgetShadow }, ( localizeWithPath(_moduleId, 18, "Shadow color of the interactive editor widget")));
 registerColor('inlineChat.regionHighlight', { dark: editorHoverHighlight, light: editorHoverHighlight, hcDark: editorHoverHighlight, hcLight: editorHoverHighlight }, ( localizeWithPath(
     _moduleId,
-    24,
+    19,
     "Background highlighting of the current interactive region. Must be transparent."
 )), true);
-registerColor('inlineChatInput.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 25, "Border color of the interactive editor input")));
-registerColor('inlineChatInput.focusBorder', { dark: focusBorder, light: focusBorder, hcDark: focusBorder, hcLight: focusBorder }, ( localizeWithPath(_moduleId, 26, "Border color of the interactive editor input when focused")));
+registerColor('inlineChatInput.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 20, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', { dark: focusBorder, light: focusBorder, hcDark: focusBorder, hcLight: focusBorder }, ( localizeWithPath(_moduleId, 21, "Border color of the interactive editor input when focused")));
 registerColor('inlineChatInput.placeholderForeground', { dark: inputPlaceholderForeground, light: inputPlaceholderForeground, hcDark: inputPlaceholderForeground, hcLight: inputPlaceholderForeground }, ( localizeWithPath(
     _moduleId,
-    27,
+    22,
     "Foreground color of the interactive editor input placeholder"
 )));
-registerColor('inlineChatInput.background', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, ( localizeWithPath(_moduleId, 28, "Background color of the interactive editor input")));
+registerColor('inlineChatInput.background', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, ( localizeWithPath(_moduleId, 23, "Background color of the interactive editor input")));
 registerColor('inlineChatDiff.inserted', { dark: ( (transparent(diffInserted, .5))), light: ( (transparent(diffInserted, .5))), hcDark: ( (transparent(diffInserted, .5))), hcLight: ( (transparent(diffInserted, .5))) }, ( localizeWithPath(
     _moduleId,
-    29,
+    24,
     "Background color of inserted text in the interactive editor input"
 )));
 const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localizeWithPath(
     _moduleId,
-    30,
+    25,
     'Overview ruler marker color for inline chat inserted content.'
 )));
 const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localizeWithPath(
     _moduleId,
-    30,
+    25,
     'Overview ruler marker color for inline chat inserted content.'
 )));
 registerColor('inlineChatDiff.removed', { dark: ( (transparent(diffRemoved, .5))), light: ( (transparent(diffRemoved, .5))), hcDark: ( (transparent(diffRemoved, .5))), hcLight: ( (transparent(diffRemoved, .5))) }, ( localizeWithPath(
     _moduleId,
-    31,
+    26,
     "Background color of removed text in the interactive editor input"
 )));
 registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(diffRemoved, 0.6))), light: ( (transparent(diffRemoved, 0.8))), hcDark: ( (transparent(diffRemoved, 0.6))), hcLight: ( (transparent(diffRemoved, 0.8))) }, ( localizeWithPath(
     _moduleId,
-    32,
+    27,
     'Overview ruler marker color for inline chat removed content.'
 )));
 ( (Registry.as(Extensions.ConfigurationMigration))).registerConfigurationMigrations([{
@@ -114,59 +112,67 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(di
             return [['inlineChat.mode', { value: value }]];
         }
     }]);
+var InlineChatConfigKeys;
+( ((function(InlineChatConfigKeys) {
+    InlineChatConfigKeys["Mode"] = "inlineChat.mode";
+    InlineChatConfigKeys["FinishOnType"] = "inlineChat.finishOnType";
+    InlineChatConfigKeys["AcceptedOrDiscardBeforeSave"] = "inlineChat.acceptedOrDiscardBeforeSave";
+    InlineChatConfigKeys["HoldToSpeech"] = "inlineChat.holdToSpeech";
+    InlineChatConfigKeys["AccessibleDiffView"] = "inlineChat.accessibleDiffView";
+})(InlineChatConfigKeys || (InlineChatConfigKeys = {}))));
 ( (Registry.as(Extensions$1.Configuration))).registerConfiguration({
     id: 'editor',
     properties: {
-        ["inlineChat.mode" ]: {
+        [InlineChatConfigKeys.Mode]: {
             description: ( localizeWithPath(
                 _moduleId,
-                33,
+                28,
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
-            default: "live" ,
+            default: EditMode.Live,
             type: 'string',
-            enum: ["live" , "preview" ],
+            enum: [EditMode.Live, EditMode.Preview],
             markdownEnumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    34,
+                    29,
                     "Changes are applied directly to the document, can be highlighted via inline diffs, and accepted/discarded by hunks. Ending a session will keep the changes."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    35,
+                    30,
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
             ],
             tags: ['experimental']
         },
-        ["inlineChat.finishOnType" ]: {
+        [InlineChatConfigKeys.FinishOnType]: {
             description: ( localizeWithPath(
                 _moduleId,
-                36,
+                31,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
-        ["inlineChat.acceptedOrDiscardBeforeSave" ]: {
-            description: ( localizeWithPath(_moduleId, 37, "Whether pending inline chat sessions prevent saving.")),
+        [InlineChatConfigKeys.AcceptedOrDiscardBeforeSave]: {
+            description: ( localizeWithPath(_moduleId, 32, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
-        ["inlineChat.holdToSpeech" ]: {
+        [InlineChatConfigKeys.HoldToSpeech]: {
             description: ( localizeWithPath(
                 _moduleId,
-                38,
+                33,
                 "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
             default: true,
             type: 'boolean'
         },
-        ["inlineChat.accessibleDiffView" ]: {
+        [InlineChatConfigKeys.AccessibleDiffView]: {
             description: ( localizeWithPath(
                 _moduleId,
-                39,
+                34,
                 "Whether the inline chat also renders an accessible diff viewer for its changes."
             )),
             default: 'auto',
@@ -175,13 +181,13 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(di
             markdownEnumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    40,
+                    35,
                     "The accessible diff viewer is based screen reader mode being enabled."
                 )),
-                ( localizeWithPath(_moduleId, 41, "The accessible diff viewer is always enabled.")),
-                ( localizeWithPath(_moduleId, 42, "The accessible diff viewer is never enabled.")),
+                ( localizeWithPath(_moduleId, 36, "The accessible diff viewer is always enabled.")),
+                ( localizeWithPath(_moduleId, 37, "The accessible diff viewer is never enabled.")),
             ],
         }
     }
 });
-export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_DISCARD, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };
+export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseTypes, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js

@@ -7,6 +7,7 @@ import { ITextModelService } from '../../../../editor/common/services/resolverSe
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditorInputCapabilities } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IInteractiveDocumentService } from './interactiveDocumentService.service.js';
 import { IInteractiveHistoryService } from './interactiveHistoryService.service.js';
@@ -82,9 +83,9 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
         this._register(this.primary.onDidChangeCapabilities(() => this._onDidChangeCapabilities.fire()));
     }
     get capabilities() {
-        const scratchPad = this.isScratchpad ? 512  : 0;
-        return 4
-            | 2
+        const scratchPad = this.isScratchpad ? EditorInputCapabilities.Scratchpad : 0;
+        return EditorInputCapabilities.Untitled
+            | EditorInputCapabilities.Readonly
             | scratchPad;
     }
     async _resolveEditorModel() {
@@ -114,7 +115,7 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
     }
     async save(group, options) {
         if (this._editorModelReference) {
-            if (this.hasCapability(4 )) {
+            if (this.hasCapability(EditorInputCapabilities.Untitled)) {
                 return this.saveAs(group, options);
             }
             else {

package/vscode/src/vs/workbench/contrib/list/browser/list.contribution.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 let ListContext = class ListContext {
     static { this.ID = 'workbench.contrib.listContext'; }
     constructor(contextKeyService) {
@@ -11,5 +11,5 @@ let ListContext = class ListContext {
 ListContext = ( __decorate([
     ( __param(0, IContextKeyService))
 ], ListContext));
-registerWorkbenchContribution2(ListContext.ID, ListContext, 1 );
+registerWorkbenchContribution2(ListContext.ID, ListContext, WorkbenchPhase.BlockStartup);
 export { ListContext };

package/vscode/src/vs/workbench/contrib/markers/common/markers.js

@@ -1,4 +1,9 @@
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+var MarkersViewMode;
+( (function(MarkersViewMode) {
+    MarkersViewMode["Table"] = "table";
+    MarkersViewMode["Tree"] = "tree";
+})(MarkersViewMode || (MarkersViewMode = {})));
 var Markers;
 ( (function(Markers) {
     Markers.MARKERS_CONTAINER_ID = 'workbench.panel.markers';
@@ -20,7 +25,7 @@ var Markers;
 })(Markers || (Markers = {})));
 var MarkersContextKeys;
 ( (function(MarkersContextKeys) {
-    MarkersContextKeys.MarkersViewModeContextKey = ( new RawContextKey('problemsViewMode', "tree" ));
+    MarkersContextKeys.MarkersViewModeContextKey = ( new RawContextKey('problemsViewMode', MarkersViewMode.Tree));
     MarkersContextKeys.MarkersTreeVisibilityContextKey = ( new RawContextKey('problemsVisibility', false));
     MarkersContextKeys.MarkerFocusContextKey = ( new RawContextKey('problemFocus', false));
     MarkersContextKeys.MarkerViewFilterFocusContextKey = ( new RawContextKey('problemsFilterFocus', false));
@@ -31,4 +36,4 @@ var MarkersContextKeys;
     MarkersContextKeys.ShowActiveFileFilterContextKey = ( new RawContextKey('problems.filter.activeFile', false));
     MarkersContextKeys.ShowExcludedFilesFilterContextKey = ( new RawContextKey('problems.filter.excludedFiles', true));
 })(MarkersContextKeys || (MarkersContextKeys = {})));
-export { Markers, MarkersContextKeys };
+export { Markers, MarkersContextKeys, MarkersViewMode };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -13,7 +13,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
-import { DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput } from '../../../common/editor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput, EditorInputCapabilities } from '../../../common/editor.js';
 import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.service.js';
 import { AbstractTextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
 import { TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory } from './mergeEditorInputModel.js';
@@ -67,9 +67,9 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return DEFAULT_EDITOR_ASSOCIATION.id;
     }
     get capabilities() {
-        let capabilities = super.capabilities | 256 ;
+        let capabilities = super.capabilities | EditorInputCapabilities.MultipleEditors;
         if (this.useWorkingCopy) {
-            capabilities |= 4 ;
+            capabilities |= EditorInputCapabilities.Untitled;
         }
         return capabilities;
     }

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -14,8 +14,10 @@ import Severity$1 from '../../../../base/common/severity.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { ConfirmResult } from '../../../../platform/dialogs/common/dialogs.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { SaveSourceRegistry } from '../../../common/editor.js';
 import { EditorModel } from '../../../common/editor/editorModel.js';
@@ -124,11 +126,11 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                     label: hasUnhandledConflicts ?
                         ( localizeWithPath(_moduleId, 2, "&&Save With Conflicts")) :
                         ( localizeWithPath(_moduleId, 3, "&&Save")),
-                    run: () => 0
+                    run: () => ConfirmResult.SAVE
                 },
                 {
                     label: ( localizeWithPath(_moduleId, 4, "Do&&n't Save")),
-                    run: () => 1
+                    run: () => ConfirmResult.DONT_SAVE
                 }
             ];
             choice = (await this.dialogService.prompt({
@@ -151,17 +153,17 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                         : ( localizeWithPath(_moduleId, 8, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
-                    run: () => 2
+                    run: () => ConfirmResult.CANCEL
                 }
             })).result;
         }
         else {
-            choice = 1 ;
+            choice = ConfirmResult.DONT_SAVE;
         }
-        if (choice === 0 ) {
+        if (choice === ConfirmResult.SAVE) {
             await Promise.all(( (inputModels.map(m => m.accept()))));
         }
-        else if (choice === 1 ) {
+        else if (choice === ConfirmResult.DONT_SAVE) {
             await Promise.all(( (inputModels.map(m => m._discard()))));
         }
         else ;
@@ -348,20 +350,20 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                         label: someUnhandledConflicts
                             ? ( localizeWithPath(_moduleId, 19, '&&Save with Conflicts'))
                             : ( localizeWithPath(_moduleId, 20, '&&Save')),
-                        run: () => 0
+                        run: () => ConfirmResult.SAVE
                     },
                     {
                         label: ( localizeWithPath(_moduleId, 21, "Do&&n't Save")),
-                        run: () => 1
+                        run: () => ConfirmResult.DONT_SAVE
                     }
                 ],
                 cancelButton: {
-                    run: () => 2
+                    run: () => ConfirmResult.CANCEL
                 }
             });
             return result;
         }
-        else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, 0 , false)) {
+        else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, StorageScope.PROFILE, false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
                     ? ( localizeWithPath(
@@ -387,12 +389,12 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 checkbox: { label: ( localizeWithPath(_moduleId, 28, "Do not ask me again")) }
             });
             if (checkboxChecked) {
-                this._storageService.store(StorageCloseWithConflicts, true, 0 , 0 );
+                this._storageService.store(StorageCloseWithConflicts, true, StorageScope.PROFILE, StorageTarget.USER);
             }
-            return confirmed ? 0  : 2 ;
+            return confirmed ? ConfirmResult.SAVE : ConfirmResult.CANCEL;
         }
         else {
-            return 0 ;
+            return ConfirmResult.SAVE;
         }
     }
 };