@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -1,7 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { h, trackFocus, getTotalHeight, reset, getActiveElement } from '../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
@@ -18,7 +17,7 @@ import { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { DetailedLineRangeMapping, RangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
 import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../platform/actions/browser/toolbar.js';
@@ -54,7 +53,6 @@ import { ServiceCollection } from '../../../../platform/instantiation/common/ser
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { TextOnlyMenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 var HunkAccessibleDiffViewer_1;
-const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatWidget";
 let InlineChatWidget = class InlineChatWidget {
     constructor(location, options, _instantiationService, _contextKeyService, _keybindingService, _accessibilityService, _configurationService, _accessibleViewService, _textModelResolverService, _chatService, _hoverService) {
         this._instantiationService = _instantiationService;
@@ -68,8 +66,6 @@ let InlineChatWidget = class InlineChatWidget {
         this._hoverService = _hoverService;
         this._elements = h('div.inline-chat@root', [
             h('div.chat-widget@chatWidget'),
-            h('div.progress@progress'),
-            h('div.previewDiff.hidden@previewDiff'),
             h('div.accessibleViewer@accessibleViewer'),
             h('div.status@status', [
                 h('div.label.info.hidden@infoLabel'),
@@ -84,8 +80,6 @@ let InlineChatWidget = class InlineChatWidget {
         this._onDidChangeInput = this._store.add(( (new Emitter())));
         this.onDidChangeInput = this._onDidChangeInput.event;
         this._isLayouting = false;
-        this._progressBar = ( (new ProgressBar(this._elements.progress)));
-        this._store.add(this._progressBar);
         this.scopedContextKeyService = this._store.add(_contextKeyService.createScoped(this._elements.chatWidget));
         const scopedInstaService = _instantiationService.createChild(( (new ServiceCollection([
             IContextKeyService,
@@ -96,7 +90,7 @@ let InlineChatWidget = class InlineChatWidget {
             renderStyle: 'minimal',
             renderInputOnTop: false,
             renderFollowups: true,
-            supportsFileReferences: true,
+            supportsFileReferences: _configurationService.getValue(`chat.experimental.variables.${location.location}`) === true,
             filter: item => !isWelcomeVM(item),
             ...options.chatWidgetViewOptions
         }, {
@@ -180,15 +174,13 @@ let InlineChatWidget = class InlineChatWidget {
             if (this._configurationService.getValue(AccessibilityVerbositySettingId.InlineChat)) {
                 const kbLabel = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
                 label = kbLabel
-                    ? ( localizeWithPath(
-                    _moduleId,
-                    0,
+                    ? ( localize(
+                    11375,
                     "Inline Chat Input, Use {0} for Inline Chat Accessibility Help.",
                     kbLabel
                 ))
-                    : ( localizeWithPath(
-                    _moduleId,
-                    1,
+                    : ( localize(
+                    11376,
                     "Inline Chat Input, Run the Inline Chat Accessibility Help command for more information."
                 ));
             }
@@ -218,21 +210,18 @@ let InlineChatWidget = class InlineChatWidget {
     }
     _doLayout(dimension) {
         const extraHeight = this._getExtraHeight();
-        const progressHeight = getTotalHeight(this._elements.progress);
         const statusHeight = getTotalHeight(this._elements.status);
         this._elements.root.style.height = `${dimension.height - extraHeight}px`;
         this._elements.root.style.width = `${dimension.width}px`;
-        this._elements.progress.style.width = `${dimension.width}px`;
-        this._chatWidget.layout(dimension.height - progressHeight - statusHeight - extraHeight, dimension.width);
+        this._chatWidget.layout(dimension.height - statusHeight - extraHeight, dimension.width);
     }
     get contentHeight() {
         const data = {
             chatWidgetContentHeight: this._chatWidget.contentHeight,
-            progressHeight: getTotalHeight(this._elements.progress),
             statusHeight: getTotalHeight(this._elements.status),
             extraHeight: this._getExtraHeight()
         };
-        const result = data.progressHeight + data.chatWidgetContentHeight + data.statusHeight + data.extraHeight;
+        const result = data.chatWidgetContentHeight + data.statusHeight + data.extraHeight;
         return result;
     }
     get minHeight() {
@@ -251,16 +240,6 @@ let InlineChatWidget = class InlineChatWidget {
     _getExtraHeight() {
         return 4  + 2  + 4 ;
     }
-    updateProgress(show) {
-        if (show) {
-            this._progressBar.show();
-            this._progressBar.infinite();
-        }
-        else {
-            this._progressBar.stop();
-            this._progressBar.hide();
-        }
-    }
     get value() {
         return this._chatWidget.getInput();
     }
@@ -305,7 +284,7 @@ let InlineChatWidget = class InlineChatWidget {
         if (!isNonEmptyArray(requests)) {
             return undefined;
         }
-        return tail(requests)?.response?.response.asString();
+        return tail(requests)?.response?.response.toString();
     }
     getChatModel() {
         return this._chatWidget.viewModel?.model ?? this._defaultChatModel;
@@ -384,6 +363,7 @@ let InlineChatWidget = class InlineChatWidget {
         this._onDidChangeHeight.fire();
     }
     reset() {
+        this._chatWidget.setContext(true);
         this._chatWidget.saveState();
         this.updateChatMessage(undefined);
         reset(this._elements.statusLabel);
@@ -413,7 +393,7 @@ InlineChatWidget = ( (__decorate([
     ( (__param(9, IChatService))),
     ( (__param(10, IHoverService)))
 ], InlineChatWidget)));
-const defaultAriaLabel = ( localizeWithPath(_moduleId, 2, "Inline Chat Input"));
+const defaultAriaLabel = ( localize(11377, "Inline Chat Input"));
 let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends InlineChatWidget {
     constructor(location, _parentEditor, options, contextKeyService, keybindingService, instantiationService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService) {
         super(location, { ...options, chatWidgetViewOptions: { ...options.chatWidgetViewOptions, editorOverflowWidgetsDomNode: _parentEditor.getOverflowWidgetsDomNode() } }, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService);
@@ -423,7 +403,7 @@ let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends Inli
     get contentHeight() {
         let result = super.contentHeight;
         if (this._accessibleViewer.value) {
-            result += this._accessibleViewer.value.height;
+            result += this._accessibleViewer.value.height + 8 ;
         }
         return result;
     }
@@ -431,7 +411,7 @@ let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends Inli
         let newHeight = dimension.height;
         if (this._accessibleViewer.value) {
             this._accessibleViewer.value.width = dimension.width - 12;
-            newHeight -= this._accessibleViewer.value.height;
+            newHeight -= this._accessibleViewer.value.height + 8;
         }
         super._doLayout(dimension.with(undefined, newHeight));
         this._elements.root.style.height = `${dimension.height - this._getExtraHeight()}px`;

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

@@ -5,7 +5,7 @@ import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { assertType } from '../../../../base/common/types.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } 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_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_ACCEPT_CHANGES, MENU_INLINE_CHAT_EXECUTE, InlineChatConfigKeys, EditMode } from '../common/inlineChat.js';
@@ -15,7 +15,6 @@ import { StableEditorBottomScrollState } from '../../../../editor/browser/stable
 import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
-const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget";
 let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     constructor(location, editor, _instaService, _logService, contextKeyService, configurationService) {
         super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 10000 });
@@ -167,7 +166,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this.widget.reset();
         this.widget.chatWidget.setVisible(false);
         super.hide();
-        status(( localizeWithPath(_moduleId, 0, 'Closed inline chat widget')));
+        status(( localize(10593, 'Closed inline chat widget')));
         scrollState.restore(this.editor);
     }
 };

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 .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}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part{padding:4px 6px 0}.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-left:6px;padding-right:20px;padding-top:2px}.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-item-container.interactive-item-compact .chat-notification-widget{border:none;margin-bottom:0;padding:0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request{border:none}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal>.header{right:10px;top:5px}.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;padding:4px 6px 0}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:flex;font-size:11px;overflow:hidden;white-space:nowrap}.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 3px}.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,.monaco-workbench .inline-chat-content-widget .toolbar{display:flex;height:18px;.actions-container{gap:3px}.action-item.text-only .action-label{border-radius:2px;font-size:12px;line-height:16px;padding:0 4px}.monaco-action-bar .action-item.menu-entry.text-only+.action-item:not(.text-only)>.monaco-dropdown .action-label{font-size:12px;height:unset;line-height:16px;width:unset}}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-content-widget.contents .toolbar{.monaco-action-bar .action-item.menu-entry.text-only:first-of-type .action-label{background-color:var(--vscode-button-background);color:var(--vscode-button-foreground)}}.monaco-workbench .inline-chat .status{.actions.text-style{display:none}.actions.button-style{display:inherit}}.monaco-workbench .inline-chat .status.text{.actions.text-style{display:inherit}.actions.button-style{display:none}}.monaco-workbench .inline-chat .status .actions>.monaco-button,.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown{margin-right:4px}.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:0 2px;white-space:nowrap}.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}";
+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 .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}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part{padding:4px 6px 0}.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-left:6px;padding-right:20px;padding-top:2px}.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-item-container.interactive-item-compact .chat-notification-widget{border:none;margin-bottom:0;padding:0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request{border:none}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal>.header{right:10px;top:5px}.monaco-workbench .inline-chat>.status{align-items:center;display:flex;justify-content:space-between;padding:4px 6px 0}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:flex;font-size:11px;overflow:hidden;white-space:nowrap}.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 3px}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-content-widget .toolbar{display:flex;height:18px;.actions-container{gap:3px}.action-item.text-only .action-label{border-radius:2px;font-size:12px;line-height:16px;padding:0 4px}.monaco-action-bar .action-item.menu-entry.text-only+.action-item:not(.text-only)>.monaco-dropdown .action-label{font-size:12px;height:unset;line-height:16px;width:unset}}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-content-widget.contents .toolbar{.monaco-action-bar .action-item.menu-entry.text-only:first-of-type .action-label{background-color:var(--vscode-button-background);color:var(--vscode-button-foreground)}}.monaco-workbench .inline-chat .status{.actions.text-style{display:none}.actions.button-style{display:inherit}}.monaco-workbench .inline-chat .status.text{.actions.text-style{display:inherit}.actions.button-style{display:none}}.monaco-workbench .inline-chat .status .actions>.monaco-button,.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown{margin-right:4px}.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:0 2px;white-space:nowrap}.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 .diff-review{background-color:unset;padding:4px 6px}.monaco-workbench .inline-chat .diff-review.hidden{display:none}.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 .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/common/inlineChat.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -14,7 +14,6 @@ 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';
-const _moduleId = "vs/workbench/contrib/inlineChat/common/inlineChat";
 var InlineChatConfigKeys;
 ( ((function(InlineChatConfigKeys) {
     InlineChatConfigKeys["Mode"] = "inlineChat.mode";
@@ -33,72 +32,65 @@ var EditMode;
     id: 'editor',
     properties: {
         [InlineChatConfigKeys.Mode]: {
-            description: ( localizeWithPath(
-                _moduleId,
-                0,
+            description: ( localize(
+                7175,
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
             default: EditMode.Live,
             type: 'string',
             enum: [EditMode.Live, EditMode.Preview],
             markdownEnumDescriptions: [
-                ( localizeWithPath(
-                    _moduleId,
-                    1,
+                ( localize(
+                    7176,
                     "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,
-                    2,
+                ( localize(
+                    7177,
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
             ],
             tags: ['experimental']
         },
         [InlineChatConfigKeys.FinishOnType]: {
-            description: ( localizeWithPath(
-                _moduleId,
-                3,
+            description: ( localize(
+                7178,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
         [InlineChatConfigKeys.AcceptedOrDiscardBeforeSave]: {
-            description: ( localizeWithPath(_moduleId, 4, "Whether pending inline chat sessions prevent saving.")),
+            description: ( localize(7179, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
         [InlineChatConfigKeys.HoldToSpeech]: {
-            description: ( localizeWithPath(
-                _moduleId,
-                5,
+            description: ( localize(
+                7180,
                 "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
             default: true,
             type: 'boolean'
         },
         [InlineChatConfigKeys.AccessibleDiffView]: {
-            description: ( localizeWithPath(
-                _moduleId,
-                6,
+            description: ( localize(
+                7181,
                 "Whether the inline chat also renders an accessible diff viewer for its changes."
             )),
             default: 'auto',
             type: 'string',
             enum: ['auto', 'on', 'off'],
             markdownEnumDescriptions: [
-                ( localizeWithPath(
-                    _moduleId,
-                    7,
+                ( localize(
+                    7182,
                     "The accessible diff viewer is based screen reader mode being enabled."
                 )),
-                ( localizeWithPath(_moduleId, 8, "The accessible diff viewer is always enabled.")),
-                ( localizeWithPath(_moduleId, 9, "The accessible diff viewer is never enabled.")),
+                ( localize(7183, "The accessible diff viewer is always enabled.")),
+                ( localize(7184, "The accessible diff viewer is never enabled.")),
             ],
         },
         [InlineChatConfigKeys.ExpTextButtons]: {
-            description: ( localizeWithPath(_moduleId, 10, "Whether to use textual buttons.")),
+            description: ( localize(7185, "Whether to use textual buttons.")),
             default: false,
             type: 'boolean',
             tags: ['experimental']
@@ -112,40 +104,32 @@ var InlineChatResponseType;
     InlineChatResponseType["Messages"] = "messages";
     InlineChatResponseType["MessagesAndEdits"] = "messagesAndEdits";
 })(InlineChatResponseType || (InlineChatResponseType = {}))));
-const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localizeWithPath(_moduleId, 11, "Whether a provider for interactive editors exists")))));
-const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localizeWithPath(_moduleId, 12, "Whether the interactive editor input is visible")))));
-const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localizeWithPath(_moduleId, 13, "Whether the interactive editor input is focused")))));
-const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localizeWithPath(_moduleId, 14, "Whether the interactive widget's response is focused")))));
-const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localizeWithPath(_moduleId, 15, "Whether the interactive editor input is empty")))));
-const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localizeWithPath(
-    _moduleId,
-    16,
+const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7186, "Whether a provider for interactive editors exists")))));
+const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7187, "Whether the interactive editor input is visible")))));
+const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7188, "Whether the interactive editor input is focused")))));
+const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7189, "Whether the interactive widget's response is focused")))));
+const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7190, "Whether the interactive editor input is empty")))));
+const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localize(
+    7191,
     "Whether the cursor of the iteractive editor input is on the first line"
 )))));
-const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( (new RawContextKey('inlineChatInnerCursorLast', false, ( localizeWithPath(
-    _moduleId,
-    17,
+const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( (new RawContextKey('inlineChatInnerCursorLast', false, ( localize(
+    7192,
     "Whether the cursor of the iteractive editor input is on the last line"
 )))));
-const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localizeWithPath(
-    _moduleId,
-    20,
+const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localize(
+    7195,
     "Whether the cursor of the outer editor is above or below the interactive editor input"
 )))));
-const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localizeWithPath(
-    _moduleId,
-    21,
-    "Whether interactive editor has kept a session for quick restore"
-)))));
-const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localizeWithPath(_moduleId, 22, "Whether the user did changes ontop of the inline chat")))));
-const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localizeWithPath(_moduleId, 23, "Whether the document has changed concurrently")))));
-const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localizeWithPath(_moduleId, 24, "Whether the current change supports showing a diff")))));
-const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localizeWithPath(_moduleId, 25, "Whether the current change showing a diff")))));
+const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7196, "Whether interactive editor has kept a session for quick restore")))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7197, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7198, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7199, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7200, "Whether the current change showing a diff")))));
 const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', EditMode.Live)));
-const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localizeWithPath(_moduleId, 26, "Whether an inline chat request is currently in progress")))));
-const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey('inlineChatResponseType', InlineChatResponseType.None, ( localizeWithPath(
-    _moduleId,
-    27,
+const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7201, "Whether an inline chat request is currently in progress")))));
+const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey('inlineChatResponseType', InlineChatResponseType.None, ( localize(
+    7202,
     "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"
 )))));
 const CTX_INLINE_CHAT_CONFIG_TXT_BTNS = ( (ContextKeyExpr.equals(`config.${[InlineChatConfigKeys.ExpTextButtons]}`, true)));
@@ -156,41 +140,17 @@ const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
 const MENU_INLINE_CHAT_EXECUTE = MenuId.for('inlineChat.execute');
 const MENU_INLINE_CHAT_CONTENT_STATUS = MenuId.for('inlineChat.content.status');
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
-const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localizeWithPath(_moduleId, 28, "Foreground color of the interactive editor widget")));
-const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localizeWithPath(_moduleId, 29, "Background color of the interactive editor widget")));
-registerColor('inlineChat.border', editorWidgetBorder, ( localizeWithPath(_moduleId, 30, "Border color of the interactive editor widget")));
-registerColor('inlineChat.shadow', widgetShadow, ( localizeWithPath(_moduleId, 31, "Shadow color of the interactive editor widget")));
-registerColor('inlineChatInput.border', editorWidgetBorder, ( localizeWithPath(_moduleId, 32, "Border color of the interactive editor input")));
-registerColor('inlineChatInput.focusBorder', focusBorder, ( localizeWithPath(_moduleId, 33, "Border color of the interactive editor input when focused")));
-registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localizeWithPath(
-    _moduleId,
-    34,
-    "Foreground color of the interactive editor input placeholder"
-)));
-registerColor('inlineChatInput.background', inputBackground, ( localizeWithPath(_moduleId, 35, "Background color of the interactive editor input")));
-registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localizeWithPath(
-    _moduleId,
-    36,
-    "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,
-    37,
-    '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,
-    37,
-    'Overview ruler marker color for inline chat inserted content.'
-)));
-registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localizeWithPath(
-    _moduleId,
-    38,
-    "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,
-    39,
-    'Overview ruler marker color for inline chat removed content.'
-)));
+const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7203, "Foreground color of the interactive editor widget")));
+const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7204, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', editorWidgetBorder, ( localize(7205, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', widgetShadow, ( localize(7206, "Shadow color of the interactive editor widget")));
+registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7207, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7208, "Border color of the interactive editor input when focused")));
+registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7209, "Foreground color of the interactive editor input placeholder")));
+registerColor('inlineChatInput.background', inputBackground, ( localize(7210, "Background color of the interactive editor input")));
+registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7211, "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))) }, ( localize(7212, '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))) }, ( localize(7212, 'Overview ruler marker color for inline chat inserted content.')));
+registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7213, "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))) }, ( localize(7214, 'Overview ruler marker color for inline chat removed content.')));
 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_CONFIG_TXT_BTNS, 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_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType, MENU_INLINE_CHAT_CONTENT_STATUS, MENU_INLINE_CHAT_EXECUTE, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, inlineChatForeground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };

package/vscode/src/vs/workbench/contrib/issue/common/issue.service.js

@@ -1,3 +1,4 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const IIssueFormService = ( createDecorator('issueFormService'));
 const IWorkbenchIssueService = ( createDecorator('workbenchIssueService'));
-export { IWorkbenchIssueService };
+export { IIssueFormService, IWorkbenchIssueService };

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

@@ -8,7 +8,7 @@ import '../../../../base/common/cancellation.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { isDefined } from '../../../../base/common/types.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -22,7 +22,6 @@ import { IEditorService } from '../../../services/editor/common/editorService.se
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 var MergeEditorInput_1;
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/mergeEditorInput";
 class MergeEditorInputData {
     constructor(uri, title, detail, description) {
         this.uri = uri;
@@ -74,7 +73,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return ( localizeWithPath(_moduleId, 0, "Merging: {0}", super.getName()));
+        return ( localize(7630, "Merging: {0}", super.getName()));
     }
     async resolve() {
         if (!this._inputModel) {