@codingame/monaco-vscode-api 10.1.3 → 11.0.0

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { EditOperation } from '../../../../editor/common/core/editOperation.js';
@@ -13,6 +13,7 @@ import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+
 var HunkData_1;
 class SessionWholeRange {
     static { this._options = ModelDecorationOptions.register({ description: 'inlineChat/session/wholeRange' }); }
@@ -471,4 +472,5 @@ class RawHunk {
         this.changes = changes;
     }
 }
+
 export { HunkData, Session, SessionWholeRange, StashedSession };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service.js

@@ -1,3 +1,5 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
 const IInlineChatSessionService = ( createDecorator('IInlineChatSessionService'));
+
 export { IInlineChatSessionService };

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

@@ -17,13 +17,14 @@ import { DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { IChatAgentService } from '../../chat/common/chatAgents.service.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
-import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_POSSIBLE } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_POSSIBLE } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
 import { Session, SessionWholeRange, HunkData, StashedSession } from './inlineChatSession.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
+
 class InlineChatError extends Error {
     static { this.code = 'InlineChatError'; }
     constructor(message) {
@@ -283,4 +284,5 @@ InlineChatEnabler = ( __decorate([
     ( __param(1, IChatAgentService)),
     ( __param(2, IEditorService))
 ], InlineChatEnabler));
+
 export { InlineChatEnabler, InlineChatError, InlineChatSessionServiceImpl };

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { WindowIntervalTimer, getTotalWidth } from '../../../../base/browser/dom.js';
+import { WindowIntervalTimer } from '../../../../base/browser/dom.js';
 import { coalesceInPlace } from '../../../../base/common/arrays.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
@@ -14,8 +14,8 @@ import { IEditorWorkerService } from '../../../../editor/common/services/editorW
 import { InlineDecoration } from '../../../../editor/common/viewModel.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
-import { countWords } from '../../chat/common/chatWordCounter.js';
-import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted, MENU_INLINE_CHAT_ZONE, ACTION_TOGGLE_DIFF } from '../common/inlineChat.js';
+import { countWords } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatWordCounter';
+import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_ZONE, ACTION_TOGGLE_DIFF } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { assertType } from '../../../../base/common/types.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { asProgressiveEdit, performAsyncTextEdit } from './utils.js';
@@ -24,10 +24,8 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { DefaultChatTextEditor } from '../../chat/browser/codeBlockPart.js';
+import { DefaultChatTextEditor } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
 import { isEqual } from '../../../../base/common/resources.js';
-import { generateUuid } from '../../../../base/common/uuid.js';
-import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { ConflictActionsFactory } from '../../mergeEditor/browser/view/conflictActions.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
@@ -37,6 +35,7 @@ import '../../../../base/common/cancellation.js';
 import '../../../../base/common/observableInternal/utils.js';
 import { MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
+
 var EditModeStrategy_1;
 let EditModeStrategy = class EditModeStrategy {
     static { EditModeStrategy_1 = this; }
@@ -356,20 +355,15 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                                     const [hunkRange] = hunkData.getRangesN();
                                     viewZoneData.afterLineNumber = hunkRange.startLineNumber - 1;
                                     data.diffViewZoneId = viewZoneAccessor.addZone(viewZoneData);
-                                    overlay?.updateExtraTop(result.heightInLines);
                                 }
                                 else {
                                     viewZoneAccessor.removeZone(data.diffViewZoneId);
-                                    overlay?.updateExtraTop(0);
                                     data.diffViewZoneId = undefined;
                                 }
                             });
                             this._ctxCurrentChangeShowsDiff.set(typeof data?.diffViewZoneId === 'string');
                             scrollState.restore(this._editor);
                         };
-                        const overlay = this._showOverlayToolbar && false
-                            ? this._instaService.createInstance(InlineChangeOverlay, this._editor, hunkData)
-                            : undefined;
                         let lensActions;
                         const lensActionsViewZoneIds = [];
                         if (this._showOverlayToolbar && hunkData.getState() === 0 ) {
@@ -418,7 +412,6 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                                 data.lensActionsViewZoneIds = undefined;
                             });
                             lensActions?.dispose();
-                            overlay?.dispose();
                         };
                         const move = (next) => {
                             const keys = Array.from(( this._hunkDisplayData.keys()));
@@ -524,62 +517,5 @@ function changeDecorationsAndViewZones(editor, callback) {
         });
     });
 }
-let InlineChangeOverlay = class InlineChangeOverlay {
-    constructor(_editor, _hunkInfo, _instaService) {
-        this._editor = _editor;
-        this._hunkInfo = _hunkInfo;
-        this._instaService = _instaService;
-        this.allowEditorOverflow = false;
-        this._id = `inline-chat-diff-overlay-` + generateUuid();
-        this._domNode = document.createElement('div');
-        this._store = ( new DisposableStore());
-        this._extraTopLines = 0;
-        this._domNode.classList.add('inline-chat-diff-overlay');
-        if (_hunkInfo.getState() === 0 ) {
-            const menuBar = this._store.add(this._instaService.createInstance(MenuWorkbenchButtonBar, this._domNode, MENU_INLINE_CHAT_ZONE, {
-                menuOptions: { arg: _hunkInfo },
-                telemetrySource: 'inlineChat-changesZone',
-                buttonConfigProvider: (_action, idx) => {
-                    return {
-                        isSecondary: idx > 0,
-                        showIcon: true,
-                        showLabel: false
-                    };
-                },
-            }));
-            this._store.add(menuBar.onDidChange(() => this._editor.layoutOverlayWidget(this)));
-        }
-        this._editor.addOverlayWidget(this);
-        this._store.add(Event.any(this._editor.onDidLayoutChange, this._editor.onDidScrollChange)(() => this._editor.layoutOverlayWidget(this)));
-        queueMicrotask(() => this._editor.layoutOverlayWidget(this));
-    }
-    dispose() {
-        this._editor.removeOverlayWidget(this);
-        this._store.dispose();
-    }
-    getId() {
-        return this._id;
-    }
-    getDomNode() {
-        return this._domNode;
-    }
-    getPosition() {
-        const line = this._hunkInfo.getRangesN()[0].startLineNumber;
-        const info = this._editor.getLayoutInfo();
-        const top = this._editor.getTopForLineNumber(line) - this._editor.getScrollTop();
-        const left = info.contentLeft + info.contentWidth - info.verticalScrollbarWidth;
-        const extraTop = this._editor.getOption(69 ) * this._extraTopLines;
-        const width = getTotalWidth(this._domNode);
-        return { preference: { top: top - extraTop, left: left - width } };
-    }
-    updateExtraTop(value) {
-        if (this._extraTopLines !== value) {
-            this._extraTopLines = value;
-            this._editor.layoutOverlayWidget(this);
-        }
-    }
-};
-InlineChangeOverlay = ( __decorate([
-    ( __param(2, IInstantiationService))
-], InlineChangeOverlay));
+
 export { EditModeStrategy, LiveStrategy, PreviewStrategy };

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

@@ -11,12 +11,25 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
-import { isResponseVM } from '../../chat/common/chatViewModel.js';
-import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE, MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../common/inlineChat.js';
-import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
+import { isResponseVM } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE, MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { EditorBasedInlineChatWidget } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
+
+var InlineChatZoneWidget_1;
 let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
+    static { InlineChatZoneWidget_1 = this; }
+    static { this._options = {
+        showFrame: true,
+        frameWidth: 1,
+        showArrow: false,
+        isAccessible: true,
+        className: 'inline-chat-widget',
+        keepEditorSelection: true,
+        showInHiddenAreas: true,
+        ordinal: 50000,
+    }; }
     constructor(location, editor, _instaService, _logService, contextKeyService, configurationService) {
-        super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 50000 });
+        super(editor, InlineChatZoneWidget_1._options);
         this._instaService = _instaService;
         this._logService = _logService;
         this._scrollUp = this._disposables.add(( (new ScrollUpState(this.editor))));
@@ -40,6 +53,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
                 }
             },
             secondaryMenuId: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+            inZoneWidget: true,
             chatWidgetViewOptions: {
                 menus: {
                     telemetrySource: 'interactiveEditorWidget-toolbar',
@@ -93,6 +107,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         updateCursorIsAboveContextKey();
     }
     _fillContainer(container) {
+        container.style.setProperty('--vscode-inlineChat-background', 'var(--vscode-editor-background)');
         container.appendChild(this.widget.domNode);
     }
     _doLayout(heightInPixel) {
@@ -105,8 +120,8 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     _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(69 );
+        const contentHeight = this._decoratingElementsHeight() + Math.min(chatContentHeight, Math.max(this.widget.minHeight, editorHeight * 0.42));
+        const heightInLines = contentHeight / this.editor.getOption(68 );
         return { linesValue: heightInLines, pixelsValue: contentHeight };
     }
     _onWidth(_widthInPixel) {
@@ -117,8 +132,8 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     show(position) {
         assertType(this.container);
         const info = this.editor.getLayoutInfo();
-        const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
-        this.container.style.marginLeft = `${marginWithoutIndentation}px`;
+        const marginWithoutIndentation = info.glyphMarginWidth + info.lineNumbersWidth;
+        this.container.style.paddingLeft = `${marginWithoutIndentation}px`;
         const revealZone = this._createZoneAndScrollRestoreFn(position);
         super.show(position, this._computeHeight().linesValue);
         this.widget.chatWidget.setVisible(true);
@@ -183,11 +198,11 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this.widget.reset();
         this.widget.chatWidget.setVisible(false);
         super.hide();
-        status(( localize(10251, 'Closed inline chat widget')));
+        status(( localize(10320, 'Closed inline chat widget')));
         scrollState.restore(this.editor);
     }
 };
-InlineChatZoneWidget = ( (__decorate([
+InlineChatZoneWidget = InlineChatZoneWidget_1 = ( (__decorate([
     ( (__param(2, IInstantiationService))),
     ( (__param(3, ILogService))),
     ( (__param(4, IContextKeyService))),
@@ -234,4 +249,5 @@ class ScrollUpState {
         return this._didScrollUpOrDown;
     }
 }
+
 export { InlineChatZoneWidget };

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

@@ -1,6 +1,7 @@
 import { EditOperation } from '../../../../editor/common/core/editOperation.js';
 import { AsyncIterableSource } from '../../../../base/common/async.js';
-import { getNWords } from '../../chat/common/chatWordCounter.js';
+import { getNWords } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatWordCounter';
+
 async function performAsyncTextEdit(model, edit, progress, obs) {
     const [id] = model.deltaDecorations([], [{
             range: edit.range,
@@ -59,4 +60,5 @@ function asProgressiveEdit(interval, edit, wordsPerSec, token) {
         newText: stream.asyncIterable
     };
 }
+
 export { asProgressiveEdit, performAsyncTextEdit };

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveDocumentService.service.js

@@ -1,3 +1,5 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
 const IInteractiveDocumentService = ( createDecorator('IInteractiveDocumentService'));
+
 export { IInteractiveDocumentService };

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

@@ -13,6 +13,7 @@ import { IInteractiveHistoryService } from './interactiveHistoryService.service.
 import { NotebookSetting } from '../../notebook/common/notebookCommon.js';
 import { NotebookEditorInput } from '../../notebook/common/notebookEditorInput.js';
 import { INotebookService } from '../../notebook/common/notebookService.service.js';
+
 var InteractiveEditorInput_1;
 let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
     static { InteractiveEditorInput_1 = this; }
@@ -193,4 +194,5 @@ InteractiveEditorInput = InteractiveEditorInput_1 = ( __decorate([
     ( __param(9, IFileDialogService)),
     ( __param(10, IConfigurationService))
 ], InteractiveEditorInput));
+
 export { InteractiveEditorInput };

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.service.js

@@ -1,3 +1,5 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
 const IInteractiveHistoryService = ( createDecorator('IInteractiveHistoryService'));
+
 export { IInteractiveHistoryService };

package/vscode/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.service.js

@@ -1,3 +1,5 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
 const ITroubleshootIssueService = ( createDecorator('ITroubleshootIssueService'));
+
 export { ITroubleshootIssueService };

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

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

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

@@ -3,6 +3,7 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ListResizeColumnAction } from './listResizeColumnAction.js';
+
 let ListContext = class ListContext {
     static { this.ID = 'workbench.contrib.listContext'; }
     constructor(contextKeyService) {
@@ -15,4 +16,5 @@ ListContext = ( __decorate([
 ], ListContext));
 registerWorkbenchContribution2(ListContext.ID, ListContext, 1 );
 registerAction2(ListResizeColumnAction);
+
 export { ListContext };

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

@@ -5,12 +5,13 @@ import { WorkbenchListFocusContextKey } from '../../../../platform/list/browser/
 import { IListService } from '../../../../platform/list/browser/listService.service.js';
 import { Action2 } from '../../../../platform/actions/common/actions.js';
 import { localize } from '../../../../nls.js';
+
 class ListResizeColumnAction extends Action2 {
     constructor() {
         super({
             id: 'list.resizeColumn',
-            title: { value: ( localize(4556, "Resize Column")), original: 'Resize Column' },
-            category: { value: ( localize(4557, "List")), original: 'List' },
+            title: { value: ( localize(4647, "Resize Column")), original: 'Resize Column' },
+            category: { value: ( localize(4648, "List")), original: 'List' },
             precondition: WorkbenchListFocusContextKey,
             f1: true
         });
@@ -24,4 +25,5 @@ class ListResizeColumnAction extends Action2 {
         }
     }
 }
+
 export { ListResizeColumnAction };

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

@@ -2,6 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localize } from '../../../../nls.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
+
 let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Disposable {
     constructor(_table, _quickInputService) {
         super();
@@ -15,14 +16,14 @@ let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Dispos
                 items.push({ label, index });
             }
         });
-        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(9904, "Select the column to resize, type to filter.")) });
+        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(9996, "Select the column to resize, type to filter.")) });
         if (!column) {
             return;
         }
         const value = await this._quickInputService.input({
-            placeHolder: ( localize(9905, "i.e. 20, 60, 100...")),
+            placeHolder: ( localize(9997, "i.e. 20, 60, 100...")),
             prompt: ( localize(
-                9906,
+                9998,
                 "Please enter a width in percentage for the '{0}' column.",
                 column.label
             )),
@@ -37,11 +38,11 @@ let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Dispos
     async _validateColumnResizeValue(input) {
         const percentage = Number.parseInt(input);
         if (input && !Number.isInteger(percentage)) {
-            return ( localize(9907, "Please enter an integer."));
+            return ( localize(9999, "Please enter an integer."));
         }
         else if (percentage < 0 || percentage > 100) {
             return ( localize(
-                9908,
+                10000,
                 "Please enter a number greater than 0 and less than or equal to 100."
             ));
         }
@@ -51,4 +52,5 @@ let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Dispos
 TableColumnResizeQuickPick = ( (__decorate([
     ( (__param(1, IQuickInputService)))
 ], TableColumnResizeQuickPick)));
+
 export { TableColumnResizeQuickPick };

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

@@ -1,3 +1,5 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
 const IDefaultLogLevelsService = ( createDecorator('IDefaultLogLevelsService'));
+
 export { IDefaultLogLevelsService };

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

@@ -0,0 +1,206 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { localize2, localize } from '../../../../nls.js';
+import { Action } from '../../../../base/common/actions.js';
+import { isLogLevel, LogLevel, LogLevelToLocalizedString } from '../../../../platform/log/common/log.js';
+import { ILoggerService } from '../../../../platform/log/common/log.service.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
+import { URI } from '../../../../base/common/uri.js';
+import '../../../../platform/instantiation/common/instantiation.js';
+import { basename, dirname, isEqual } from '../../../../base/common/resources.js';
+import { IOutputService } from '../../../services/output/common/output.service.js';
+import { telemetryLogId, extensionTelemetryLogChannelId } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IDefaultLogLevelsService } from './defaultLogLevels.service.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+
+var SetLogLevelAction_1;
+let SetLogLevelAction = class SetLogLevelAction extends Action {
+    static { SetLogLevelAction_1 = this; }
+    static { this.ID = 'workbench.action.setLogLevel'; }
+    static { this.TITLE = ( localize2(6166, "Set Log Level...")); }
+    constructor(id, label, quickInputService, loggerService, outputService, defaultLogLevelsService) {
+        super(id, label);
+        this.quickInputService = quickInputService;
+        this.loggerService = loggerService;
+        this.outputService = outputService;
+        this.defaultLogLevelsService = defaultLogLevelsService;
+    }
+    async run() {
+        const logLevelOrChannel = await this.selectLogLevelOrChannel();
+        if (logLevelOrChannel !== null) {
+            if (isLogLevel(logLevelOrChannel)) {
+                this.loggerService.setLogLevel(logLevelOrChannel);
+            }
+            else {
+                await this.setLogLevelForChannel(logLevelOrChannel);
+            }
+        }
+    }
+    async selectLogLevelOrChannel() {
+        const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
+        const extensionLogs = [], logs = [];
+        const logLevel = this.loggerService.getLogLevel();
+        for (const channel of this.outputService.getChannelDescriptors()) {
+            if (!SetLogLevelAction_1.isLevelSettable(channel) || !channel.file) {
+                continue;
+            }
+            const channelLogLevel = this.loggerService.getLogLevel(channel.file) ?? logLevel;
+            const item = { id: channel.id, resource: channel.file, label: channel.label, description: channelLogLevel !== logLevel ? this.getLabel(channelLogLevel) : undefined, extensionId: channel.extensionId };
+            if (channel.extensionId) {
+                extensionLogs.push(item);
+            }
+            else {
+                logs.push(item);
+            }
+        }
+        const entries = [];
+        entries.push({ type: 'separator', label: ( localize(6167, "All")) });
+        entries.push(...this.getLogLevelEntries(defaultLogLevels.default, this.loggerService.getLogLevel(), true));
+        if (extensionLogs.length) {
+            entries.push({ type: 'separator', label: ( localize(6168, "Extension Logs")) });
+            entries.push(...extensionLogs.sort((a, b) => a.label.localeCompare(b.label)));
+        }
+        entries.push({ type: 'separator', label: ( localize(6169, "Logs")) });
+        entries.push(...logs.sort((a, b) => a.label.localeCompare(b.label)));
+        return (
+             (new Promise((resolve, reject) => {
+                const disposables = ( (new DisposableStore()));
+                const quickPick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
+                quickPick.placeholder = ( localize(6170, "Set Log Level"));
+                quickPick.items = entries;
+                let selectedItem;
+                disposables.add(quickPick.onDidTriggerItemButton(e => {
+                    quickPick.hide();
+                    this.defaultLogLevelsService.setDefaultLogLevel(e.item.level);
+                }));
+                disposables.add(quickPick.onDidAccept(e => {
+                    selectedItem = quickPick.selectedItems[0];
+                    quickPick.hide();
+                }));
+                disposables.add(quickPick.onDidHide(() => {
+                    const result = selectedItem ? selectedItem.level ?? selectedItem : null;
+                    disposables.dispose();
+                    resolve(result);
+                }));
+                quickPick.show();
+            }))
+        );
+    }
+    static isLevelSettable(channel) {
+        return channel.log && channel.file !== undefined && channel.id !== telemetryLogId && channel.id !== extensionTelemetryLogChannelId;
+    }
+    async setLogLevelForChannel(logChannel) {
+        const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
+        const defaultLogLevel = defaultLogLevels.extensions.find(e => e[0] === logChannel.extensionId?.toLowerCase())?.[1] ?? defaultLogLevels.default;
+        const currentLogLevel = this.loggerService.getLogLevel(logChannel.resource) ?? defaultLogLevel;
+        const entries = this.getLogLevelEntries(defaultLogLevel, currentLogLevel, !!logChannel.extensionId);
+        return (
+             (new Promise((resolve, reject) => {
+                const disposables = ( (new DisposableStore()));
+                const quickPick = disposables.add(this.quickInputService.createQuickPick());
+                quickPick.placeholder = logChannel ? ( localize(6171, " {0}: Select log level", logChannel?.label)) : ( localize(6172, "Select log level"));
+                quickPick.items = entries;
+                quickPick.activeItems = entries.filter((entry) => entry.level === this.loggerService.getLogLevel());
+                let selectedItem;
+                disposables.add(quickPick.onDidTriggerItemButton(e => {
+                    quickPick.hide();
+                    this.defaultLogLevelsService.setDefaultLogLevel(e.item.level, logChannel.extensionId);
+                }));
+                disposables.add(quickPick.onDidAccept(e => {
+                    selectedItem = quickPick.selectedItems[0];
+                    quickPick.hide();
+                }));
+                disposables.add(quickPick.onDidHide(() => {
+                    if (selectedItem) {
+                        this.loggerService.setLogLevel(logChannel.resource, selectedItem.level);
+                    }
+                    disposables.dispose();
+                    resolve();
+                }));
+                quickPick.show();
+            }))
+        );
+    }
+    getLogLevelEntries(defaultLogLevel, currentLogLevel, canSetDefaultLogLevel) {
+        const button = canSetDefaultLogLevel ? { iconClass: ThemeIcon.asClassName(Codicon.checkAll), tooltip: ( localize(6173, "Set as Default Log Level")) } : undefined;
+        return [
+            { label: this.getLabel(LogLevel.Trace, currentLogLevel), level: LogLevel.Trace, description: this.getDescription(LogLevel.Trace, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Trace ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Debug, currentLogLevel), level: LogLevel.Debug, description: this.getDescription(LogLevel.Debug, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Debug ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Info, currentLogLevel), level: LogLevel.Info, description: this.getDescription(LogLevel.Info, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Info ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Warning, currentLogLevel), level: LogLevel.Warning, description: this.getDescription(LogLevel.Warning, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Warning ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Error, currentLogLevel), level: LogLevel.Error, description: this.getDescription(LogLevel.Error, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Error ? [button] : undefined },
+            { label: this.getLabel(LogLevel.Off, currentLogLevel), level: LogLevel.Off, description: this.getDescription(LogLevel.Off, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Off ? [button] : undefined },
+        ];
+    }
+    getLabel(level, current) {
+        const label = LogLevelToLocalizedString(level).value;
+        return level === current ? `$(check) ${label}` : label;
+    }
+    getDescription(level, defaultLogLevel) {
+        return defaultLogLevel === level ? ( localize(6174, "Default")) : undefined;
+    }
+};
+SetLogLevelAction = SetLogLevelAction_1 = ( (__decorate([
+    ( (__param(2, IQuickInputService))),
+    ( (__param(3, ILoggerService))),
+    ( (__param(4, IOutputService))),
+    ( (__param(5, IDefaultLogLevelsService)))
+], SetLogLevelAction)));
+(class OpenWindowSessionLogFileAction extends Action {
+    static { this.ID = 'workbench.action.openSessionLogFile'; }
+    static { this.TITLE = ( localize2(6175, "Open Window Log File (Session)...")); }
+    constructor(id, label, environmentService, fileService, quickInputService, editorService) {
+        super(id, label);
+        this.environmentService = environmentService;
+        this.fileService = fileService;
+        this.quickInputService = quickInputService;
+        this.editorService = editorService;
+    }
+    async run() {
+        const sessionResult = await this.quickInputService.pick(this.getSessions().then(sessions => ( (sessions.map((s, index) => ({
+            id: ( (s.toString())),
+            label: basename(s),
+            description: index === 0 ? ( localize(6176, "Current")) : undefined
+        }))))), {
+            canPickMany: false,
+            placeHolder: ( localize(6177, "Select Session"))
+        });
+        if (sessionResult) {
+            const logFileResult = await this.quickInputService.pick(this.getLogFiles(( (URI.parse(sessionResult.id)))).then(logFiles => ( (logFiles.map((s) => ({
+                id: ( (s.toString())),
+                label: basename(s)
+            }))))), {
+                canPickMany: false,
+                placeHolder: ( localize(6178, "Select Log file"))
+            });
+            if (logFileResult) {
+                return this.editorService.openEditor({ resource: ( (URI.parse(logFileResult.id))), options: { pinned: true } }).then(() => undefined);
+            }
+        }
+    }
+    async getSessions() {
+        const logsPath = this.environmentService.logsHome.with({ scheme: this.environmentService.logFile.scheme });
+        const result = [logsPath];
+        const stat = await this.fileService.resolve(dirname(logsPath));
+        if (stat.children) {
+            result.push(...( (stat.children
+                .filter(stat => !isEqual(stat.resource, logsPath) && stat.isDirectory && /^\d{8}T\d{6}$/.test(stat.name))
+                .sort()
+                .reverse()
+                .map(d => d.resource))));
+        }
+        return result;
+    }
+    async getLogFiles(session) {
+        const stat = await this.fileService.resolve(session);
+        if (stat.children) {
+            return (
+                 (stat.children.filter(stat => !stat.isDirectory).map(stat => stat.resource))
+            );
+        }
+        return [];
+    }
+});
+
+export { SetLogLevelAction };

package/vscode/src/vs/workbench/contrib/mappedEdits/common/mappedEdits.contribution.js

@@ -2,6 +2,7 @@ import { CancellationTokenSource } from '../../../../base/common/cancellation.js
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+
 CommandsRegistry.registerCommand('_executeMappedEditsProvider', async (accessor, documentUri, codeBlocks, context) => {
     const modelService = accessor.get(ITextModelService);
     const langFeaturesService = accessor.get(ILanguageFeaturesService);