@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -23,6 +23,7 @@ import { IPaneCompositePartService } from '../../../../services/panecomposite/br
 import { URI } from '../../../../../base/common/uri.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { SELECT_KERNEL_ID } from '../controller/coreActions.js';
+const _moduleId = "vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy";
 function isKernelPick(item) {
     return 'kernel' in item;
 }
@@ -55,19 +56,10 @@ function toKernelQuickPick(kernel, selected) {
     };
     if (kernel.id === selected?.id) {
         if (!res.description) {
-            res.description = ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                'current1',
-                "Currently Selected"
-            ));
+            res.description = ( localizeWithPath(_moduleId, 0, "Currently Selected"));
         }
         else {
-            res.description = ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                'current2',
-                "{0} - Currently Selected",
-                res.description
-            ));
+            res.description = ( localizeWithPath(_moduleId, 1, "{0} - Currently Selected", res.description));
         }
     }
     return res;
@@ -98,7 +90,7 @@ class KernelPickerStrategyBase {
                 }
             }
             if (!newKernel) {
-                this._logService.warn(`wanted kernel DOES NOT EXIST, wanted: ${wantedId}, all: ${( all.map(k => k.id))}`);
+                this._logService.warn(`wanted kernel DOES NOT EXIST, wanted: ${wantedId}, all: ${( (all.map(k => k.id)))}`);
                 return false;
             }
         }
@@ -115,14 +107,14 @@ class KernelPickerStrategyBase {
         quickPick.canSelectMany = false;
         quickPick.placeholder = selected
             ? ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-            'prompt.placeholder.change',
+            _moduleId,
+            2,
             "Change kernel for '{0}'",
             this._labelService.getUriLabel(notebook.uri, { relative: true })
         ))
             : ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-            'prompt.placeholder.select',
+            _moduleId,
+            3,
             "Select kernel for '{0}'",
             this._labelService.getUriLabel(notebook.uri, { relative: true })
         ));
@@ -159,7 +151,7 @@ class KernelPickerStrategyBase {
             quickPick.items = quickPickItems;
             quickPick.activeItems = activeItems;
         }, this);
-        const pick = await ( new Promise((resolve, reject) => {
+        const pick = await ( (new Promise((resolve, reject) => {
             quickPick.onDidAccept(() => {
                 const item = quickPick.selectedItems[0];
                 if (item) {
@@ -177,7 +169,7 @@ class KernelPickerStrategyBase {
                 resolve({ selected: undefined, items: quickPick.items });
             });
             quickPick.show();
-        }));
+        })));
         if (pick.selected) {
             return await this._handleQuickPick(editor, pick.selected, pick.items);
         }
@@ -222,12 +214,12 @@ class KernelPickerStrategyBase {
             }
         }
         if (extensionsToInstall.length || extensionsToEnable.length) {
-            await Promise.all([...( extensionsToInstall.map(async (extension) => {
+            await Promise.all([...( (extensionsToInstall.map(async (extension) => {
                     await extensionWorkbenchService.install(extension, {
                         installPreReleaseVersion: isInsiders ?? false,
                         context: { skipWalkthrough: true }
                     }, 15 );
-                })), ...( extensionsToEnable.map(async (extension) => {
+                }))), ...( (extensionsToEnable.map(async (extension) => {
                     switch (extension.enablementState) {
                         case 7 :
                             await extensionWorkbenchService.setEnablement([extension], 9 );
@@ -239,13 +231,13 @@ class KernelPickerStrategyBase {
                             await extensionWorkbenchService.setEnablement([extension], 3 );
                             return;
                     }
-                }))]);
+                })))]);
             await extensionService.activateByEvent(`onNotebook:${viewType}`);
             return;
         }
         const viewlet = await paneCompositePartService.openPaneComposite(VIEWLET_ID, 0 , true);
         const view = viewlet?.getViewPaneContainer();
-        const pascalCased = ( viewType.split(/[^a-z0-9]/ig).map(uppercaseFirstLetter)).join('');
+        const pascalCased = ( (viewType.split(/[^a-z0-9]/ig).map(uppercaseFirstLetter))).join('');
         view?.search(`@tag:notebookKernel${pascalCased}`);
     }
     async _showInstallKernelExtensionRecommendation(notebookTextModel, quickPick, extensionWorkbenchService, token) {
@@ -273,21 +265,13 @@ class KernelPickerStrategyBase {
             quickPickItems.push({
                 id: 'installSuggested',
                 description: suggestedExtension.displayName ?? suggestedExtension.extensionIds.join(', '),
-                label: `$(${Codicon.lightbulb.id}) ` + ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                    'installSuggestedKernel',
-                    'Install/Enable suggested extensions'
-                )),
+                label: `$(${Codicon.lightbulb.id}) ` + ( localizeWithPath(_moduleId, 4, 'Install/Enable suggested extensions')),
                 extensionIds: suggestedExtension.extensionIds
             });
         }
         quickPickItems.push({
             id: 'install',
-            label: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                'searchForKernels',
-                "Browse marketplace for kernel extensions"
-            )),
+            label: ( localizeWithPath(_moduleId, 5, "Browse marketplace for kernel extensions")),
         });
         return quickPickItems;
     }
@@ -295,7 +279,7 @@ class KernelPickerStrategyBase {
         const metaData = notebookTextModel.metadata;
         let suggestedKernelLanguage = metaData?.metadata?.language_info?.name;
         if (!suggestedKernelLanguage) {
-            const cellLanguages = ( notebookTextModel.cells.map(cell => cell.language)).filter(language => language !== 'markdown');
+            const cellLanguages = ( (notebookTextModel.cells.map(cell => cell.language))).filter(language => language !== 'markdown');
             if (cellLanguages.length > 1) {
                 const firstLanguage = cellLanguages[0];
                 if (cellLanguages.every(language => language === firstLanguage)) {
@@ -322,7 +306,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
             const kernelItem = toKernelQuickPick(matchResult.selected, matchResult.selected);
             quickPickItems.push(kernelItem);
         }
-        ( matchResult.suggestions.filter(kernel => kernel.id !== matchResult.selected?.id).map(kernel => toKernelQuickPick(kernel, matchResult.selected)))
+        ( (matchResult.suggestions.filter(kernel => kernel.id !== matchResult.selected?.id).map(kernel => toKernelQuickPick(kernel, matchResult.selected))))
             .forEach(kernel => {
             quickPickItems.push(kernel);
         });
@@ -334,11 +318,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         }
         quickPickItems.push({
             id: 'selectAnother',
-            label: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                'selectAnotherKernel.more',
-                "Select Another Kernel..."
-            )),
+            label: ( localizeWithPath(_moduleId, 6, "Select Another Kernel...")),
             autoRun: shouldAutoRun
         });
         return quickPickItems;
@@ -369,23 +349,11 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
     }
     async displaySelectAnotherQuickPick(editor, kernelListEmpty) {
         const notebook = editor.textModel;
-        const disposables = ( new DisposableStore());
+        const disposables = ( (new DisposableStore()));
         const quickPick = this._quickInputService.createQuickPick();
-        const quickPickItem = await ( new Promise(resolve => {
-            quickPick.title = kernelListEmpty ? ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                'select',
-                "Select Kernel"
-            )) : ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                'selectAnotherKernel',
-                "Select Another Kernel"
-            ));
-            quickPick.placeholder = ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                'selectKernel.placeholder',
-                "Type to choose a kernel source"
-            ));
+        const quickPickItem = await ( (new Promise(resolve => {
+            quickPick.title = kernelListEmpty ? ( localizeWithPath(_moduleId, 7, "Select Kernel")) : ( localizeWithPath(_moduleId, 8, "Select Another Kernel"));
+            quickPick.placeholder = ( localizeWithPath(_moduleId, 9, "Type to choose a kernel source"));
             quickPick.busy = true;
             quickPick.buttons = [this._quickInputService.backButton];
             quickPick.show();
@@ -396,7 +364,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
             }));
             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);
+                    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 });
                 }
             });
@@ -418,7 +386,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
                 quickPick.items = quickPickItems;
                 quickPick.busy = false;
             }));
-        }));
+        })));
         quickPick.hide();
         disposables.dispose();
         if (quickPickItem === this._quickInputService.backButton) {
@@ -501,14 +469,10 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
             }
         }
         const validActions = actions.filter(action => action.command);
-        quickPickItems.push(...( validActions.map(action => {
+        quickPickItems.push(...( (validActions.map(action => {
             const buttons = action.documentation ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.info),
-                    tooltip: ( localizeWithPath(
-                        'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                        'learnMoreTooltip',
-                        'Learn More'
-                    )),
+                    tooltip: ( localizeWithPath(_moduleId, 10, 'Learn More')),
                 }] : [];
             return {
                 id: typeof action.command === 'string' ? action.command : action.command.id,
@@ -518,7 +482,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
                 documentation: action.documentation,
                 buttons
             };
-        })));
+        }))));
         for (const sourceAction of sourceActionCommands) {
             const res = {
                 action: sourceAction,
@@ -531,16 +495,11 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         return quickPickItems;
     }
     async _selectOneKernel(notebook, source, kernels) {
-        const quickPickItems = ( kernels.map(kernel => toKernelQuickPick(kernel, undefined)));
+        const quickPickItems = ( (kernels.map(kernel => toKernelQuickPick(kernel, undefined))));
         const quickPick = this._quickInputService.createQuickPick();
         quickPick.items = quickPickItems;
         quickPick.canSelectMany = false;
-        quickPick.title = ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-            'selectKernelFromExtension',
-            "Select Kernel from {0}",
-            source
-        ));
+        quickPick.title = ( localizeWithPath(_moduleId, 11, "Select Kernel from {0}", source));
         quickPick.onDidAccept(async () => {
             if (quickPick.selectedItems && quickPick.selectedItems.length > 0 && isKernelPick(quickPick.selectedItems[0])) {
                 await this._selecteKernel(notebook, quickPick.selectedItems[0].kernel);
@@ -580,23 +539,15 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
                 const kernelInfo = info.selected.description ?? info.selected.detail;
                 action.tooltip = kernelInfo
                     ? ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                    'kernels.selectedKernelAndKernelDetectionRunning',
+                    _moduleId,
+                    12,
                     "Selected Kernel: {0} (Kernel Detection Tasks Running)",
                     kernelInfo
                 ))
-                    : ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                    'kernels.detecting',
-                    "Detecting Kernels"
-                ));
+                    : ( localizeWithPath(_moduleId, 13, "Detecting Kernels"));
             }
             else {
-                action.label = ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                    'kernels.detecting',
-                    "Detecting Kernels"
-                ));
+                action.label = ( localizeWithPath(_moduleId, 13, "Detecting Kernels"));
             }
             return;
         }
@@ -617,11 +568,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
             action.tooltip = selected.description ?? selected.detail ?? '';
         }
         else {
-            action.label = ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy',
-                'select',
-                "Select Kernel"
-            ));
+            action.label = ( localizeWithPath(_moduleId, 7, "Select Kernel"));
             action.class = ThemeIcon.asClassName(selectKernelIcon);
             action.tooltip = '';
         }
@@ -636,17 +583,17 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         return selected;
     }
 };
-KernelPickerMRUStrategy = ( __decorate([
-    ( __param(0, INotebookKernelService)),
-    ( __param(1, IProductService)),
-    ( __param(2, IQuickInputService)),
-    ( __param(3, ILabelService)),
-    ( __param(4, ILogService)),
-    ( __param(5, IPaneCompositePartService)),
-    ( __param(6, IExtensionsWorkbenchService)),
-    ( __param(7, IExtensionService)),
-    ( __param(8, ICommandService)),
-    ( __param(9, INotebookKernelHistoryService)),
-    ( __param(10, IOpenerService))
-], KernelPickerMRUStrategy));
+KernelPickerMRUStrategy = ( (__decorate([
+    ( (__param(0, INotebookKernelService))),
+    ( (__param(1, IProductService))),
+    ( (__param(2, IQuickInputService))),
+    ( (__param(3, ILabelService))),
+    ( (__param(4, ILogService))),
+    ( (__param(5, IPaneCompositePartService))),
+    ( (__param(6, IExtensionsWorkbenchService))),
+    ( (__param(7, IExtensionService))),
+    ( (__param(8, ICommandService))),
+    ( (__param(9, INotebookKernelHistoryService))),
+    ( (__param(10, IOpenerService)))
+], KernelPickerMRUStrategy)));
 export { KernelPickerMRUStrategy };

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

@@ -14,6 +14,7 @@ import { KernelPickerMRUStrategy } from './notebookKernelQuickPickStrategy.js';
 import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT } from '../../common/notebookContextKeys.js';
 import { INotebookKernelService, INotebookKernelHistoryService } from '../../common/notebookKernelService.service.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
+const _moduleId = "vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView";
 function getEditorFromContext(editorService, context) {
     let editor;
     if (context !== undefined && 'notebookEditorId' in context) {
@@ -37,36 +38,31 @@ registerAction2(class extends Action2 {
         super({
             id: SELECT_KERNEL_ID,
             category: NOTEBOOK_ACTIONS_CATEGORY,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView',
-                'notebookActions.selectKernel',
-                'Select Notebook Kernel'
-            )),
+            title: ( localize2WithPath(_moduleId, 0, 'Select Notebook Kernel')),
             icon: selectKernelIcon,
             f1: true,
             precondition: NOTEBOOK_IS_ACTIVE_EDITOR,
             menu: [{
                     id: MenuId.EditorTitle,
-                    when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, ( ContextKeyExpr.notEquals('config.notebook.globalToolbar', true)))),
+                    when: ( (ContextKeyExpr.and(
+                        NOTEBOOK_IS_ACTIVE_EDITOR,
+                         (ContextKeyExpr.notEquals('config.notebook.globalToolbar', true))
+                    ))),
                     group: 'navigation',
                     order: -10
                 }, {
                     id: MenuId.NotebookToolbar,
-                    when: ( ContextKeyExpr.equals('config.notebook.globalToolbar', true)),
+                    when: ( (ContextKeyExpr.equals('config.notebook.globalToolbar', true))),
                     group: 'status',
                     order: -10
                 }, {
                     id: MenuId.InteractiveToolbar,
-                    when: ( NOTEBOOK_KERNEL_COUNT.notEqualsTo(0)),
+                    when: ( (NOTEBOOK_KERNEL_COUNT.notEqualsTo(0))),
                     group: 'status',
                     order: -10
                 }],
             metadata: {
-                description: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView',
-                    'notebookActions.selectKernel.args',
-                    "Notebook Kernel Args"
-                )),
+                description: ( localizeWithPath(_moduleId, 1, "Notebook Kernel Args")),
                 args: [
                     {
                         name: 'kernelInfo',
@@ -118,13 +114,13 @@ registerAction2(class extends Action2 {
 });
 let NotebooKernelActionViewItem = class NotebooKernelActionViewItem extends ActionViewItem {
     constructor(actualAction, _editor, options, _notebookKernelService, _notebookKernelHistoryService) {
-        super(undefined, ( new Action(
+        super(undefined, ( (new Action(
             'fakeAction',
             undefined,
             ThemeIcon.asClassName(selectKernelIcon),
             true,
             (event) => actualAction.run(event)
-        )), { ...options, label: false, icon: true });
+        ))), { ...options, label: false, icon: true });
         this._editor = _editor;
         this._notebookKernelService = _notebookKernelService;
         this._notebookKernelHistoryService = _notebookKernelHistoryService;
@@ -165,8 +161,8 @@ let NotebooKernelActionViewItem = class NotebooKernelActionViewItem extends Acti
         this._action.class = '';
     }
 };
-NotebooKernelActionViewItem = ( __decorate([
-    ( __param(3, INotebookKernelService)),
-    ( __param(4, INotebookKernelHistoryService))
-], NotebooKernelActionViewItem));
+NotebooKernelActionViewItem = ( (__decorate([
+    ( (__param(3, INotebookKernelService))),
+    ( (__param(4, INotebookKernelHistoryService)))
+], NotebooKernelActionViewItem)));
 export { NotebooKernelActionViewItem };

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

@@ -1,7 +1,7 @@
 import { createFastDomNode } from '../../../../../base/browser/fastDomNode.js';
 import { onUnexpectedError } from '../../../../../base/common/errors.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-const invalidFunc = () => { throw new Error(`Invalid notebook view zone change accessor`); };
+const invalidFunc = () => { throw ( new Error(`Invalid notebook view zone change accessor`)); };
 class NotebookViewZones extends Disposable {
     constructor(listView, coordinator) {
         super();

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

@@ -7,6 +7,7 @@ import { PieceTreeTextBuffer } from '../../../../../editor/common/model/pieceTre
 import { PieceTreeTextBufferBuilder } from '../../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
 import { NotebookCellOutputTextModel } from './notebookCellOutputTextModel.js';
+import { ThrottledDelayer } from '../../../../../base/common/async.js';
 class NotebookCellTextModel extends Disposable {
     get outputs() {
         return this._outputs;
@@ -41,21 +42,8 @@ class NotebookCellTextModel extends Disposable {
             && this._textModel.getLanguageId() === this._languageService.getLanguageIdByLanguageName(this.language)) {
             return;
         }
-        const newLanguageId = this._languageService.getLanguageIdByLanguageName(newLanguage);
-        if (newLanguageId === null) {
-            return;
-        }
-        if (this._textModel) {
-            const languageId = this._languageService.createById(newLanguageId);
-            this._textModel.setLanguage(languageId.languageId);
-        }
-        if (this._language === newLanguage) {
-            return;
-        }
-        this._language = newLanguage;
-        this._hash = null;
-        this._onDidChangeLanguage.fire(newLanguage);
-        this._onDidChangeContent.fire('language');
+        this._hasLanguageSetExplicitly = true;
+        this._setLanguageInternal(newLanguage);
     }
     get mime() {
         return this._mime;
@@ -83,6 +71,7 @@ class NotebookCellTextModel extends Disposable {
             if (!this._textModel) {
                 this._onDidChangeContent.fire('content');
             }
+            this.autoDetectLanguage();
         }));
         return this._textBuffer;
     }
@@ -122,7 +111,9 @@ class NotebookCellTextModel extends Disposable {
             this.language = newLanguage;
         }
     }
-    constructor(uri, handle, _source, _language, _mime, cellKind, outputs, metadata, internalMetadata, collapseState, transientOptions, _languageService) {
+    static { this.AUTO_DETECT_LANGUAGE_THROTTLE_DELAY = 600; }
+    get hasLanguageSetExplicitly() { return this._hasLanguageSetExplicitly; }
+    constructor(uri, handle, _source, _language, _mime, cellKind, outputs, metadata, internalMetadata, collapseState, transientOptions, _languageService, _languageDetectionService = undefined) {
         super();
         this.uri = uri;
         this.handle = handle;
@@ -133,6 +124,7 @@ class NotebookCellTextModel extends Disposable {
         this.collapseState = collapseState;
         this.transientOptions = transientOptions;
         this._languageService = _languageService;
+        this._languageDetectionService = _languageDetectionService;
         this._onDidChangeOutputs = this._register(( new Emitter()));
         this.onDidChangeOutputs = this._onDidChangeOutputs.event;
         this._onDidChangeOutputItems = this._register(( new Emitter()));
@@ -151,10 +143,54 @@ class NotebookCellTextModel extends Disposable {
         this._alternativeId = 1;
         this._textModelDisposables = this._register(( new DisposableStore()));
         this._textModel = undefined;
+        this.autoDetectLanguageThrottler = this._register(( new ThrottledDelayer(NotebookCellTextModel.AUTO_DETECT_LANGUAGE_THROTTLE_DELAY)));
+        this._autoLanguageDetectionEnabled = false;
+        this._hasLanguageSetExplicitly = false;
         this._outputs = ( outputs.map(op => ( new NotebookCellOutputTextModel(op))));
         this._metadata = metadata ?? {};
         this._internalMetadata = internalMetadata ?? {};
     }
+    enableAutoLanguageDetection() {
+        this._autoLanguageDetectionEnabled = true;
+        this.autoDetectLanguage();
+    }
+    async autoDetectLanguage() {
+        if (this._autoLanguageDetectionEnabled) {
+            this.autoDetectLanguageThrottler.trigger(() => this._doAutoDetectLanguage());
+        }
+    }
+    async _doAutoDetectLanguage() {
+        if (this.hasLanguageSetExplicitly) {
+            return;
+        }
+        const newLanguage = await this._languageDetectionService?.detectLanguage(this.uri);
+        if (!newLanguage) {
+            return;
+        }
+        if (this._textModel
+            && this._textModel.getLanguageId() === this._languageService.getLanguageIdByLanguageName(newLanguage)
+            && this._textModel.getLanguageId() === this._languageService.getLanguageIdByLanguageName(this.language)) {
+            return;
+        }
+        this._setLanguageInternal(newLanguage);
+    }
+    _setLanguageInternal(newLanguage) {
+        const newLanguageId = this._languageService.getLanguageIdByLanguageName(newLanguage);
+        if (newLanguageId === null) {
+            return;
+        }
+        if (this._textModel) {
+            const languageId = this._languageService.createById(newLanguageId);
+            this._textModel.setLanguage(languageId.languageId);
+        }
+        if (this._language === newLanguage) {
+            return;
+        }
+        this._language = newLanguage;
+        this._hash = null;
+        this._onDidChangeLanguage.fire(newLanguage);
+        this._onDidChangeContent.fire('language');
+    }
     resetTextBuffer(textBuffer) {
         this._textBuffer = textBuffer;
     }

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

@@ -262,6 +262,7 @@ const NotebookSetting = {
     outputScrolling: 'notebook.output.scrolling',
     textOutputLineLimit: 'notebook.output.textLineLimit',
     LinkifyOutputFilePaths: 'notebook.output.linkifyFilePaths',
+    minimalErrorRendering: 'notebook.output.minimalErrorRendering',
     formatOnSave: 'notebook.formatOnSave.enabled',
     insertFinalNewline: 'notebook.insertFinalNewline',
     formatOnCellExecution: 'notebook.formatOnCellExecution',
@@ -283,11 +284,12 @@ const NotebookSetting = {
     outlineShowCodeCellSymbols: 'notebook.outline.showCodeCellSymbols',
     breadcrumbsShowCodeCells: 'notebook.breadcrumbs.showCodeCells',
     scrollToRevealCell: 'notebook.scrolling.revealNextCellOnExecute',
-    anchorToFocusedCell: 'notebook.scrolling.experimental.anchorToFocusedCell',
     cellChat: 'notebook.experimental.cellChat',
+    cellGenerate: 'notebook.experimental.generate',
     notebookVariablesView: 'notebook.experimental.variablesView',
     InteractiveWindowPromptToSave: 'interactiveWindow.promptToSaveOnClose',
     cellFailureDiagnostics: 'notebook.cellFailureDiagnostics',
+    outputBackupSizeLimit: 'notebook.backup.sizeLimit',
 };
 class NotebookWorkingCopyTypeIdentifier {
     static { this._prefix = 'notebook/'; }

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

@@ -8,7 +8,7 @@ const INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR = ( ContextKeyExpr.equals('activeEdito
 const NOTEBOOK_EDITOR_FOCUSED = ( new RawContextKey('notebookEditorFocused', false));
 const NOTEBOOK_CELL_LIST_FOCUSED = ( new RawContextKey('notebookCellListFocused', false));
 const NOTEBOOK_OUTPUT_FOCUSED = ( new RawContextKey('notebookOutputFocused', false));
-const NOTEBOOK_OUPTUT_INPUT_FOCUSED = ( new RawContextKey('notebookOutputInputFocused', false));
+const NOTEBOOK_OUTPUT_INPUT_FOCUSED = ( new RawContextKey('notebookOutputInputFocused', false));
 const NOTEBOOK_EDITOR_EDITABLE = ( new RawContextKey('notebookEditable', true));
 const NOTEBOOK_HAS_RUNNING_CELL = ( new RawContextKey('notebookHasRunningCell', false));
 const NOTEBOOK_HAS_SOMETHING_RUNNING = ( new RawContextKey('notebookHasSomethingRunning', false));
@@ -38,4 +38,4 @@ const NOTEBOOK_KERNEL_SELECTED = ( new RawContextKey('notebookKernelSelected', f
 const NOTEBOOK_INTERRUPTIBLE_KERNEL = ( new RawContextKey('notebookInterruptibleKernel', false));
 const NOTEBOOK_MISSING_KERNEL_EXTENSION = ( new RawContextKey('notebookMissingKernelExtension', false));
 const NOTEBOOK_HAS_OUTPUTS = ( new RawContextKey('notebookHasOutputs', false));
-export { HAS_OPENED_NOTEBOOK, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, InteractiveWindowOpen, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_OUPTUT_INPUT_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE };
+export { HAS_OPENED_NOTEBOOK, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, InteractiveWindowOpen, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE };