@codingame/monaco-vscode-api 8.0.3 → 9.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js

@@ -59,10 +59,10 @@ function toKernelQuickPick(kernel, selected) {
     };
     if (kernel.id === selected?.id) {
         if (!res.description) {
-            res.description = ( localize(7818, "Currently Selected"));
+            res.description = ( localize(8062, "Currently Selected"));
         }
         else {
-            res.description = ( localize(7819, "{0} - Currently Selected", res.description));
+            res.description = ( localize(8063, "{0} - Currently Selected", res.description));
         }
     }
     return res;
@@ -101,21 +101,24 @@ class KernelPickerStrategyBase {
             this._selecteKernel(notebook, newKernel);
             return true;
         }
-        const quickPick = this._quickInputService.createQuickPick();
+        const localDisposableStore = ( (new DisposableStore()));
+        const quickPick = localDisposableStore.add(this._quickInputService.createQuickPick({ useSeparators: true }));
         const quickPickItems = this._getKernelPickerQuickPickItems(notebook, matchResult, this._notebookKernelService, scopedContextKeyService);
         if (quickPickItems.length === 1 && supportAutoRun(quickPickItems[0]) && !skipAutoRun) {
-            return await this._handleQuickPick(editor, quickPickItems[0], quickPickItems);
+            const picked = await this._handleQuickPick(editor, quickPickItems[0], quickPickItems);
+            localDisposableStore.dispose();
+            return picked;
         }
         quickPick.items = quickPickItems;
         quickPick.canSelectMany = false;
         quickPick.placeholder = selected
             ? ( localize(
-            7820,
+            8064,
             "Change kernel for '{0}'",
             this._labelService.getUriLabel(notebook.uri, { relative: true })
         ))
             : ( localize(
-            7821,
+            8065,
             "Select kernel for '{0}'",
             this._labelService.getUriLabel(notebook.uri, { relative: true })
         ));
@@ -153,7 +156,7 @@ class KernelPickerStrategyBase {
             quickPick.activeItems = activeItems;
         }, this);
         const pick = await ( (new Promise((resolve, reject) => {
-            quickPick.onDidAccept(() => {
+            localDisposableStore.add(quickPick.onDidAccept(() => {
                 const item = quickPick.selectedItems[0];
                 if (item) {
                     resolve({ selected: item, items: quickPick.items });
@@ -162,15 +165,16 @@ class KernelPickerStrategyBase {
                     resolve({ selected: undefined, items: quickPick.items });
                 }
                 quickPick.hide();
-            });
-            quickPick.onDidHide(() => {
+            }));
+            localDisposableStore.add(quickPick.onDidHide(() => {
                 kernelDetectionTaskListener.dispose();
                 kernelChangeEventListener.dispose();
                 quickPick.dispose();
                 resolve({ selected: undefined, items: quickPick.items });
-            });
+            }));
             quickPick.show();
         })));
+        localDisposableStore.dispose();
         if (pick.selected) {
             return await this._handleQuickPick(editor, pick.selected, pick.items);
         }
@@ -266,13 +270,13 @@ class KernelPickerStrategyBase {
             quickPickItems.push({
                 id: 'installSuggested',
                 description: suggestedExtension.displayName ?? suggestedExtension.extensionIds.join(', '),
-                label: `$(${Codicon.lightbulb.id}) ` + ( localize(7822, 'Install/Enable suggested extensions')),
+                label: `$(${Codicon.lightbulb.id}) ` + ( localize(8066, 'Install/Enable suggested extensions')),
                 extensionIds: suggestedExtension.extensionIds
             });
         }
         quickPickItems.push({
             id: 'install',
-            label: ( localize(7823, "Browse marketplace for kernel extensions")),
+            label: ( localize(8067, "Browse marketplace for kernel extensions")),
         });
         return quickPickItems;
     }
@@ -319,7 +323,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         }
         quickPickItems.push({
             id: 'selectAnother',
-            label: ( localize(7824, "Select Another Kernel...")),
+            label: ( localize(8068, "Select Another Kernel...")),
             autoRun: shouldAutoRun
         });
         return quickPickItems;
@@ -351,10 +355,10 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
     async displaySelectAnotherQuickPick(editor, kernelListEmpty) {
         const notebook = editor.textModel;
         const disposables = ( (new DisposableStore()));
-        const quickPick = this._quickInputService.createQuickPick();
+        const quickPick = disposables.add(this._quickInputService.createQuickPick({ useSeparators: true }));
         const quickPickItem = await ( (new Promise(resolve => {
-            quickPick.title = kernelListEmpty ? ( localize(7825, "Select Kernel")) : ( localize(7826, "Select Another Kernel"));
-            quickPick.placeholder = ( localize(7827, "Type to choose a kernel source"));
+            quickPick.title = kernelListEmpty ? ( localize(8069, "Select Kernel")) : ( localize(8070, "Select Another Kernel"));
+            quickPick.placeholder = ( localize(8071, "Type to choose a kernel source"));
             quickPick.busy = true;
             quickPick.buttons = [this._quickInputService.backButton];
             quickPick.show();
@@ -363,12 +367,12 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
                     resolve(button);
                 }
             }));
-            quickPick.onDidTriggerItemButton(async (e) => {
+            disposables.add(quickPick.onDidTriggerItemButton(async (e) => {
                 if (isKernelSourceQuickPickItem(e.item) && e.item.documentation !== undefined) {
                     const uri = URI.isUri(e.item.documentation) ? ( (URI.parse(e.item.documentation))) : await this._commandService.executeCommand(e.item.documentation);
                     void this._openerService.open(uri, { openExternal: true });
                 }
-            });
+            }));
             disposables.add(quickPick.onDidAccept(async () => {
                 resolve(quickPick.selectedItems[0]);
             }));
@@ -473,7 +477,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         quickPickItems.push(...( (validActions.map(action => {
             const buttons = action.documentation ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.info),
-                    tooltip: ( localize(7828, 'Learn More')),
+                    tooltip: ( localize(8072, 'Learn More')),
                 }] : [];
             return {
                 id: typeof action.command === 'string' ? action.command : action.command.id,
@@ -497,20 +501,21 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
     }
     async _selectOneKernel(notebook, source, kernels) {
         const quickPickItems = ( (kernels.map(kernel => toKernelQuickPick(kernel, undefined))));
-        const quickPick = this._quickInputService.createQuickPick();
+        const localDisposableStore = ( (new DisposableStore()));
+        const quickPick = localDisposableStore.add(this._quickInputService.createQuickPick({ useSeparators: true }));
         quickPick.items = quickPickItems;
         quickPick.canSelectMany = false;
-        quickPick.title = ( localize(7829, "Select Kernel from {0}", source));
-        quickPick.onDidAccept(async () => {
+        quickPick.title = ( localize(8073, "Select Kernel from {0}", source));
+        localDisposableStore.add(quickPick.onDidAccept(async () => {
             if (quickPick.selectedItems && quickPick.selectedItems.length > 0 && isKernelPick(quickPick.selectedItems[0])) {
                 await this._selecteKernel(notebook, quickPick.selectedItems[0].kernel);
             }
             quickPick.hide();
             quickPick.dispose();
-        });
-        quickPick.onDidHide(() => {
-            quickPick.dispose();
-        });
+        }));
+        localDisposableStore.add(quickPick.onDidHide(() => {
+            localDisposableStore.dispose();
+        }));
         quickPick.show();
     }
     async _executeCommand(notebook, command) {
@@ -539,11 +544,11 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
                 action.label = info.selected.label;
                 const kernelInfo = info.selected.description ?? info.selected.detail;
                 action.tooltip = kernelInfo
-                    ? ( localize(7830, "Selected Kernel: {0} (Kernel Detection Tasks Running)", kernelInfo))
-                    : ( localize(7831, "Detecting Kernels"));
+                    ? ( localize(8074, "Selected Kernel: {0} (Kernel Detection Tasks Running)", kernelInfo))
+                    : ( localize(8075, "Detecting Kernels"));
             }
             else {
-                action.label = ( localize(7831, "Detecting Kernels"));
+                action.label = ( localize(8075, "Detecting Kernels"));
             }
             return;
         }
@@ -564,7 +569,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
             action.tooltip = selected.description ?? selected.detail ?? '';
         }
         else {
-            action.label = ( localize(7825, "Select Kernel"));
+            action.label = ( localize(8069, "Select Kernel"));
             action.class = ThemeIcon.asClassName(selectKernelIcon);
             action.tooltip = '';
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js

@@ -37,7 +37,7 @@ registerAction2(class extends Action2 {
         super({
             id: SELECT_KERNEL_ID,
             category: NOTEBOOK_ACTIONS_CATEGORY,
-            title: ( localize2(10677, 'Select Notebook Kernel')),
+            title: ( localize2(10756, 'Select Notebook Kernel')),
             icon: selectKernelIcon,
             f1: true,
             precondition: NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -61,7 +61,7 @@ registerAction2(class extends Action2 {
                     order: -10
                 }],
             metadata: {
-                description: ( localize(10678, "Notebook Kernel Args")),
+                description: ( localize(10757, "Notebook Kernel Args")),
                 args: [
                     {
                         name: 'kernelInfo',

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js

@@ -97,6 +97,7 @@ class NotebookCellTextModel extends Disposable {
                     this._versionId = this._textModel.getVersionId();
                     this._alternativeId = this._textModel.getAlternativeVersionId();
                 }
+                this._textBufferHash = null;
                 this._onDidChangeContent.fire('content');
             }));
             this._textModel._overwriteVersionId(this._versionId);
@@ -322,6 +323,9 @@ class NotebookCellTextModel extends Disposable {
         if (this.language !== b.language) {
             return false;
         }
+        if (this.outputs.length !== b.outputs.length) {
+            return false;
+        }
         if (this.getTextLength() !== b.getTextLength()) {
             return false;
         }

package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js

@@ -9,9 +9,8 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 import { generate, parse } from '../../../services/notebook/common/notebookDocumentService.js';
 const NOTEBOOK_EDITOR_ID = 'workbench.editor.notebook';
 const NOTEBOOK_DIFF_EDITOR_ID = 'workbench.editor.notebookTextDiffEditor';
+const NOTEBOOK_MULTI_DIFF_EDITOR_ID = 'workbench.editor.notebookMultiTextDiffEditor';
 const INTERACTIVE_WINDOW_EDITOR_ID = 'workbench.editor.interactive';
-const REPL_EDITOR_ID = 'workbench.editor.repl';
-const EXECUTE_REPL_COMMAND_ID = 'replNotebook.input.execute';
 var CellKind;
 ( (function(CellKind) {
     CellKind[CellKind["Markup"] = 1] = "Markup";
@@ -411,4 +410,4 @@ function formatStreamText(buffer) {
     }
     return VSBuffer.fromString(fixCarriageReturn(fixBackspace(textDecoder.decode(buffer.buffer))));
 }
-export { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellEditType, CellKind, CellStatusbarAlignment, CellUri, EXECUTE_REPL_COMMAND_ID, INTERACTIVE_WINDOW_EDITOR_ID, MOVE_CURSOR_1_LINE_COMMAND, MimeTypeDisplayOrder, NOTEBOOK_DIFF_EDITOR_ID, NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, NOTEBOOK_EDITOR_ID, NotebookCellExecutionState, NotebookCellsChangeType, NotebookEditorPriority, NotebookExecutionState, NotebookFindScopeType, NotebookRendererMatch, NotebookSetting, NotebookWorkingCopyTypeIdentifier, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, REPL_EDITOR_ID, RendererMessagingSpec, SelectionStateType, compressOutputItemStreams, diff, isDocumentExcludePattern, isTextStreamMime };
+export { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellEditType, CellKind, CellStatusbarAlignment, CellUri, INTERACTIVE_WINDOW_EDITOR_ID, MOVE_CURSOR_1_LINE_COMMAND, MimeTypeDisplayOrder, NOTEBOOK_DIFF_EDITOR_ID, NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, NOTEBOOK_EDITOR_ID, NOTEBOOK_MULTI_DIFF_EDITOR_ID, NotebookCellExecutionState, NotebookCellsChangeType, NotebookEditorPriority, NotebookExecutionState, NotebookFindScopeType, NotebookRendererMatch, NotebookSetting, NotebookWorkingCopyTypeIdentifier, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, RendererMessagingSpec, SelectionStateType, compressOutputItemStreams, diff, isDocumentExcludePattern, isTextStreamMime };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.js

@@ -0,0 +1,105 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { isResourceDiffEditorInput } from '../../../common/editor.js';
+import { EditorModel } from '../../../common/editor/editorModel.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { NotebookEditorInput } from './notebookEditorInput.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+var NotebookDiffEditorInput_1;
+class NotebookDiffEditorModel extends EditorModel {
+    constructor(original, modified) {
+        super();
+        this.original = original;
+        this.modified = modified;
+    }
+}
+let NotebookDiffEditorInput = class NotebookDiffEditorInput extends DiffEditorInput {
+    static { NotebookDiffEditorInput_1 = this; }
+    static create(instantiationService, resource, name, description, originalResource, viewType) {
+        const original = NotebookEditorInput.getOrCreate(instantiationService, originalResource, undefined, viewType);
+        const modified = NotebookEditorInput.getOrCreate(instantiationService, resource, undefined, viewType);
+        return instantiationService.createInstance(NotebookDiffEditorInput_1, name, description, original, modified, viewType);
+    }
+    static { this.ID = 'workbench.input.diffNotebookInput'; }
+    get resource() {
+        return this.modified.resource;
+    }
+    get editorId() {
+        return this.viewType;
+    }
+    constructor(name, description, original, modified, viewType, editorService) {
+        super(name, description, original, modified, undefined, editorService);
+        this.original = original;
+        this.modified = modified;
+        this.viewType = viewType;
+        this._modifiedTextModel = null;
+        this._originalTextModel = null;
+        this._cachedModel = undefined;
+    }
+    get typeId() {
+        return NotebookDiffEditorInput_1.ID;
+    }
+    async resolve() {
+        const [originalEditorModel, modifiedEditorModel] = await Promise.all([
+            this.original.resolve(),
+            this.modified.resolve(),
+        ]);
+        this._cachedModel?.dispose();
+        if (!modifiedEditorModel) {
+            throw ( new Error(
+                `Fail to resolve modified editor model for resource ${this.modified.resource} with notebookType ${this.viewType}`
+            ));
+        }
+        if (!originalEditorModel) {
+            throw ( new Error(
+                `Fail to resolve original editor model for resource ${this.original.resource} with notebookType ${this.viewType}`
+            ));
+        }
+        this._originalTextModel = originalEditorModel;
+        this._modifiedTextModel = modifiedEditorModel;
+        this._cachedModel = ( new NotebookDiffEditorModel(this._originalTextModel, this._modifiedTextModel));
+        return this._cachedModel;
+    }
+    toUntyped() {
+        const original = { resource: this.original.resource };
+        const modified = { resource: this.resource };
+        return {
+            original,
+            modified,
+            primary: modified,
+            secondary: original,
+            options: {
+                override: this.viewType
+            }
+        };
+    }
+    matches(otherInput) {
+        if (this === otherInput) {
+            return true;
+        }
+        if (otherInput instanceof NotebookDiffEditorInput_1) {
+            return this.modified.matches(otherInput.modified)
+                && this.original.matches(otherInput.original)
+                && this.viewType === otherInput.viewType;
+        }
+        if (isResourceDiffEditorInput(otherInput)) {
+            return this.modified.matches(otherInput.modified)
+                && this.original.matches(otherInput.original)
+                && this.editorId !== undefined
+                && (this.editorId === otherInput.options?.override || otherInput.options?.override === undefined);
+        }
+        return false;
+    }
+    dispose() {
+        super.dispose();
+        this._cachedModel?.dispose();
+        this._cachedModel = undefined;
+        this.original.dispose();
+        this.modified.dispose();
+        this._originalTextModel = null;
+        this._modifiedTextModel = null;
+    }
+};
+NotebookDiffEditorInput = NotebookDiffEditorInput_1 = ( __decorate([
+    ( __param(5, IEditorService))
+], NotebookDiffEditorInput));
+export { NotebookDiffEditorInput };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js

@@ -49,8 +49,14 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
             if (!this.isDirty()) {
                 return;
             }
+            const reason = e.auto
+                ? ( localize(7872, "One of the opened editors is a notebook editor."))
+                : ( localize(7873, "Notebook '{0}' could not be saved.", this.resource.path));
             e.veto((async () => {
                 const editors = editorService.findEditors(this);
+                if (e.auto) {
+                    return true;
+                }
                 if (editors.length > 0) {
                     const result = await editorService.save(editors[0]);
                     if (result.success) {
@@ -58,7 +64,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
                     }
                 }
                 return true;
-            })(), ( localize(7629, "Notebook '{0}' could not be saved.", this.resource.path)));
+            })(), reason);
         }));
     }
     dispose() {
@@ -265,7 +271,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
             return true;
         }
         if (otherInput instanceof NotebookEditorInput_1) {
-            return this.viewType === otherInput.viewType && isEqual(this.resource, otherInput.resource);
+            return this.editorId === otherInput.editorId && isEqual(this.resource, otherInput.resource);
         }
         return false;
     }
@@ -291,6 +297,6 @@ function isCompositeNotebookEditorInput(thing) {
 function isNotebookEditorInput(thing) {
     return !!thing
         && typeof thing === 'object'
-        && thing instanceof NotebookEditorInput;
+        && thing.typeId === NotebookEditorInput.ID;
 }
 export { NotebookEditorInput, isCompositeNotebookEditorInput, isNotebookEditorInput };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js

@@ -7,10 +7,10 @@ import { Schemas } from '../../../../base/common/network.js';
 import { filter } from '../../../../base/common/objects.js';
 import { assertType } from '../../../../base/common/types.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { EditorModel } from '../../../common/editor/editorModel.js';
 import { NotebookCellsChangeType, NotebookSetting } from './notebookCommon.js';
+import { INotebookLoggingService } from './notebookLoggingService.service.js';
 import { SimpleNotebookProviderInfo } from './notebookService.js';
 import { INotebookService } from './notebookService.service.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
@@ -148,13 +148,13 @@ SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = ( __decorate([
     ( __param(5, IFilesConfigurationService))
 ], SimpleNotebookEditorModel));
 class NotebookFileWorkingCopyModel extends Disposable {
-    constructor(_notebookModel, _notebookService, _configurationService, _telemetryService, _logService) {
+    constructor(_notebookModel, _notebookService, _configurationService, _telemetryService, _notebookLogService) {
         super();
         this._notebookModel = _notebookModel;
         this._notebookService = _notebookService;
         this._configurationService = _configurationService;
         this._telemetryService = _telemetryService;
-        this._logService = _logService;
+        this._notebookLogService = _notebookLogService;
         this._onDidChangeContent = this._register(( new Emitter()));
         this.onDidChangeContent = this._onDidChangeContent.event;
         this.configuration = undefined;
@@ -191,7 +191,7 @@ class NotebookFileWorkingCopyModel extends Disposable {
             try {
                 let serializer = this._notebookService.tryGetDataProviderSync(this.notebookModel.viewType)?.serializer;
                 if (!serializer) {
-                    this._logService.warn('No serializer found for notebook model, checking if provider still needs to be resolved');
+                    this._notebookLogService.info('WorkingCopyModel', 'No serializer found for notebook model, checking if provider still needs to be resolved');
                     serializer = await this.getNotebookSerializer();
                 }
                 if (token.isCancellationRequested) {
@@ -262,6 +262,7 @@ class NotebookFileWorkingCopyModel extends Disposable {
         if (token.isCancellationRequested) {
             throw ( new CancellationError());
         }
+        this._notebookLogService.info('WorkingCopyModel', 'Notebook content updated from file system - ' + ( this._notebookModel.uri.toString()));
         this._notebookModel.reset(data.cells, data.metadata, serializer.options);
     }
     async getNotebookSerializer() {
@@ -279,30 +280,22 @@ class NotebookFileWorkingCopyModel extends Disposable {
     }
 }
 let NotebookFileWorkingCopyModelFactory = class NotebookFileWorkingCopyModelFactory {
-    constructor(_viewType, _notebookService, _configurationService, _telemetryService, _logService) {
+    constructor(_viewType, _notebookService, _configurationService, _telemetryService, _notebookLogService) {
         this._viewType = _viewType;
         this._notebookService = _notebookService;
         this._configurationService = _configurationService;
         this._telemetryService = _telemetryService;
-        this._logService = _logService;
+        this._notebookLogService = _notebookLogService;
     }
     async createModel(resource, stream, token) {
-        const info = await this._notebookService.withNotebookDataProvider(this._viewType);
-        if (!(info instanceof SimpleNotebookProviderInfo)) {
-            throw ( new Error('CANNOT open file notebook with this provider'));
-        }
-        const bytes = await streamToBuffer(stream);
-        const data = await info.serializer.dataToNotebook(bytes);
-        if (token.isCancellationRequested) {
-            throw ( new CancellationError());
-        }
-        const notebookModel = this._notebookService.createNotebookTextModel(info.viewType, resource, data, info.serializer.options);
+        const notebookModel = this._notebookService.getNotebookTextModel(resource) ??
+            (await this._notebookService.createNotebookTextModel(this._viewType, resource, stream));
         return ( new NotebookFileWorkingCopyModel(
             notebookModel,
             this._notebookService,
             this._configurationService,
             this._telemetryService,
-            this._logService
+            this._notebookLogService
         ));
     }
 };
@@ -310,6 +303,6 @@ NotebookFileWorkingCopyModelFactory = ( __decorate([
     ( __param(1, INotebookService)),
     ( __param(2, IConfigurationService)),
     ( __param(3, ITelemetryService)),
-    ( __param(4, ILogService))
+    ( __param(4, INotebookLoggingService))
 ], NotebookFileWorkingCopyModelFactory));
 export { NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel };

package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js

@@ -129,7 +129,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
         this._domNode.setClassName('defineKeybindingWidget');
         this._domNode.setWidth(DefineKeybindingWidget_1.WIDTH);
         this._domNode.setHeight(DefineKeybindingWidget_1.HEIGHT);
-        const message = ( localize(8667, "Press desired key combination and then press ENTER."));
+        const message = ( localize(8682, "Press desired key combination and then press ENTER."));
         append(this._domNode.domNode, $('.message', undefined, message));
         this._domNode.domNode.style.backgroundColor = asCssVariable(editorWidgetBackground);
         this._domNode.domNode.style.color = asCssVariable(editorWidgetForeground);
@@ -177,7 +177,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
     printExisting(numberOfExisting) {
         if (numberOfExisting > 0) {
             const existingElement = $('span.existingText');
-            const text = numberOfExisting === 1 ? ( localize(8668, "1 existing command has this keybinding", numberOfExisting)) : ( localize(8669, "{0} existing commands have this keybinding", numberOfExisting));
+            const text = numberOfExisting === 1 ? ( localize(8683, "1 existing command has this keybinding", numberOfExisting)) : ( localize(8684, "{0} existing commands have this keybinding", numberOfExisting));
             append(existingElement, document.createTextNode(text));
             alert(text);
             this._showExistingKeybindingsNode.appendChild(existingElement);
@@ -195,7 +195,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
         firstLabel.set(this._chords?.[0] ?? undefined);
         if (this._chords) {
             for (let i = 1; i < this._chords.length; i++) {
-                this._outputNode.appendChild(document.createTextNode(( localize(8670, "chord to"))));
+                this._outputNode.appendChild(document.createTextNode(( localize(8685, "chord to"))));
                 const chordLabel = this._keybindingDisposables.add(( (new KeybindingLabel(this._outputNode, OS, defaultKeybindingLabelStyles))));
                 chordLabel.set(this._chords[i]);
             }

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js

@@ -2,18 +2,18 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 const settingsScopeDropDownIcon = registerIcon('settings-folder-dropdown', Codicon.triangleDown, ( localize(
- 6271,
+ 6214,
  'Icon for the folder dropdown button in the split JSON Settings editor.'
 )));
-const settingsMoreActionIcon = registerIcon('settings-more-action', Codicon.gear, ( localize(6272, 'Icon for the \'more actions\' action in the Settings UI.')));
-const keybindingsRecordKeysIcon = registerIcon('keybindings-record-keys', Codicon.recordKeys, ( localize(6273, 'Icon for the \'record keys\' action in the keybinding UI.')));
-const keybindingsSortIcon = registerIcon('keybindings-sort', Codicon.sortPrecedence, ( localize(6274, 'Icon for the \'sort by precedence\' toggle in the keybinding UI.')));
-const keybindingsEditIcon = registerIcon('keybindings-edit', Codicon.edit, ( localize(6275, 'Icon for the edit action in the keybinding UI.')));
-const keybindingsAddIcon = registerIcon('keybindings-add', Codicon.add, ( localize(6276, 'Icon for the add action in the keybinding UI.')));
-const settingsEditIcon = registerIcon('settings-edit', Codicon.edit, ( localize(6277, 'Icon for the edit action in the Settings UI.')));
-const settingsRemoveIcon = registerIcon('settings-remove', Codicon.close, ( localize(6278, 'Icon for the remove action in the Settings UI.')));
-const settingsDiscardIcon = registerIcon('settings-discard', Codicon.discard, ( localize(6279, 'Icon for the discard action in the Settings UI.')));
-const preferencesClearInputIcon = registerIcon('preferences-clear-input', Codicon.clearAll, ( localize(6280, 'Icon for clear input in the Settings and keybinding UI.')));
-const preferencesFilterIcon = registerIcon('preferences-filter', Codicon.filter, ( localize(6281, 'Icon for the button that suggests filters for the Settings UI.')));
-const preferencesOpenSettingsIcon = registerIcon('preferences-open-settings', Codicon.goToFile, ( localize(6282, 'Icon for open settings commands.')));
+const settingsMoreActionIcon = registerIcon('settings-more-action', Codicon.gear, ( localize(6215, 'Icon for the \'more actions\' action in the Settings UI.')));
+const keybindingsRecordKeysIcon = registerIcon('keybindings-record-keys', Codicon.recordKeys, ( localize(6216, 'Icon for the \'record keys\' action in the keybinding UI.')));
+const keybindingsSortIcon = registerIcon('keybindings-sort', Codicon.sortPrecedence, ( localize(6217, 'Icon for the \'sort by precedence\' toggle in the keybinding UI.')));
+const keybindingsEditIcon = registerIcon('keybindings-edit', Codicon.edit, ( localize(6218, 'Icon for the edit action in the keybinding UI.')));
+const keybindingsAddIcon = registerIcon('keybindings-add', Codicon.add, ( localize(6219, 'Icon for the add action in the keybinding UI.')));
+const settingsEditIcon = registerIcon('settings-edit', Codicon.edit, ( localize(6220, 'Icon for the edit action in the Settings UI.')));
+const settingsRemoveIcon = registerIcon('settings-remove', Codicon.close, ( localize(6221, 'Icon for the remove action in the Settings UI.')));
+const settingsDiscardIcon = registerIcon('settings-discard', Codicon.discard, ( localize(6222, 'Icon for the discard action in the Settings UI.')));
+const preferencesClearInputIcon = registerIcon('preferences-clear-input', Codicon.clearAll, ( localize(6223, 'Icon for clear input in the Settings and keybinding UI.')));
+const preferencesFilterIcon = registerIcon('preferences-filter', Codicon.filter, ( localize(6224, 'Icon for the button that suggests filters for the Settings UI.')));
+const preferencesOpenSettingsIcon = registerIcon('preferences-open-settings', Codicon.goToFile, ( localize(6225, 'Icon for open settings commands.')));
 export { keybindingsAddIcon, keybindingsEditIcon, keybindingsRecordKeysIcon, keybindingsSortIcon, preferencesClearInputIcon, preferencesFilterIcon, preferencesOpenSettingsIcon, settingsDiscardIcon, settingsEditIcon, settingsMoreActionIcon, settingsRemoveIcon, settingsScopeDropDownIcon };

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js

@@ -204,17 +204,17 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     resetLabels() {
         const remoteAuthority = this.environmentService.remoteAuthority;
         const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
-        this.userLocalSettings.label = ( localize(10331, "User"));
-        this.userRemoteSettings.label = ( localize(10332, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
-        this.workspaceSettings.label = ( localize(10333, "Workspace"));
-        this.folderSettingsAction.label = ( localize(10334, "Folder"));
+        this.userLocalSettings.label = ( localize(10363, "User"));
+        this.userRemoteSettings.label = ( localize(10364, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
+        this.workspaceSettings.label = ( localize(10365, "Workspace"));
+        this.folderSettingsAction.label = ( localize(10366, "Folder"));
     }
     create(parent) {
         const settingsTabsWidget = append(parent, $('.settings-tabs-widget'));
         this.settingsSwitcherBar = this._register(( (new ActionBar(settingsTabsWidget, {
             orientation: ActionsOrientation.HORIZONTAL,
             focusOnlyEnabledItems: true,
-            ariaLabel: ( localize(10335, "Settings Switcher")),
+            ariaLabel: ( localize(10367, "Settings Switcher")),
             ariaRole: 'tablist',
             actionViewItemProvider: (action, options) => action.id === 'folderSettings' ? this.folderSettings : undefined
         }))));
@@ -225,7 +225,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
             true,
             () => this.updateTarget(ConfigurationTarget.USER_LOCAL)
         )));
-        this.userLocalSettings.tooltip = ( localize(10331, "User"));
+        this.userLocalSettings.tooltip = ( localize(10363, "User"));
         this.userRemoteSettings = ( (new Action(
             'userSettingsRemote',
             '',
@@ -235,7 +235,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
         )));
         const remoteAuthority = this.environmentService.remoteAuthority;
         const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
-        this.userRemoteSettings.tooltip = ( localize(10332, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
+        this.userRemoteSettings.tooltip = ( localize(10364, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
         this.workspaceSettings = ( (new Action(
             'workspaceSettings',
             '',
@@ -269,14 +269,14 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     }
     setResultCount(settingsTarget, count) {
         if (settingsTarget === ConfigurationTarget.WORKSPACE) {
-            let label = ( localize(10333, "Workspace"));
+            let label = ( localize(10365, "Workspace"));
             if (count) {
                 label += ` (${count})`;
             }
             this.workspaceSettings.label = label;
         }
         else if (settingsTarget === ConfigurationTarget.USER_LOCAL) {
-            let label = ( localize(10331, "User"));
+            let label = ( localize(10363, "User"));
             if (count) {
                 label += ` (${count})`;
             }
@@ -322,7 +322,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
         this.userRemoteSettings.enabled = !!(this.options.enableRemoteSettings && this.environmentService.remoteAuthority);
         this.workspaceSettings.enabled = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY;
         this.folderSettings.action.enabled = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.contextService.getWorkspace().folders.length > 0;
-        this.workspaceSettings.tooltip = ( localize(10333, "Workspace"));
+        this.workspaceSettings.tooltip = ( localize(10365, "Workspace"));
     }
 };
 SettingsTargetsWidget = ( (__decorate([
@@ -376,13 +376,14 @@ let SearchWidget = class SearchWidget extends Widget {
     }
     createInputBox(parent) {
         const showHistoryHint = () => showHistoryKeybindingHint(this.keybindingService);
-        const box = this._register(( (new ContextScopedHistoryInputBox(
-            parent,
-            this.contextViewService,
-            { ...this.options, showHistoryHint },
-            this.contextKeyService
-        ))));
-        return box;
+        return (
+             (new ContextScopedHistoryInputBox(
+                parent,
+                this.contextViewService,
+                { ...this.options, showHistoryHint },
+                this.contextKeyService
+            ))
+        );
     }
     showMessage(message) {
         if (this.countElement && message !== this.countElement.textContent) {