@codingame/monaco-vscode-extensions-service-override 1.85.0 → 1.85.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "1.85.0",
+  "version": "1.85.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,9 +18,9 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.1",
     "monaco-editor": "0.45.0",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "1.85.0"
+    "@codingame/monaco-vscode-files-service-override": "1.85.1"
   }
 }

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js

@@ -9,11 +9,11 @@ import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/ser
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ChatInputPart } from '../../contrib/chat/browser/chatInputPart.js';
-import { AddDynamicVariableAction } from '../../contrib/chat/browser/contrib/chatDynamicVariables.js';
+import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { AddDynamicVariableAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { ChatRequestAgentPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '../../contrib/chat/common/chatRequestParser.js';
+import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 

package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js

@@ -30,7 +30,7 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
-import { ResourceWorkingCopy } from '../../services/workingCopy/common/resourceWorkingCopy.js';
+import { ResourceWorkingCopy } from 'vscode/vscode/vs/workbench/services/workingCopy/common/resourceWorkingCopy';
 import { NO_TYPE_ID } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';

package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js

@@ -8,7 +8,7 @@ import { editorGroupToColumn, columnToEditorGroup } from 'vscode/vscode/vs/workb
 import { IEditorGroupsService, preferredSideBySideGroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService, SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { NotebookEditorInput } from '../../../../../../override/vs/workbench/contrib/notebook/common/notebookEditorInput.js';
+import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
@@ -18,9 +18,9 @@ import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/
 import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { isGroupEditorMoveEvent } from 'vscode/vscode/vs/workbench/common/editor/editorGroupModel';
 import { InteractiveEditorInput } from '../../contrib/interactive/browser/interactiveEditorInput.js';
-import { MergeEditorInput } from '../../contrib/mergeEditor/browser/mergeEditorInput.js';
+import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { ChatEditorInput } from '../../contrib/chat/browser/chatEditorInput.js';
+import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 
 let MainThreadEditorTabs = class MainThreadEditorTabs {
     constructor(extHostContext, _editorGroupsService, _configurationService, _logService, editorService) {

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js

@@ -5,7 +5,7 @@ import { extHostCustomer } from '../../services/extensions/common/extHostCustome
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { raceCancellationError } from 'monaco-editor/esm/vs/base/common/async.js';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { NotebookFileWorkingCopyModel } from '../../contrib/notebook/common/notebookEditorModel.js';
+import { NotebookFileWorkingCopyModel } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 
 class ExtHostNotebookDocumentSaveParticipant {
     constructor(extHostContext) {

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

@@ -12,8 +12,8 @@ import { CommentGlyphWidget } from './commentGlyphWidget.js';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService';
 import { EDITOR_FONT_DEFAULTS } from 'monaco-editor/esm/vs/editor/common/config/editorOptions.js';
 import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
-import { CommentThreadWidget } from './commentThreadWidget.js';
-import { commentThreadStateColorVar, commentThreadStateBackgroundColorVar, getCommentThreadStateBorderColor } from './commentColors.js';
+import { CommentThreadWidget } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentThreadWidget';
+import { commentThreadStateColorVar, commentThreadStateBackgroundColorVar, getCommentThreadStateBorderColor } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentColors';
 import { peekViewBorder } from 'monaco-editor/esm/vs/editor/contrib/peekView/browser/peekView.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 

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

@@ -5,7 +5,7 @@ import { findFirstIdxMonotonousOrArrLen } from 'monaco-editor/esm/vs/base/common
 import { createCancelablePromise, Delayer } from 'monaco-editor/esm/vs/base/common/async.js';
 import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { DisposableStore, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import './media/review.css.js';
+import 'vscode/vscode/vs/workbench/contrib/comments/browser/media/review.css';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { EditorType } from 'monaco-editor/esm/vs/editor/common/editorCommon.js';
@@ -23,8 +23,8 @@ import { EmbeddedCodeEditorWidget } from 'monaco-editor/esm/vs/editor/browser/wi
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
 import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { COMMENTS_SECTION } from '../common/commentsConfiguration.js';
-import { COMMENTEDITOR_DECORATION_KEY } from './commentReply.js';
+import { COMMENTS_SECTION } from 'vscode/vscode/vs/workbench/contrib/comments/common/commentsConfiguration';
+import { COMMENTEDITOR_DECORATION_KEY } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentReply';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { CommentThreadRangeDecorator } from './commentThreadRangeDecorator.js';

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

@@ -10,10 +10,10 @@ import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/com
 import { IListService, WorkbenchObjectTree } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
 import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { TimestampWidget } from './timestamp.js';
+import { TimestampWidget } from 'vscode/vscode/vs/workbench/contrib/comments/browser/timestamp';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { commentViewThreadStateColorVar, getCommentThreadStateIconColor } from './commentColors.js';
+import { commentViewThreadStateColorVar, getCommentThreadStateIconColor } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentColors';
 import { CommentThreadState } from 'monaco-editor/esm/vs/editor/common/languages.js';
 import { FilterOptions } from './commentsFilterOptions.js';
 import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';

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

@@ -9,7 +9,7 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 import { IInteractiveDocumentService } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveDocumentService';
 import { IInteractiveHistoryService } from './interactiveHistoryService.js';
-import { NotebookEditorInput } from '../../../../../../../override/vs/workbench/contrib/notebook/common/notebookEditorInput.js';
+import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 

package/override/vs/workbench/contrib/notebook/common/notebookEditorInput.js

@@ -1,3 +0,0 @@
-class NotebookEditorInput {}
-
-export { NotebookEditorInput };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js

@@ -1,40 +0,0 @@
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
-import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_REQUEST_IN_PROGRESS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-
-class SubmitAction extends Action2 {
-    static { this.ID = 'workbench.action.chat.submit'; }
-    constructor() {
-        super({
-            id: SubmitAction.ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatExecuteActions',
-                    'interactive.submit.label',
-                    "Submit"
-                )),
-                original: 'Submit'
-            },
-            f1: false,
-            category: CHAT_CATEGORY,
-            icon: Codicon.send,
-            precondition: CONTEXT_CHAT_INPUT_HAS_TEXT,
-            menu: {
-                id: MenuId.ChatExecute,
-                when: ( CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate()),
-                group: 'navigation',
-            },
-        });
-    }
-    run(accessor, ...args) {
-        const context = args[0];
-        const widgetService = accessor.get(IChatWidgetService);
-        const widget = context?.widget ?? widgetService.lastFocusedWidget;
-        widget?.acceptInput(context?.inputValue);
-    }
-}
-
-export { SubmitAction };

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js

@@ -1,141 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { toDisposable, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
-import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
-
-var ChatEditorInput_1;
-let ChatEditorInput = class ChatEditorInput extends EditorInput {
-    static { ChatEditorInput_1 = this; }
-    static { this.countsInUse = ( new Set()); }
-    static { this.TypeID = 'workbench.input.chatSession'; }
-    static { this.EditorID = 'workbench.editor.chatSession'; }
-    static getNewEditorUri() {
-        const handle = Math.floor(Math.random() * 1e9);
-        return ChatUri.generate(handle);
-    }
-    static getNextCount() {
-        let count = 0;
-        while (( ChatEditorInput_1.countsInUse.has(count))) {
-            count++;
-        }
-        return count;
-    }
-    constructor(resource, options, chatService) {
-        super();
-        this.resource = resource;
-        this.options = options;
-        this.chatService = chatService;
-        const parsed = ChatUri.parse(resource);
-        if (typeof parsed?.handle !== 'number') {
-            throw new Error('Invalid chat URI');
-        }
-        this.sessionId = 'sessionId' in options.target ? options.target.sessionId : undefined;
-        this.providerId = 'providerId' in options.target ? options.target.providerId : undefined;
-        this.inputCount = ChatEditorInput_1.getNextCount();
-        ChatEditorInput_1.countsInUse.add(this.inputCount);
-        this._register(toDisposable(() => ChatEditorInput_1.countsInUse.delete(this.inputCount)));
-    }
-    get editorId() {
-        return ChatEditorInput_1.EditorID;
-    }
-    get capabilities() {
-        return super.capabilities | 8 ;
-    }
-    matches(otherInput) {
-        return otherInput instanceof ChatEditorInput_1 && ( otherInput.resource.toString()) === ( this.resource.toString());
-    }
-    get typeId() {
-        return ChatEditorInput_1.TypeID;
-    }
-    getName() {
-        return this.model?.title || ( nls.localizeWithPath(
-            'vs/workbench/contrib/chat/browser/chatEditorInput',
-            'chatEditorName',
-            "Chat"
-        )) + (this.inputCount > 0 ? ` ${this.inputCount + 1}` : '');
-    }
-    getLabelExtraClasses() {
-        return ['chat-editor-label'];
-    }
-    async resolve() {
-        if (typeof this.sessionId === 'string') {
-            this.model = this.chatService.getOrRestoreSession(this.sessionId);
-        }
-        else if (typeof this.providerId === 'string') {
-            this.model = this.chatService.startSession(this.providerId, CancellationToken.None);
-        }
-        else if ('data' in this.options.target) {
-            this.model = this.chatService.loadSessionFromContent(this.options.target.data);
-        }
-        if (!this.model) {
-            return null;
-        }
-        this.sessionId = this.model.sessionId;
-        this.providerId = this.model.providerId;
-        this._register(this.model.onDidChange(() => this._onDidChangeLabel.fire()));
-        return this._register(( new ChatEditorModel(this.model)));
-    }
-    dispose() {
-        super.dispose();
-        if (this.sessionId) {
-            this.chatService.clearSession(this.sessionId);
-        }
-    }
-};
-ChatEditorInput = ChatEditorInput_1 = ( __decorate([
-    ( __param(2, IChatService))
-], ChatEditorInput));
-class ChatEditorModel extends Disposable {
-    constructor(model) {
-        super();
-        this.model = model;
-        this._onWillDispose = this._register(( new Emitter()));
-        this.onWillDispose = this._onWillDispose.event;
-        this._isDisposed = false;
-        this._isResolved = false;
-    }
-    async resolve() {
-        this._isResolved = true;
-    }
-    isResolved() {
-        return this._isResolved;
-    }
-    isDisposed() {
-        return this._isDisposed;
-    }
-    dispose() {
-        super.dispose();
-        this._isDisposed = true;
-    }
-}
-var ChatUri;
-( (function(ChatUri) {
-    ChatUri.scheme = Schemas.vscodeChatSesssion;
-    function generate(handle) {
-        return ( URI.from({ scheme: ChatUri.scheme, path: `chat-${handle}` }));
-    }
-    ChatUri.generate = generate;
-    function parse(resource) {
-        if (resource.scheme !== ChatUri.scheme) {
-            return undefined;
-        }
-        const match = resource.path.match(/chat-(\d+)/);
-        const handleStr = match?.[1];
-        if (typeof handleStr !== 'string') {
-            return undefined;
-        }
-        const handle = parseInt(handleStr);
-        if (isNaN(handle)) {
-            return undefined;
-        }
-        return { handle };
-    }
-    ChatUri.parse = parse;
-})(ChatUri || (ChatUri = {})));
-
-export { ChatEditorInput, ChatEditorModel, ChatUri };

package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js

@@ -1,37 +0,0 @@
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Button } from 'monaco-editor/esm/vs/base/browser/ui/button/button.js';
-import { MarkdownString } from 'monaco-editor/esm/vs/base/common/htmlContent.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-
-const $ = dom.$;
-class ChatFollowups extends Disposable {
-    constructor(container, followups, options, clickHandler, contextService) {
-        super();
-        this.options = options;
-        this.clickHandler = clickHandler;
-        this.contextService = contextService;
-        const followupsContainer = dom.append(container, $('.interactive-session-followups'));
-        followups.forEach(followup => this.renderFollowup(followupsContainer, followup));
-    }
-    renderFollowup(container, followup) {
-        if (followup.kind === 'command' && followup.when && !this.contextService.contextMatchesRules(ContextKeyExpr.deserialize(followup.when))) {
-            return;
-        }
-        const tooltip = 'tooltip' in followup ? followup.tooltip : undefined;
-        const button = this._register(( new Button(container, { ...this.options, supportIcons: true, title: tooltip })));
-        if (followup.kind === 'reply') {
-            button.element.classList.add('interactive-followup-reply');
-        }
-        else if (followup.kind === 'command') {
-            button.element.classList.add('interactive-followup-command');
-        }
-        const label = followup.kind === 'reply' ?
-            '$(sparkle) ' + (followup.title || followup.message) :
-            followup.title;
-        button.label = ( new MarkdownString(label, { supportThemeIcons: true }));
-        this._register(button.onDidClick(() => this.clickHandler(followup)));
-    }
-}
-
-export { ChatFollowups };