@codingame/monaco-vscode-api 3.2.3 → 4.0.0

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

@@ -0,0 +1,165 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.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 { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_FEEDBACK, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, ACTION_ACCEPT_CHANGES } from '../common/inlineChat.js';
+import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
+    constructor(editor, _instaService, contextKeyService) {
+        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, {
+            telemetrySource: 'interactiveEditorWidget-toolbar',
+            inputMenuId: MenuId.ChatExecute,
+            widgetMenuId: MENU_INLINE_CHAT_WIDGET,
+            feedbackMenuId: MENU_INLINE_CHAT_WIDGET_FEEDBACK,
+            statusMenuId: {
+                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 };
+                        }
+                        else if (action.id === ACTION_VIEW_IN_CHAT || action.id === ACTION_ACCEPT_CHANGES) {
+                            return { isSecondary: false };
+                        }
+                        else {
+                            return { isSecondary: true };
+                        }
+                    }
+                }
+            }
+        });
+        this._disposables.add(this.widget.onDidChangeHeight(() => {
+            if (this.position) {
+                this._relayout(this._computeHeightInLines());
+            }
+        }));
+        this._disposables.add(this.widget);
+        this.create();
+        this._disposables.add(addDisposableListener(this.domNode, 'click', e => {
+            if (!this.widget.hasFocus()) {
+                this.widget.focus();
+            }
+        }, true));
+        const updateCursorIsAboveContextKey = () => {
+            if (!this.position || !this.editor.hasModel()) {
+                this._ctxCursorPosition.reset();
+            }
+            else if (this.position.lineNumber === this.editor.getPosition().lineNumber) {
+                this._ctxCursorPosition.set('above');
+            }
+            else if (this.position.lineNumber + 1 === this.editor.getPosition().lineNumber) {
+                this._ctxCursorPosition.set('below');
+            }
+            else {
+                this._ctxCursorPosition.reset();
+            }
+        };
+        this._disposables.add(this.editor.onDidChangeCursorPosition(e => updateCursorIsAboveContextKey()));
+        this._disposables.add(this.editor.onDidFocusEditorText(e => updateCursorIsAboveContextKey()));
+        updateCursorIsAboveContextKey();
+    }
+    _fillContainer(container) {
+        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));
+        this._dimension = ( new Dimension(width, heightInPixel));
+        this.widget.layout(this._dimension);
+    }
+    _availableSpaceGivenIndentation(indentationWidth) {
+        const info = this.editor.getLayoutInfo();
+        return info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth + (indentationWidth ?? 0));
+    }
+    _computeHeightInLines() {
+        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;
+    }
+    _onWidth(_widthInPixel) {
+        if (this._dimension) {
+            this._doLayout(this._dimension.height);
+        }
+    }
+    show(position) {
+        assertType(this.container);
+        const info = this.editor.getLayoutInfo();
+        const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
+        this.container.style.marginLeft = `${marginWithoutIndentation}px`;
+        super.show(position, this._computeHeightInLines());
+        this._setWidgetMargins(position);
+        this.widget.focus();
+    }
+    updatePositionAndHeight(position) {
+        super.updatePositionAndHeight(position, this._computeHeightInLines());
+        this._setWidgetMargins(position);
+    }
+    _getWidth(info) {
+        return info.width - info.minimap.minimapWidth;
+    }
+    updateBackgroundColor(newPosition, wholeRange) {
+        assertType(this.container);
+        const widgetLineNumber = newPosition.lineNumber;
+        this.container.classList.toggle('inside-selection', widgetLineNumber > wholeRange.startLineNumber && widgetLineNumber < wholeRange.endLineNumber);
+    }
+    _calculateIndentationWidth(position) {
+        const viewModel = this.editor._getViewModel();
+        if (!viewModel) {
+            return 0;
+        }
+        const visibleRange = viewModel.getCompletelyVisibleViewRange();
+        if (!visibleRange.containsPosition(position)) {
+            return 0;
+        }
+        let indentationLevel = viewModel.getLineFirstNonWhitespaceColumn(position.lineNumber);
+        let indentationLineNumber = position.lineNumber;
+        for (let lineNumber = position.lineNumber; lineNumber >= visibleRange.startLineNumber; lineNumber--) {
+            const currentIndentationLevel = viewModel.getLineFirstNonWhitespaceColumn(lineNumber);
+            if (currentIndentationLevel !== 0) {
+                indentationLineNumber = lineNumber;
+                indentationLevel = currentIndentationLevel;
+                break;
+            }
+        }
+        return Math.max(0, this.editor.getOffsetForColumn(indentationLineNumber, indentationLevel));
+    }
+    _setWidgetMargins(position) {
+        const indentationWidth = this._calculateIndentationWidth(position);
+        if (this._indentationWidth === indentationWidth) {
+            return;
+        }
+        this._indentationWidth = this._availableSpaceGivenIndentation(indentationWidth) > 400 ? indentationWidth : 0;
+        this.widget.domNode.style.marginLeft = `${this._indentationWidth}px`;
+        this.widget.domNode.style.marginRight = `${this.editor.getLayoutInfo().minimap.minimapWidth}px`;
+    }
+    hide() {
+        this.container.classList.remove('inside-selection');
+        this._ctxCursorPosition.reset();
+        this.widget.reset();
+        super.hide();
+        status(( localizeWithPath(
+            'vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget',
+            'inlineChatClosed',
+            'Closed inline chat widget'
+        )));
+    }
+};
+InlineChatZoneWidget = ( __decorate([
+    ( __param(1, IInstantiationService)),
+    ( __param(2, IContextKeyService))
+], InlineChatZoneWidget));
+export { InlineChatZoneWidget };

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

@@ -0,0 +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 4px 8px var(--vscode-inlineChat-shadow);color:inherit;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}";
+n(css,{});
+export { css, css as default };

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

@@ -0,0 +1,4 @@
+import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+var css = ".monaco-workbench .inline-chat-content-widget{background-color:var(--vscode-inlineChat-background);border-radius:4px;box-shadow:0 4px 8px var(--vscode-inlineChat-shadow);padding:6px 6px 2px;z-index:50}.monaco-workbench .inline-chat-content-widget .hidden{display:none}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-session{max-width:unset}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part.compact{padding:0}.monaco-workbench .inline-chat-content-widget .message{color:var(--vscode-descriptionForeground);display:inline-flex;font-size:11px;overflow:hidden}.monaco-workbench .inline-chat-content-widget .message>.codicon{font-size:12px;line-height:18px;padding-right:5px}";
+n(css,{});
+export { css, css as default };

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

@@ -61,7 +61,7 @@ async function performAsyncTextEdit(model, edit, progress, obs) {
     }
 }
 function asProgressiveEdit(interval, edit, wordsPerSec, token) {
-    wordsPerSec = Math.max(10, wordsPerSec);
+    wordsPerSec = Math.max(30, wordsPerSec);
     const stream = ( new AsyncIterableSource());
     let newText = edit.text ?? '';
     interval.cancelAndSet(() => {

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

@@ -4,7 +4,17 @@ import { Extensions as Extensions$1 } from '../../../../platform/configuration/c
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { registerColor, editorWidgetBackground, editorWidgetBorder, widgetShadow, editorHoverHighlight, focusBorder, inputPlaceholderForeground, inputBackground, transparent, diffInserted, diffRemoved } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
+import { focusBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorWidgetBackground, editorWidgetBorder, widgetShadow, editorHoverHighlight, diffInserted, diffRemoved } from '../../../../platform/theme/common/colors/editorColors.js';
+import { inputPlaceholderForeground, inputBackground } from '../../../../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';
 import { Extensions } from '../../../common/configuration.js';
 const IInlineChatService = ( createDecorator('IInlineChatService'));
 const INLINE_CHAT_ID = 'interactiveEditor';
@@ -44,31 +54,11 @@ const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( new RawContextKey('inlineChatInnerCu
     'inlineChatInnerCursorLast',
     "Whether the cursor of the iteractive editor input is on the last line"
 ))));
-const CTX_INLINE_CHAT_INNER_CURSOR_START = ( new RawContextKey('inlineChatInnerCursorStart', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatInnerCursorStart',
-    "Whether the cursor of the iteractive editor input is on the start of the input"
-))));
-const CTX_INLINE_CHAT_INNER_CURSOR_END = ( new RawContextKey('inlineChatInnerCursorEnd', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatInnerCursorEnd',
-    "Whether the cursor of the iteractive editor input is on the end of the input"
-))));
-const CTX_INLINE_CHAT_MESSAGE_CROP_STATE = ( new RawContextKey('inlineChatMarkdownMessageCropState', 'not_cropped', ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatMarkdownMessageCropState',
-    "Whether the interactive editor message is cropped, not cropped or expanded"
-))));
 const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( new RawContextKey('inlineChatOuterCursorPosition', '', ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/common/inlineChat',
     'inlineChatOuterCursorPosition',
     "Whether the cursor of the outer editor is above or below the interactive editor input"
 ))));
-const CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST = ( new RawContextKey('inlineChatHasActiveRequest', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatHasActiveRequest',
-    "Whether interactive editor has an active request"
-))));
 const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( new RawContextKey('inlineChatHasStashedSession', false, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/common/inlineChat',
     'inlineChatHasStashedSession',
@@ -127,13 +117,12 @@ const CTX_INLINE_CHAT_EDIT_MODE = ( new RawContextKey('config.inlineChat.mode',
 const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
 const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
 const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
-const MENU_INLINE_CHAT_INPUT = MenuId.for('inlineChatInput');
+const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
 const MENU_INLINE_CHAT_WIDGET = MenuId.for('inlineChatWidget');
-const MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE = MenuId.for('inlineChatWidget.markdownMessage');
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
 const MENU_INLINE_CHAT_WIDGET_FEEDBACK = MenuId.for('inlineChatWidget.feedback');
 const MENU_INLINE_CHAT_WIDGET_DISCARD = MenuId.for('inlineChatWidget.undo');
-registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localizeWithPath(
+const inlineChatBackground = registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/common/inlineChat',
     'inlineChat.background',
     "Background color of the interactive editor widget"
@@ -173,7 +162,7 @@ registerColor('inlineChatInput.background', { dark: inputBackground, light: inpu
     'inlineChatInput.background',
     "Background color of the interactive editor input"
 )));
-const inlineChatDiffInserted = registerColor('inlineChatDiff.inserted', { dark: ( transparent(diffInserted, .5)), light: ( transparent(diffInserted, .5)), hcDark: ( transparent(diffInserted, .5)), hcLight: ( transparent(diffInserted, .5)) }, ( localizeWithPath(
+registerColor('inlineChatDiff.inserted', { dark: ( transparent(diffInserted, .5)), light: ( transparent(diffInserted, .5)), hcDark: ( transparent(diffInserted, .5)), hcLight: ( transparent(diffInserted, .5)) }, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/common/inlineChat',
     'inlineChatDiff.inserted',
     "Background color of inserted text in the interactive editor input"
@@ -183,7 +172,7 @@ const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.i
     'editorOverviewRuler.inlineChatInserted',
     'Overview ruler marker color for inline chat inserted content.'
 )));
-const inlineChatDiffRemoved = registerColor('inlineChatDiff.removed', { dark: ( transparent(diffRemoved, .5)), light: ( transparent(diffRemoved, .5)), hcDark: ( transparent(diffRemoved, .5)), hcLight: ( transparent(diffRemoved, .5)) }, ( localizeWithPath(
+registerColor('inlineChatDiff.removed', { dark: ( transparent(diffRemoved, .5)), light: ( transparent(diffRemoved, .5)), hcDark: ( transparent(diffRemoved, .5)), hcLight: ( transparent(diffRemoved, .5)) }, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/common/inlineChat',
     'inlineChatDiff.removed',
     "Background color of removed text in the interactive editor input"
@@ -280,4 +269,4 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( transparent(dif
         }
     }
 });
-export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, 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_ACTIVE_REQUEST, CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_END, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_INNER_CURSOR_START, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_MESSAGE_CROP_STATE, 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, IInlineChatService, INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, MENU_INLINE_CHAT_INPUT, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_DISCARD, MENU_INLINE_CHAT_WIDGET_FEEDBACK, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatDiffInserted, inlineChatDiffRemoved, inlineChatRegionHighlight, 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_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, IInlineChatService, INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_DISCARD, MENU_INLINE_CHAT_WIDGET_FEEDBACK, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, inlineChatRegionHighlight, overviewRulerInlineChatDiffInserted };

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

@@ -4,11 +4,13 @@ import { basename, extname } from '../../../../base/common/path.js';
 import { joinPath, isEqual } from '../../../../base/common/resources.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IInteractiveDocumentService } from './interactiveDocumentService.js';
 import { IInteractiveHistoryService } from './interactiveHistoryService.js';
+import { NotebookSetting } from '../../notebook/common/notebookCommon.js';
 import { NotebookEditorInput } from '../../notebook/common/notebookEditorInput.js';
 import { INotebookService } from '../../notebook/common/notebookService.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
@@ -49,11 +51,12 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
     get primary() {
         return this._notebookEditorInput;
     }
-    constructor(resource, inputResource, title, languageId, instantiationService, textModelService, interactiveDocumentService, historyService, _notebookService, _fileDialogService) {
+    constructor(resource, inputResource, title, languageId, instantiationService, textModelService, interactiveDocumentService, historyService, _notebookService, _fileDialogService, configurationService) {
         const input = NotebookEditorInput.getOrCreate(instantiationService, resource, undefined, 'interactive', {});
         super();
         this._notebookService = _notebookService;
         this._fileDialogService = _fileDialogService;
+        this.isScratchpad = configurationService.getValue(NotebookSetting.InteractiveWindowPromptToSave) !== true;
         this._notebookEditorInput = input;
         this._register(this._notebookEditorInput);
         this.name = title ?? InteractiveEditorInput_1.windowNames[resource.path] ?? basename(resource.path, extname(resource.path));
@@ -80,10 +83,10 @@ 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
-            | 1024
-            | 512 ;
+            | scratchPad;
     }
     async _resolveEditorModel() {
         if (!this._editorModelReference) {
@@ -150,9 +153,20 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
     getName() {
         return this.name;
     }
+    isDirty() {
+        if (this.isScratchpad) {
+            return false;
+        }
+        return this._editorModelReference?.isDirty() ?? false;
+    }
     isModified() {
         return this._editorModelReference?.isModified() ?? false;
     }
+    async revert(_group, options) {
+        if (this._editorModelReference && this._editorModelReference.isDirty()) {
+            await this._editorModelReference.revert(options);
+        }
+    }
     dispose() {
         this._editorModelReference?.revert({ soft: true });
         this._notebookEditorInput?.dispose();
@@ -173,6 +187,7 @@ InteractiveEditorInput = InteractiveEditorInput_1 = ( __decorate([
     ( __param(6, IInteractiveDocumentService)),
     ( __param(7, IInteractiveHistoryService)),
     ( __param(8, INotebookService)),
-    ( __param(9, IFileDialogService))
+    ( __param(9, IFileDialogService)),
+    ( __param(10, IConfigurationService))
 ], InteractiveEditorInput));
 export { InteractiveEditorInput };

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

@@ -3,7 +3,7 @@ import './media/languageStatus.css.js';
 import { getWindow, addDisposableListener, append } from '../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { DisposableStore, dispose, toDisposable, Disposable } from '../../../../base/common/lifecycle.js';
-import Severity from '../../../../base/common/severity.js';
+import Severity$1 from '../../../../base/common/severity.js';
 import { getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
@@ -157,7 +157,7 @@ let LanguageStatus = class LanguageStatus {
         }
         else {
             const [first] = model.combined;
-            const showSeverity = first.severity >= Severity.Warning;
+            const showSeverity = first.severity >= Severity$1.Warning;
             const text = LanguageStatus_1._severityToComboCodicon(first.severity);
             let isOneBusy = false;
             const ariaLabels = [];
@@ -273,7 +273,7 @@ let LanguageStatus = class LanguageStatus {
                 href: ( ( URI.from({
                     scheme: 'command', path: command.id, query: command.arguments && JSON.stringify(command.arguments)
                 })).toString())
-            }, undefined, this._openerService)));
+            }, { hoverDelegate: nativeHoverDelegate }, this._openerService)));
         }
         const actionBar = ( new ActionBar(right, { hoverDelegate: nativeHoverDelegate }));
         store.add(actionBar);
@@ -308,15 +308,15 @@ let LanguageStatus = class LanguageStatus {
     }
     static _severityToComboCodicon(sev) {
         switch (sev) {
-            case Severity.Error: return '$(bracket-error)';
-            case Severity.Warning: return '$(bracket-dot)';
+            case Severity$1.Error: return '$(bracket-error)';
+            case Severity$1.Warning: return '$(bracket-dot)';
             default: return '$(bracket)';
         }
     }
     static _severityToSingleCodicon(sev) {
         switch (sev) {
-            case Severity.Error: return '$(error)';
-            case Severity.Warning: return '$(info)';
+            case Severity$1.Error: return '$(error)';
+            case Severity$1.Warning: return '$(info)';
             default: return '$(check)';
         }
     }
@@ -356,10 +356,10 @@ let LanguageStatus = class LanguageStatus {
     }
     static _asStatusbarEntry(item) {
         let kind;
-        if (item.severity === Severity.Warning) {
+        if (item.severity === Severity$1.Warning) {
             kind = 'warning';
         }
-        else if (item.severity === Severity.Error) {
+        else if (item.severity === Severity$1.Error) {
             kind = 'error';
         }
         const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = "@keyframes wiggle{0%{transform:rotate(0) scale(1)}15%,45%{transform:rotate(.04turn) scale(1.1)}30%,60%{transform:rotate(-.04turn) scale(1.2)}to{transform:rotate(0) scale(1)}}.monaco-workbench .statusbar DIV#status\\.languageStatus A>SPAN.codicon.wiggle{animation-duration:.8s;animation-iteration-count:1;animation-name:wiggle}@keyframes flash{0%{background-color:initial}50%{background-color:var(--vscode-statusBarItem-prominentBackground)}to{background-color:initial}}.monaco-workbench .statusbar DIV#status\\.languageStatus.flash A{animation-duration:.8s;animation-iteration-count:1;animation-name:flash}.monaco-workbench .hover-language-status{display:flex;padding:4px 8px}.monaco-workbench .hover-language-status:not(:last-child){border-bottom:1px solid var(--vscode-notifications-border)}.monaco-workbench .hover-language-status>.severity{display:none;flex:1;margin:auto;padding-right:8px}.monaco-workbench .hover-language-status>.severity.sev3{color:var(--vscode-notificationsErrorIcon-foreground)}.monaco-workbench .hover-language-status>.severity.sev2{color:var(--vscode-notificationsInfoIcon-foreground)}.monaco-workbench .hover-language-status>.severity.show{display:inherit}.monaco-workbench .hover-language-status>.element{display:flex;flex-grow:100;justify-content:space-between;vertical-align:middle}.monaco-workbench .hover-language-status>.element>.left>.detail:not(:empty):before{content:\"\\2013\";opacity:.6;padding:0 4px}.monaco-workbench .hover-language-status>.element>.left>.label:empty{display:none}.monaco-workbench .hover-language-status>.element .left{margin:auto 0}.monaco-workbench .hover-language-status>.element .right{display:flex;margin:auto 0}.monaco-workbench .hover-language-status>.element .right:not(:empty){padding-left:16px}.monaco-workbench .hover-language-status>.element .right .monaco-link{margin:auto 0;white-space:nowrap}.monaco-workbench .hover-language-status>.element .right .monaco-action-bar:not(:first-child){padding-left:8px}";
+var css = "@keyframes wiggle{0%{transform:rotate(0) scale(1)}15%,45%{transform:rotate(.04turn) scale(1.1)}30%,60%{transform:rotate(-.04turn) scale(1.2)}to{transform:rotate(0) scale(1)}}.monaco-workbench .statusbar DIV#status\\.languageStatus A>SPAN.codicon.wiggle{animation-duration:.8s;animation-iteration-count:1;animation-name:wiggle}@keyframes flash{0%{background-color:initial}50%{background-color:var(--vscode-statusBarItem-prominentBackground)}to{background-color:initial}}.monaco-workbench .statusbar DIV#status\\.languageStatus.flash A{animation-duration:.8s;animation-iteration-count:1;animation-name:flash}.monaco-workbench .hover-language-status{display:flex}.monaco-workbench .hover-language-status:not(:last-child){border-bottom:1px solid var(--vscode-notifications-border)}.monaco-workbench .hover-language-status>.severity{display:none;flex:1;margin:auto;padding-right:8px}.monaco-workbench .hover-language-status>.severity.sev3{color:var(--vscode-notificationsErrorIcon-foreground)}.monaco-workbench .hover-language-status>.severity.sev2{color:var(--vscode-notificationsInfoIcon-foreground)}.monaco-workbench .hover-language-status>.severity.show{display:inherit}.monaco-workbench .hover-language-status>.element{display:flex;flex-grow:100;justify-content:space-between;vertical-align:middle}.monaco-workbench .hover-language-status>.element>.left>.detail:not(:empty):before{content:\"\\2013\";opacity:.6;padding:0 4px}.monaco-workbench .hover-language-status>.element>.left>.label:empty{display:none}.monaco-workbench .hover-language-status>.element .left{margin:auto 0}.monaco-workbench .hover-language-status>.element .right{display:flex;margin:auto 0}.monaco-workbench .hover-language-status>.element .right:not(:empty){padding-left:16px}.monaco-workbench .hover-language-status>.element .right .monaco-link{margin:auto 0;white-space:nowrap}.monaco-workbench .hover-language-status>.element .right .monaco-action-bar:not(:first-child){padding-left:8px}";
 n(css,{});
 export { css, css as default };

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import Severity from '../../../../base/common/severity.js';
+import Severity$1 from '../../../../base/common/severity.js';
 import { getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ILanguageStatusService } from '../../../services/languageStatus/common/languageStatusService.js';
@@ -120,7 +120,7 @@ class LanguageStatusEntry {
                 id: this.accessor.id,
                 selector: '*',
                 name: this.accessor.name,
-                severity: Severity.Warning,
+                severity: Severity$1.Warning,
                 label: this.accessor.label,
                 detail: ( localizeWithPath(
                     'vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution',

package/vscode/src/vs/workbench/contrib/logs/common/defaultLogLevels.js

@@ -7,14 +7,19 @@ import { IJSONEditingService } from '../../../services/configuration/common/json
 import { isUndefined, isString } from '../../../../base/common/types.js';
 import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from '../../../../platform/environment/common/environmentService.js';
 import { parse } from '../../../../base/common/json.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Emitter } from '../../../../base/common/event.js';
 const IDefaultLogLevelsService = ( createDecorator('IDefaultLogLevelsService'));
-let DefaultLogLevelsService = class DefaultLogLevelsService {
+let DefaultLogLevelsService = class DefaultLogLevelsService extends Disposable {
     constructor(environmentService, fileService, jsonEditingService, logService, loggerService) {
+        super();
         this.environmentService = environmentService;
         this.fileService = fileService;
         this.jsonEditingService = jsonEditingService;
         this.logService = logService;
         this.loggerService = loggerService;
+        this._onDidChangeDefaultLogLevels = this._register(( new Emitter()));
+        this.onDidChangeDefaultLogLevels = this._onDidChangeDefaultLogLevels.event;
     }
     async getDefaultLogLevels() {
         const argvLogLevel = await this._parseLogLevelsFromArgv();
@@ -23,11 +28,20 @@ let DefaultLogLevelsService = class DefaultLogLevelsService {
             extensions: argvLogLevel?.extensions ?? this._getExtensionsDefaultLogLevelsFromEnv()
         };
     }
+    async getDefaultLogLevel(extensionId) {
+        const argvLogLevel = (await this._parseLogLevelsFromArgv()) ?? {};
+        if (extensionId) {
+            extensionId = extensionId.toLowerCase();
+            return this._getDefaultLogLevel(argvLogLevel, extensionId);
+        }
+        else {
+            return this._getDefaultLogLevel(argvLogLevel);
+        }
+    }
     async setDefaultLogLevel(defaultLogLevel, extensionId) {
         const argvLogLevel = (await this._parseLogLevelsFromArgv()) ?? {};
         if (extensionId) {
             extensionId = extensionId.toLowerCase();
-            const argvLogLevel = (await this._parseLogLevelsFromArgv()) ?? {};
             const currentDefaultLogLevel = this._getDefaultLogLevel(argvLogLevel, extensionId);
             argvLogLevel.extensions = argvLogLevel.extensions ?? [];
             const extension = argvLogLevel.extensions.find(([extension]) => extension === extensionId);
@@ -53,6 +67,7 @@ let DefaultLogLevelsService = class DefaultLogLevelsService {
                 this.loggerService.setLogLevel(defaultLogLevel);
             }
         }
+        this._onDidChangeDefaultLogLevels.fire();
     }
     _getDefaultLogLevel(argvLogLevels, extension) {
         if (extension) {