@codingame/monaco-vscode-api 4.5.1 → 5.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js

@@ -40,6 +40,7 @@ import { CellKind } from '../../../common/notebookCommon.js';
 import { NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 var NotebookChatController_1;
+const _moduleId = "vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController";
 class NotebookChatWidget extends Disposable {
     set afterModelPosition(afterModelPosition) {
         this.notebookViewZone.afterModelPosition = afterModelPosition;
@@ -156,7 +157,7 @@ class NotebookChatWidget extends Disposable {
         const leftMargin = this._notebookEditor.notebookOptions.getCellEditorContainerLeftMargin();
         const maxWidth = 640;
         const width = Math.min(maxWidth, this._notebookEditor.getLayoutInfo().width - leftMargin - rightMargin);
-        inlineChatWidget.layout(( new Dimension(width, this.heightInPx)));
+        inlineChatWidget.layout(( (new Dimension(width, this.heightInPx))));
         inlineChatWidget.domNode.style.width = `${width}px`;
         widgetContainer.style.left = `${leftMargin}px`;
     }
@@ -170,13 +171,13 @@ class NotebookChatWidget extends Disposable {
 }
 class NotebookCellTextModelLikeId {
     static str(k) {
-        return `${k.viewType}/${( k.uri.toString())}`;
+        return `${k.viewType}/${( (k.uri.toString()))}`;
     }
     static obj(s) {
         const idx = s.indexOf('/');
         return {
             viewType: s.substring(0, idx),
-            uri: ( URI.parse(s.substring(idx + 1)))
+            uri: ( (URI.parse(s.substring(idx + 1))))
         };
     }
 }
@@ -204,11 +205,11 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         this._storageService = _storageService;
         this._historyOffset = -1;
         this._historyCandidate = '';
-        this._promptCache = ( new LRUCache(1000, 0.7));
-        this._onDidChangePromptCache = this._register(( new Emitter()));
+        this._promptCache = ( (new LRUCache(1000, 0.7)));
+        this._onDidChangePromptCache = this._register(( (new Emitter())));
         this.onDidChangePromptCache = this._onDidChangePromptCache.event;
-        this._userEditingDisposables = this._register(( new DisposableStore()));
-        this._widgetDisposableStore = this._register(( new DisposableStore()));
+        this._userEditingDisposables = this._register(( (new DisposableStore())));
+        this._widgetDisposableStore = this._register(( (new DisposableStore())));
         this._ctxHasActiveRequest = CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.bindTo(this._contextKeyService);
         this._ctxCellWidgetFocused = CTX_NOTEBOOK_CELL_CHAT_FOCUSED.bindTo(this._contextKeyService);
         this._ctxLastResponseType = CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.bindTo(this._contextKeyService);
@@ -314,16 +315,8 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             statusMenuId: MENU_CELL_CHAT_WIDGET_STATUS,
             feedbackMenuId: MENU_CELL_CHAT_WIDGET_FEEDBACK
         }));
-        inlineChatWidget.placeholder = ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController',
-            'default.placeholder',
-            "Ask a question"
-        ));
-        inlineChatWidget.updateInfo(( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController',
-            'welcome.1',
-            "AI-generated code may be incorrect"
-        )));
+        inlineChatWidget.placeholder = ( localizeWithPath(_moduleId, 0, "Ask a question"));
+        inlineChatWidget.updateInfo(( localizeWithPath(_moduleId, 1, "AI-generated code may be incorrect")));
         widgetContainer.appendChild(inlineChatWidget.domNode);
         this._widgetDisposableStore.add(inlineChatWidget.onDidChangeInput(() => {
             this._warmupRequestCts?.dispose(true);
@@ -337,7 +330,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             };
             const id = accessor.addZone(notebookViewZone);
             this._scrollWidgetIntoView(index);
-            this._widget = ( new NotebookChatWidget(
+            this._widget = ( (new NotebookChatWidget(
                 this._notebookEditor,
                 id,
                 notebookViewZone,
@@ -346,7 +339,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
                 inlineChatWidget,
                 fakeParentEditor,
                 this._languageService
-            ));
+            )));
             if (initEditingCell) {
                 this._widget.restoreEditingCell(initEditingCell);
                 this._updateUserEditingState();
@@ -358,19 +351,11 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             this._sessionCtor = createCancelablePromise(async (token) => {
                 if (fakeParentEditor.hasModel()) {
                     await this._startSession(fakeParentEditor, token);
-                    this._warmupRequestCts = ( new CancellationTokenSource());
+                    this._warmupRequestCts = ( (new CancellationTokenSource()));
                     this._startInitialFolowups(fakeParentEditor, this._warmupRequestCts.token);
                     if (this._widget) {
-                        this._widget.inlineChatWidget.placeholder = this._activeSession?.session.placeholder ?? ( localizeWithPath(
-                            'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController',
-                            'default.placeholder',
-                            "Ask a question"
-                        ));
-                        this._widget.inlineChatWidget.updateInfo(this._activeSession?.session.message ?? ( localizeWithPath(
-                            'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController',
-                            'welcome.1',
-                            "AI-generated code may be incorrect"
-                        )));
+                        this._widget.inlineChatWidget.placeholder = this._activeSession?.session.placeholder ?? ( localizeWithPath(_moduleId, 0, "Ask a question"));
+                        this._widget.inlineChatWidget.updateInfo(this._activeSession?.session.message ?? ( localizeWithPath(_moduleId, 1, "AI-generated code may be incorrect")));
                         this._widget.inlineChatWidget.updateSlashCommands(this._activeSession?.session.slashCommands ?? []);
                         this._focusWidget();
                     }
@@ -416,7 +401,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         assertType(this._activeSession);
         this._warmupRequestCts?.dispose(true);
         this._warmupRequestCts = undefined;
-        this._activeSession.addInput(( new SessionPrompt(this._widget.inlineChatWidget.value, 0, true)));
+        this._activeSession.addInput(( (new SessionPrompt(this._widget.inlineChatWidget.value))));
         assertType(this._activeSession.lastInput);
         const value = this._activeSession.lastInput.value;
         this._historyUpdate(value);
@@ -448,7 +433,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         const request = {
             requestId: generateUuid(),
             prompt: value,
-            attempt: this._activeSession.lastInput.attempt,
+            attempt: 0,
             selection: { selectionStartLineNumber: 1, selectionStartColumn: 1, positionLineNumber: 1, positionColumn: 1 },
             wholeRange: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
             live: true,
@@ -456,14 +441,14 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             withIntentDetection: true,
         };
         this._activeRequestCts?.cancel();
-        this._activeRequestCts = ( new CancellationTokenSource());
+        this._activeRequestCts = ( (new CancellationTokenSource()));
         const progressEdits = [];
-        const progressiveEditsQueue = ( new Queue());
+        const progressiveEditsQueue = ( (new Queue()));
         const progressiveEditsClock = StopWatch.create();
-        const progressiveEditsAvgDuration = ( new MovingAverage());
-        const progressiveEditsCts = ( new CancellationTokenSource(this._activeRequestCts.token));
+        const progressiveEditsAvgDuration = ( (new MovingAverage()));
+        const progressiveEditsCts = ( (new CancellationTokenSource(this._activeRequestCts.token)));
         let progressiveChatResponse;
-        const progress = ( new AsyncProgress(async (data) => {
+        const progress = ( (new AsyncProgress(async (data) => {
             if (this._activeRequestCts?.token.isCancellationRequested) {
                 return;
             }
@@ -473,7 +458,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             }
             if (data.edits?.length) {
                 if (!request.live) {
-                    throw new Error('Progress in NOT supported in non-live mode');
+                    throw ( (new Error('Progress in NOT supported in non-live mode')));
                 }
                 progressEdits.push(data.edits);
                 progressiveEditsAvgDuration.update(progressiveEditsClock.elapsed());
@@ -487,11 +472,10 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             if (data.markdownFragment) {
                 if (!progressiveChatResponse) {
                     const message = {
-                        message: ( new MarkdownString(
+                        message: ( (new MarkdownString(
                             data.markdownFragment,
                             { supportThemeIcons: true, supportHtml: true, isTrusted: false }
-                        )),
-                        providerId: this._activeSession.provider.label,
+                        ))),
                         requestId: request.requestId,
                     };
                     progressiveChatResponse = this._widget?.inlineChatWidget.updateChatMessage(message, true);
@@ -500,7 +484,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
                     progressiveChatResponse.appendContent(data.markdownFragment);
                 }
             }
-        }));
+        })));
         const task = this._activeSession.provider.provideResponse(this._activeSession.session, request, progress, this._activeRequestCts.token);
         let response;
         try {
@@ -515,16 +499,16 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             }
             await progress.drain();
             if (!reply) {
-                response = ( new EmptyResponse());
+                response = ( (new EmptyResponse()));
             }
             else {
-                const markdownContents = ( new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false }));
-                const replyResponse = response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), progressEdits, request.requestId);
+                const markdownContents = ( (new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false })));
+                const replyResponse = response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), progressEdits, request.requestId, undefined);
                 for (let i = progressEdits.length; i < replyResponse.allLocalEdits.length; i++) {
                     await this._makeChanges(replyResponse.allLocalEdits[i], undefined);
                 }
                 if (this._activeSession?.provider.provideFollowups) {
-                    const followupCts = ( new CancellationTokenSource());
+                    const followupCts = ( (new CancellationTokenSource()));
                     const followups = await this._activeSession.provider.provideFollowups(this._activeSession.session, replyResponse.raw, followupCts.token);
                     if (followups && this._widget) {
                         const widget = this._widget;
@@ -557,7 +541,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             }
         }
         catch (e) {
-            response = ( new ErrorResponse(e));
+            response = ( (new ErrorResponse(e)));
         }
         finally {
             this._ctxHasActiveRequest.set(false);
@@ -569,7 +553,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         this._widget?.inlineChatWidget.updateProgress(false);
         this._widget?.inlineChatWidget.updateInfo('');
         this._widget?.inlineChatWidget.updateToolbar(true);
-        this._activeSession?.addExchange(( new SessionExchange(this._activeSession.lastInput, response)));
+        this._activeSession?.addExchange(( (new SessionExchange(this._activeSession.lastInput, response))));
         this._ctxLastResponseType.set(response instanceof ReplyResponse ? response.raw.type : undefined);
     }
     async _startSession(editor, token) {
@@ -581,7 +565,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             return;
         }
         this._activeSession = session;
-        this._strategy = ( new EditStrategy(session));
+        this._strategy = ( (new EditStrategy(session)));
     }
     async _startInitialFolowups(editor, token) {
         if (!this._activeSession || !this._activeSession.provider.provideFollowups) {
@@ -597,7 +581,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             previewDocument: editor.getModel().uri,
             withIntentDetection: true
         };
-        const progress = ( new AsyncProgress(async (data) => { }));
+        const progress = ( (new AsyncProgress(async (data) => { })));
         const task = this._activeSession.provider.provideResponse(this._activeSession.session, request, progress, token);
         const reply = await raceCancellationError(Promise.resolve(task), token);
         if (token.isCancellationRequested) {
@@ -606,8 +590,8 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         if (!reply) {
             return;
         }
-        const markdownContents = ( new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false }));
-        const response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), [], request.requestId);
+        const markdownContents = ( (new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false })));
+        const response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), [], request.requestId, undefined);
         const followups = await this._activeSession.provider.provideFollowups(this._activeSession.session, response.raw, token);
         if (followups && this._widget) {
             const widget = this._widget;
@@ -637,7 +621,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             return;
         }
         const actualEdits = !opts && moreMinimalEdits ? moreMinimalEdits : edits;
-        const editOperations = ( actualEdits.map(TextEdit.asEditOperation));
+        const editOperations = ( (actualEdits.map(TextEdit.asEditOperation)));
         this._inlineChatSavingService.markChanged(this._activeSession);
         try {
             this._activeSession.wholeRange.trackEdits(editOperations);
@@ -802,7 +786,9 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             return false;
         }
         const cellId = NotebookCellTextModelLikeId.str({ uri: cell.uri, viewType: this._notebookEditor.textModel.viewType });
-        return ( this._promptCache.has(cellId));
+        return (
+             (this._promptCache.has(cellId))
+        );
     }
     getPromptFromCache(cell) {
         if (!this._notebookEditor.hasModel()) {
@@ -816,18 +802,18 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         super.dispose();
     }
 };
-NotebookChatController = NotebookChatController_1 = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IInlineChatSessionService)),
-    ( __param(3, IContextKeyService)),
-    ( __param(4, ICommandService)),
-    ( __param(5, IEditorWorkerService)),
-    ( __param(6, IInlineChatSavingService)),
-    ( __param(7, IModelService)),
-    ( __param(8, ILanguageService)),
-    ( __param(9, INotebookExecutionStateService)),
-    ( __param(10, IStorageService))
-], NotebookChatController));
+NotebookChatController = NotebookChatController_1 = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IInlineChatSessionService))),
+    ( (__param(3, IContextKeyService))),
+    ( (__param(4, ICommandService))),
+    ( (__param(5, IEditorWorkerService))),
+    ( (__param(6, IInlineChatSavingService))),
+    ( (__param(7, IModelService))),
+    ( (__param(8, ILanguageService))),
+    ( (__param(9, INotebookExecutionStateService))),
+    ( (__param(10, IStorageService)))
+], NotebookChatController)));
 class EditStrategy {
     constructor(_session) {
         this._session = _session;
@@ -841,7 +827,7 @@ class EditStrategy {
         for (const edit of edits) {
             const wordCount = countWords(edit.text ?? '');
             const speed = wordCount / durationInSec;
-            await performAsyncTextEdit(editor.getModel(), asProgressiveEdit(( new WindowIntervalTimer()), edit, speed, opts.token));
+            await performAsyncTextEdit(editor.getModel(), asProgressiveEdit(( (new WindowIntervalTimer())), edit, speed, opts.token));
         }
     }
     async makeChanges(editor, edits) {

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js

@@ -9,12 +9,9 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 import { INotebookEditorService } from '../services/notebookEditorService.service.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { isEqual } from '../../../../../base/common/resources.js';
+const _moduleId = "vs/workbench/contrib/notebook/browser/controller/coreActions";
 const SELECT_KERNEL_ID = '_notebook.selectKernel';
-const NOTEBOOK_ACTIONS_CATEGORY = ( localize2WithPath(
-    'vs/workbench/contrib/notebook/browser/controller/coreActions',
-    'notebookActions.category',
-    'Notebook'
-));
+const NOTEBOOK_ACTIONS_CATEGORY = ( localize2WithPath(_moduleId, 0, 'Notebook'));
 const CELL_TITLE_CELL_GROUP_ID = 'inline/cell';
 const CELL_TITLE_OUTPUT_GROUP_ID = 'inline/output';
 const NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT = 100 ;
@@ -34,7 +31,7 @@ function getContextFromActiveEditor(editorService) {
 }
 function getWidgetFromUri(accessor, uri) {
     const notebookEditorService = accessor.get(INotebookEditorService);
-    const widget = notebookEditorService.listNotebookEditors().find(widget => widget.hasModel() && ( widget.textModel.uri.toString()) === ( uri.toString()));
+    const widget = notebookEditorService.listNotebookEditors().find(widget => widget.hasModel() && ( (widget.textModel.uri.toString())) === ( (uri.toString())));
     if (widget && widget.hasModel()) {
         return widget;
     }
@@ -68,7 +65,7 @@ class NotebookAction extends Action2 {
             desc.f1 = false;
             const f1Menu = {
                 id: MenuId.CommandPalette,
-                when: ( ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR))
+                when: ( (ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR)))
             };
             if (!desc.menu) {
                 desc.menu = [];
@@ -186,10 +183,10 @@ class NotebookCellAction extends NotebookAction {
         }
     }
 }
-const executeNotebookCondition = ( ContextKeyExpr.or(
+const executeNotebookCondition = ( (ContextKeyExpr.or(
     ContextKeyExpr.greater(NOTEBOOK_KERNEL_COUNT.key, 0),
     ContextKeyExpr.greater(NOTEBOOK_KERNEL_SOURCE_COUNT.key, 0)
-));
+)));
 function isMultiCellArgs(arg) {
     if (arg === undefined) {
         return false;
@@ -198,7 +195,7 @@ function isMultiCellArgs(arg) {
     if (!ranges) {
         return false;
     }
-    if (!Array.isArray(ranges) || ( ranges.some(range => !isICellRange(range)))) {
+    if (!Array.isArray(ranges) || ( (ranges.some(range => !isICellRange(range))))) {
         return false;
     }
     if (arg.document) {
@@ -228,7 +225,7 @@ function parseMultiCellExecutionArgs(accessor, ...args) {
             return;
         }
         const ranges = firstArg.ranges;
-        const selectedCells = ( ranges.map(range => editor.getCellsInRange(range).slice(0))).flat();
+        const selectedCells = ( (ranges.map(range => editor.getCellsInRange(range).slice(0)))).flat();
         const autoReveal = firstArg.autoReveal;
         return {
             ui: false,
@@ -297,30 +294,18 @@ const cellExecutionArgs = [
 ];
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
     submenu: MenuId.NotebookCellInsert,
-    title: ( localizeWithPath(
-        'vs/workbench/contrib/notebook/browser/controller/coreActions',
-        'notebookMenu.insertCell',
-        "Insert Cell"
-    )),
+    title: ( localizeWithPath(_moduleId, 1, "Insert Cell")),
     group: "2_insert" ,
-    when: ( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true))
+    when: ( (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)))
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.NotebookCellTitle,
-    title: ( localizeWithPath(
-        'vs/workbench/contrib/notebook/browser/controller/coreActions',
-        'notebookMenu.cellTitle',
-        "Notebook Cell"
-    )),
+    title: ( localizeWithPath(_moduleId, 2, "Notebook Cell")),
     group: "2_insert" ,
     when: NOTEBOOK_EDITOR_FOCUSED
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
-    title: ( localizeWithPath(
-        'vs/workbench/contrib/notebook/browser/controller/coreActions',
-        'miShare',
-        "Share"
-    )),
+    title: ( localizeWithPath(_moduleId, 3, "Share")),
     submenu: MenuId.EditorContextShare,
     group: "4_share"
 });