@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js

@@ -9,26 +9,28 @@ import { generateUuid } from '../../../../base/common/uuid.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { TooLargeFileOperationError, ByteSize } from '../../../../platform/files/common/files.js';
+import { FileOperationResult, TooLargeFileOperationError, ByteSize } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
-import { createEditorOpenError, DEFAULT_EDITOR_ASSOCIATION, isEditorOpenError, createTooLargeFileError, EditorResourceAccessor } from '../../../common/editor.js';
+import { EditorPaneSelectionChangeReason, createEditorOpenError, DEFAULT_EDITOR_ASSOCIATION, isEditorOpenError, createTooLargeFileError, EditorPaneSelectionCompareResult, EditorResourceAccessor } from '../../../common/editor.js';
 import { SELECT_KERNEL_ID } from './controller/coreActions.js';
 import { INotebookEditorService } from './services/notebookEditorService.service.js';
 import { NotebooKernelActionViewItem } from './viewParts/notebookKernelView.js';
 import { NOTEBOOK_EDITOR_ID, NotebookWorkingCopyTypeIdentifier, CellKind } from '../common/notebookCommon.js';
 import { NotebookEditorInput } from '../common/notebookEditorInput.js';
 import { NotebookPerfMarks } from '../common/notebookPerformance.js';
+import { GroupsOrder } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { InstallRecommendedExtensionAction } from '../../extensions/browser/extensionsActions.js';
 import { INotebookService } from '../common/notebookService.service.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.service.js';
+import { EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { IWorkingCopyBackupService } from '../../../services/workingCopy/common/workingCopyBackup.service.js';
 import { streamToBuffer } from '../../../../base/common/buffer.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
@@ -162,7 +164,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
                 setParentFlowTo(this._widget.value.getDomNode(), this._rootElement);
             }
             this._widgetDisposableStore.add(this._widget.value.onDidChangeModel(() => this._onDidChangeModel.fire()));
-            this._widgetDisposableStore.add(this._widget.value.onDidChangeActiveCell(() => this._onDidChangeSelection.fire({ reason: 2  })));
+            this._widgetDisposableStore.add(this._widget.value.onDidChangeActiveCell(() => this._onDidChangeSelection.fire({ reason: EditorPaneSelectionChangeReason.USER })));
             if (this._pagePosition) {
                 this._widget.value.layout(this._pagePosition.dimension, this._rootElement, this._pagePosition.position);
             }
@@ -210,7 +212,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
                             const extensionInfo = this._extensionsWorkbenchService.local.find(e => e.identifier.id === knownProvider);
                             try {
                                 if (extensionInfo) {
-                                    await this._extensionsWorkbenchService.setEnablement(extensionInfo, extensionInfo.enablementState === 7  ? 9  : 8 );
+                                    await this._extensionsWorkbenchService.setEnablement(extensionInfo, extensionInfo.enablementState === EnablementState.DisabledWorkspace ? EnablementState.EnabledWorkspace : EnablementState.EnabledGlobally);
                                 }
                                 else {
                                     await this._instantiationService.createInstance(InstallRecommendedExtensionAction, knownProvider).run();
@@ -236,7 +238,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
                     })
                 ], { allowDialog: true });
             }
-            this._widgetDisposableStore.add(model.notebook.onDidChangeContent(() => this._onDidChangeSelection.fire({ reason: 3  })));
+            this._widgetDisposableStore.add(model.notebook.onDidChangeContent(() => this._onDidChangeSelection.fire({ reason: EditorPaneSelectionChangeReason.EDIT })));
             const viewState = options?.viewState ?? this._loadNotebookEditorViewState(input);
             this._widget.value.setParentContextKeyService(this._contextKeyService);
             this._widget.value.setEditorProgressService(this._editorProgressService);
@@ -262,7 +264,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
             if (isEditorOpenError(e)) {
                 throw e;
             }
-            if (e.fileOperationResult === 7 ) {
+            if (e.fileOperationResult === FileOperationResult.FILE_TOO_LARGE) {
                 let message;
                 if (e instanceof TooLargeFileOperationError) {
                     message = ( localizeWithPath(
@@ -313,6 +315,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
         const startTime = perfMarks['startTime'];
         const extensionActivated = perfMarks['extensionActivated'];
         const inputLoaded = perfMarks['inputLoaded'];
+        const webviewCommLoaded = perfMarks['webviewCommLoaded'];
         const customMarkdownLoaded = perfMarks['customMarkdownLoaded'];
         const editorLoaded = perfMarks['editorLoaded'];
         let extensionActivationTimespan = -1;
@@ -324,7 +327,9 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
             extensionActivationTimespan = extensionActivated - startTime;
             if (inputLoaded !== undefined) {
                 inputLoadingTimespan = inputLoaded - extensionActivated;
-                webviewCommLoadingTimespan = inputLoaded - extensionActivated;
+            }
+            if (webviewCommLoaded !== undefined) {
+                webviewCommLoadingTimespan = webviewCommLoaded - extensionActivated;
             }
             if (customMarkdownLoaded !== undefined) {
                 customMarkdownLoadingTimespan = customMarkdownLoaded - startTime;
@@ -449,7 +454,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
         if (result) {
             return result;
         }
-        for (const group of this._editorGroupService.getGroups(1 )) {
+        for (const group of this._editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
             if (group.activeEditorPane !== this && group.activeEditorPane instanceof NotebookEditor_1 && group.activeEditor?.matches(input)) {
                 return group.activeEditorPane._widget.value?.getEditorViewState();
             }
@@ -497,12 +502,12 @@ class NotebookEditorSelection {
     }
     compare(other) {
         if (!(other instanceof NotebookEditorSelection)) {
-            return 3 ;
+            return EditorPaneSelectionCompareResult.DIFFERENT;
         }
         if (isEqual(this.cellUri, other.cellUri)) {
-            return 1 ;
+            return EditorPaneSelectionCompareResult.IDENTICAL;
         }
-        return 3 ;
+        return EditorPaneSelectionCompareResult.DIFFERENT;
     }
     restore(options) {
         const notebookOptions = {

package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js

@@ -52,7 +52,7 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { PANEL_BORDER, SIDE_BAR_BACKGROUND, EDITOR_PANE_BACKGROUND } from '../../../common/theme.js';
 import { debugIconStartForeground } from '../../debug/browser/debugColors.js';
-import { CellEditState, CellFocusMode, CellRevealRangeType, ScrollToRevealBehavior } from './notebookBrowser.js';
+import { CellEditState, CellFocusMode, CellRevealType, CellRevealRangeType, ScrollToRevealBehavior, RenderOutputType } from './notebookBrowser.js';
 import { NotebookEditorExtensionsRegistry } from './notebookEditorExtensions.js';
 import { INotebookEditorService } from './services/notebookEditorService.service.js';
 import { notebookDebug } from './notebookLogger.js';
@@ -71,12 +71,13 @@ import { NotebookEditorWorkbenchToolbar } from './viewParts/notebookEditorToolba
 import { NotebookEditorContextKeys } from './viewParts/notebookEditorWidgetContextKeys.js';
 import { NotebookOverviewRuler } from './viewParts/notebookOverviewRuler.js';
 import { ListTopCellToolbar } from './viewParts/notebookTopCellToolbar.js';
-import { SelectionStateType, RENDERER_NOT_AVAILABLE, CellKind } from '../common/notebookCommon.js';
+import { SelectionStateType, RENDERER_NOT_AVAILABLE, CellKind, CellEditType } from '../common/notebookCommon.js';
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CURSOR_NAVIGATION_MODE } from '../common/notebookContextKeys.js';
 import { INotebookExecutionService } from '../common/notebookExecutionService.service.js';
 import { INotebookExecutionStateService } from '../common/notebookExecutionStateService.service.js';
 import { INotebookKernelService } from '../common/notebookKernelService.service.js';
 import { NotebookOptions, OutputInnerContainerTopPadding } from './notebookOptions.js';
+import { cellRangesToIndexes } from '../common/notebookRange.js';
 import { INotebookRendererMessagingService } from '../common/notebookRendererMessagingService.service.js';
 import { INotebookService } from '../common/notebookService.service.js';
 import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
@@ -89,6 +90,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { DropIntoEditorController } from '../../../../editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js';
 import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
 import { NotebookStickyScroll } from './viewParts/notebookEditorStickyScroll.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
@@ -297,6 +299,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
                 || e.dragAndDropEnabled
                 || e.fontSize
                 || e.markupFontSize
+                || e.markdownLineHeight
                 || e.fontFamily
                 || e.insertToolbarAlignment
                 || e.outputFontSize
@@ -671,6 +674,17 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
 				height: ${bottomToolbarGap + cellBottomMargin}px;
 			}
 		`);
+        styleSheets.push(`
+			.notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-multiCellHighlight:has(+ .monaco-list-row.nb-multiCellHighlight) .cell-focus-indicator-bottom {
+				height: ${bottomToolbarGap + cellBottomMargin}px;
+				background-color: var(--vscode-notebook-symbolHighlightBackground) !important;
+			}
+
+			.notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-multiCellHighlight:has(+ .monaco-list-row.nb-multiCellHighlight) .cell-focus-indicator-bottom {
+				height: ${bottomToolbarGap + cellBottomMargin - 6}px;
+				background-color: var(--vscode-notebook-symbolHighlightBackground) !important;
+			}
+		`);
         styleSheets.push(`
 			.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .input-collapse-container .cell-collapse-preview {
 				line-height: ${collapsedIndicatorHeight}px;
@@ -820,7 +834,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._registerNotebookActionsToolbar();
         this._registerNotebookStickyScroll();
         this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration("accessibility.verbosity.notebook" )) {
+            if (e.affectsConfiguration(AccessibilityVerbositySettingId.Notebook)) {
                 this._list.ariaLabel = accessibilityProvider?.getWidgetAriaLabel();
             }
         }));
@@ -1002,7 +1016,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
                     ))));
                 }
                 else {
-                    this._list.revealCell(cell, options?.cellRevealType ?? 4 );
+                    this._list.revealCell(cell, options?.cellRevealType ?? CellRevealType.CenterIfOutsideViewport);
                 }
                 const editor = this._renderedEditors.get(cell);
                 if (editor) {
@@ -1206,7 +1220,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             this.hideMarkupPreviews(hiddenCells);
             this.deleteMarkupPreviews(deletedCells);
         }));
-        await this._warmupWithMarkdownRenderer(this.viewModel, viewState);
+        await this._warmupWithMarkdownRenderer(this.viewModel, viewState, perf);
         perf?.mark('customMarkdownLoaded');
         this._localCellStateListeners = ( (this.viewModel.viewCells.map(cell => this._bindCellListener(cell))));
         this._lastCellWithEditorFocus = this.viewModel.viewCells.find(viewCell => this.getActiveCell() === viewCell && viewCell.focusMode === CellFocusMode.Editor) ?? null;
@@ -1268,9 +1282,10 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         }
         this._lastCellWithEditorFocus = cell;
     }
-    async _warmupWithMarkdownRenderer(viewModel, viewState) {
+    async _warmupWithMarkdownRenderer(viewModel, viewState, perf) {
         this.logService.debug('NotebookEditorWidget', 'warmup ' + this.viewModel?.uri.toString());
         await this._resolveWebview();
+        perf?.mark('webviewCommLoaded');
         this.logService.debug('NotebookEditorWidget', 'warmup - webview resolved');
         this._webview.element.style.visibility = 'hidden';
         await this._warmupViewportMarkdownCells(viewModel, viewState);
@@ -1661,19 +1676,19 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         return this._list.revealCells(range);
     }
     revealInView(cell) {
-        return this._list.revealCell(cell, 1 );
+        return this._list.revealCell(cell, CellRevealType.Default);
     }
     revealInViewAtTop(cell) {
-        this._list.revealCell(cell, 2 );
+        this._list.revealCell(cell, CellRevealType.Top);
     }
     revealInCenter(cell) {
-        this._list.revealCell(cell, 3 );
+        this._list.revealCell(cell, CellRevealType.Center);
     }
     async revealInCenterIfOutsideViewport(cell) {
-        await this._list.revealCell(cell, 4 );
+        await this._list.revealCell(cell, CellRevealType.CenterIfOutsideViewport);
     }
     async revealFirstLineIfOutsideViewport(cell) {
-        await this._list.revealCell(cell, 6 );
+        await this._list.revealCell(cell, CellRevealType.FirstLineIfOutsideViewport);
     }
     async revealLineInViewAsync(cell, line) {
         return this._list.revealRangeInCell(cell, ( (new Range(line, 1, line, 1))), CellRevealRangeType.Default);
@@ -1969,7 +1984,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (!renderer) {
                 return;
             }
-            const result = { type: 1 , renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
+            const result = { type: RenderOutputType.Extension, renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
             const inset = this._webview?.insetMapping.get(result.source);
             if (!inset || !inset.initialized) {
                 const p = ( (new Promise(resolve => {
@@ -2033,7 +2048,10 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (token.isCancellationRequested) {
                 return [];
             }
-            const webviewMatches = await this._webview.find(query, { caseSensitive: options.caseSensitive, wholeWord: options.wholeWord, includeMarkup: !!options.includeMarkupPreview, includeOutput: !!options.includeOutput, shouldGetSearchPreviewInfo, ownerID });
+            const selectedRanges = options.selectedRanges?.map(range => this._notebookViewModel?.validateRange(range)).filter(range => !!range);
+            const selectedIndexes = cellRangesToIndexes(selectedRanges ?? []);
+            const findIds = ( (selectedIndexes.map(index => this._notebookViewModel?.viewCells[index].id ?? '')));
+            const webviewMatches = await this._webview.find(query, { caseSensitive: options.caseSensitive, wholeWord: options.wholeWord, includeMarkup: !!options.includeMarkupPreview, includeOutput: !!options.includeOutput, shouldGetSearchPreviewInfo, ownerID, findIds: options.searchInRanges ? findIds : [] });
             if (token.isCancellationRequested) {
                 return [];
             }
@@ -2202,7 +2220,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (!this._list.webviewElement) {
                 return;
             }
-            if (output.type === 1 ) {
+            if (output.type === RenderOutputType.Extension) {
                 this.notebookRendererMessaging.prepare(output.renderer.id);
             }
             const webviewTop = parseInt(this._list.webviewElement.domNode.style.top, 10);
@@ -2210,7 +2228,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             const cellTop = this._list.getCellViewScrollTop(cell) + top;
             const existingOutput = this._webview.insetMapping.get(output.source);
             if (!existingOutput
-                || ((!existingOutput.renderer && output.type === 1) )) {
+                || (!existingOutput.renderer && output.type === RenderOutputType.Extension)) {
                 if (createWhenIdle) {
                     this._webview.requestCreateOutputWhenWebviewIdle({ cellId: cell.id, cellHandle: cell.handle, cellUri: cell.uri, executionId: cell.internalMetadata.executionId }, output, cellTop, offset);
                 }
@@ -2219,7 +2237,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
                 }
             }
             else if (existingOutput.renderer
-                && output.type === 1
+                && output.type === RenderOutputType.Extension
                 && existingOutput.renderer.id !== output.renderer.id) {
                 this._webview.removeInsets([output.source]);
                 this._webview.createOutput({ cellId: cell.id, cellHandle: cell.handle, cellUri: cell.uri }, output, cellTop, offset);
@@ -2254,7 +2272,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (!( (this._webview.insetMapping.has(output.source)))) {
                 return this.createOutput(cell, output, offset, false);
             }
-            if (output.type === 1 ) {
+            if (output.type === RenderOutputType.Extension) {
                 this.notebookRendererMessaging.prepare(output.renderer.id);
             }
             const webviewTop = parseInt(this._list.webviewElement.domNode.style.top, 10);
@@ -2455,7 +2473,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             renderDurationMap[rendererId] = (renderDurationMap[rendererId] ?? 0) + duration;
             this.textModel.applyEdits([
                 {
-                    editType: 9 ,
+                    editType: CellEditType.PartialInternalMetadata,
                     index: cellIndex,
                     internalMetadata: {
                         executionId: executionId,

package/vscode/src/vs/workbench/contrib/notebook/browser/notebookOptions.js

@@ -4,6 +4,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isObject } from '../../../../base/common/types.js';
 import { FontMeasurements } from '../../../../editor/browser/config/fontMeasurements.js';
 import { BareFontInfo } from '../../../../editor/common/config/fontInfo.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { NotebookSetting } from '../common/notebookCommon.js';
 const SCROLLABLE_ELEMENT_PADDING_TOP = 18;
 const OutputInnerContainerTopPadding = 4;
@@ -53,6 +54,7 @@ class NotebookOptions extends Disposable {
         const showFoldingControls = this._computeShowFoldingControlsOption();
         const fontSize = this.configurationService.getValue('editor.fontSize');
         const markupFontSize = this.configurationService.getValue(NotebookSetting.markupFontSize);
+        const markdownLineHeight = this.configurationService.getValue(NotebookSetting.markdownLineHeight);
         let editorOptionsCustomizations = this.configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations) ?? {};
         editorOptionsCustomizations = isObject(editorOptionsCustomizations) ? editorOptionsCustomizations : {};
         const interactiveWindowCollapseCodeCells = this.configurationService.getValue(NotebookSetting.interactiveWindowCollapseCodeCells);
@@ -130,6 +132,7 @@ class NotebookOptions extends Disposable {
             outputFontFamily,
             outputLineHeight,
             markupFontSize,
+            markdownLineHeight,
             editorOptionsCustomizations,
             focusIndicatorGap: 3,
             interactiveWindowCollapseCodeCells,
@@ -151,7 +154,7 @@ class NotebookOptions extends Disposable {
                 affectsConfiguration(configuration) {
                     return configuration === NotebookSetting.insertToolbarLocation;
                 },
-                source: 7 ,
+                source: ConfigurationTarget.DEFAULT,
                 affectedKeys: ( new Set([NotebookSetting.insertToolbarLocation])),
                 change: { keys: [NotebookSetting.insertToolbarLocation], overrides: [] },
             });
@@ -202,28 +205,28 @@ class NotebookOptions extends Disposable {
     _migrateDeprecatedSetting(deprecatedKey, key) {
         const deprecatedSetting = this.configurationService.inspect(deprecatedKey);
         if (deprecatedSetting.application !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, 1 );
-            this.configurationService.updateValue(key, deprecatedSetting.application.value, 1 );
+            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.APPLICATION);
+            this.configurationService.updateValue(key, deprecatedSetting.application.value, ConfigurationTarget.APPLICATION);
         }
         if (deprecatedSetting.user !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, 2 );
-            this.configurationService.updateValue(key, deprecatedSetting.user.value, 2 );
+            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.USER);
+            this.configurationService.updateValue(key, deprecatedSetting.user.value, ConfigurationTarget.USER);
         }
         if (deprecatedSetting.userLocal !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, 3 );
-            this.configurationService.updateValue(key, deprecatedSetting.userLocal.value, 3 );
+            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.USER_LOCAL);
+            this.configurationService.updateValue(key, deprecatedSetting.userLocal.value, ConfigurationTarget.USER_LOCAL);
         }
         if (deprecatedSetting.userRemote !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, 4 );
-            this.configurationService.updateValue(key, deprecatedSetting.userRemote.value, 4 );
+            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.USER_REMOTE);
+            this.configurationService.updateValue(key, deprecatedSetting.userRemote.value, ConfigurationTarget.USER_REMOTE);
         }
         if (deprecatedSetting.workspace !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, 5 );
-            this.configurationService.updateValue(key, deprecatedSetting.workspace.value, 5 );
+            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.WORKSPACE);
+            this.configurationService.updateValue(key, deprecatedSetting.workspace.value, ConfigurationTarget.WORKSPACE);
         }
         if (deprecatedSetting.workspaceFolder !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, 6 );
-            this.configurationService.updateValue(key, deprecatedSetting.workspaceFolder.value, 6 );
+            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.WORKSPACE_FOLDER);
+            this.configurationService.updateValue(key, deprecatedSetting.workspaceFolder.value, ConfigurationTarget.WORKSPACE_FOLDER);
         }
     }
     _computeOutputLineHeight(lineHeight, outputFontSize) {
@@ -264,6 +267,7 @@ class NotebookOptions extends Disposable {
         const fontSize = e.affectsConfiguration('editor.fontSize');
         const outputFontSize = e.affectsConfiguration(NotebookSetting.outputFontSize);
         const markupFontSize = e.affectsConfiguration(NotebookSetting.markupFontSize);
+        const markdownLineHeight = e.affectsConfiguration(NotebookSetting.markdownLineHeight);
         const fontFamily = e.affectsConfiguration('editor.fontFamily');
         const outputFontFamily = e.affectsConfiguration(NotebookSetting.outputFontFamily);
         const editorOptionsCustomizations = e.affectsConfiguration(NotebookSetting.cellEditorOptionsCustomizations);
@@ -290,6 +294,7 @@ class NotebookOptions extends Disposable {
             && !fontSize
             && !outputFontSize
             && !markupFontSize
+            && !markdownLineHeight
             && !fontFamily
             && !outputFontFamily
             && !editorOptionsCustomizations
@@ -357,6 +362,9 @@ class NotebookOptions extends Disposable {
         if (markupFontSize) {
             configuration.markupFontSize = this.configurationService.getValue(NotebookSetting.markupFontSize);
         }
+        if (markdownLineHeight) {
+            configuration.markdownLineHeight = this.configurationService.getValue(NotebookSetting.markdownLineHeight);
+        }
         if (outputFontFamily) {
             configuration.outputFontFamily = this.configurationService.getValue(NotebookSetting.outputFontFamily);
         }
@@ -401,6 +409,7 @@ class NotebookOptions extends Disposable {
             fontSize,
             outputFontSize,
             markupFontSize,
+            markdownLineHeight,
             fontFamily,
             outputFontFamily,
             editorOptionsCustomizations,
@@ -585,6 +594,7 @@ class NotebookOptions extends Disposable {
             outputFontSize: this._layoutConfiguration.outputFontSize,
             outputFontFamily: this._layoutConfiguration.outputFontFamily,
             markupFontSize: this._layoutConfiguration.markupFontSize,
+            markdownLineHeight: this._layoutConfiguration.markdownLineHeight,
             outputLineHeight: this._layoutConfiguration.outputLineHeight,
             outputScrolling: this._layoutConfiguration.outputScrolling,
             outputWordWrap: this._layoutConfiguration.outputWordWrap,
@@ -607,6 +617,7 @@ class NotebookOptions extends Disposable {
             outputFontSize: this._layoutConfiguration.outputFontSize,
             outputFontFamily: this._layoutConfiguration.outputFontFamily,
             markupFontSize: this._layoutConfiguration.markupFontSize,
+            markdownLineHeight: this._layoutConfiguration.markdownLineHeight,
             outputLineHeight: this._layoutConfiguration.outputLineHeight,
             outputScrolling: this._layoutConfiguration.outputScrolling,
             outputWordWrap: this._layoutConfiguration.outputWordWrap,

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.js

@@ -48,7 +48,7 @@ let CellComments = class CellComments extends CellContentPart {
             collapse: () => { }
         });
         const layoutInfo = this.notebookEditor.getLayoutInfo();
-        await this._commentThreadWidget.display(layoutInfo.fontInfo.lineHeight);
+        await this._commentThreadWidget.display(layoutInfo.fontInfo.lineHeight, true);
         this._applyTheme();
         this.commentTheadDisposables.add(this._commentThreadWidget.onDidResize(() => {
             if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget) {

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.js

@@ -1,5 +1,10 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import '../../../../../../base/common/arrays.js';
+import '../../../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../../base/common/observableInternal/utils.js';
+import '../../../../../../base/common/cancellation.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { NotebookChatController } from '../../controller/chat/notebookChatController.js';
@@ -66,7 +71,9 @@ let CellContextKeyManager = class CellContextKeyManager extends Disposable {
         this.elementDisposables.add(element.onDidChangeState(e => this.onDidChangeState(e)));
         if (element instanceof CodeCellViewModel) {
             this.elementDisposables.add(element.onDidChangeOutputs(() => this.updateForOutputs()));
-            this.elementDisposables.add(element.cellDiagnostics.onDidDiagnosticsChange(() => this.updateForDiagnostics()));
+            this.elementDisposables.add(autorun(reader => {
+                this.cellHasErrorDiagnostics.set(!!reader.readObservable(element.excecutionError));
+            }));
         }
         this.elementDisposables.add(this.notebookEditor.onDidChangeActiveCell(() => this.updateForFocusState()));
         if (this.element instanceof MarkupCellViewModel) {
@@ -82,7 +89,6 @@ let CellContextKeyManager = class CellContextKeyManager extends Disposable {
             this.updateForCollapseState();
             this.updateForOutputs();
             this.updateForChat();
-            this.updateForDiagnostics();
             this.cellLineNumbers.set(this.element.lineNumbers);
             this.cellResource.set(( this.element.uri.toString()));
         });
@@ -193,11 +199,6 @@ let CellContextKeyManager = class CellContextKeyManager extends Disposable {
         }
         this.cellGeneratedByChat.set(chatController.isCellGeneratedByChat(this.element));
     }
-    updateForDiagnostics() {
-        if (this.element instanceof CodeCellViewModel) {
-            this.cellHasErrorDiagnostics.set(!!this.element.cellDiagnostics.ErrorDetails);
-        }
-    }
 };
 CellContextKeyManager = ( __decorate([
     ( __param(2, IContextKeyService)),

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.js

@@ -5,7 +5,7 @@ import { isMacintosh } from '../../../../../../base/common/platform.js';
 import { expandCellRangesWithHiddenCells } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
 import { cloneNotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
-import { SelectionStateType } from '../../../common/notebookCommon.js';
+import { CellEditType, SelectionStateType } from '../../../common/notebookCommon.js';
 import { cellRangesToIndexes } from '../../../common/notebookRange.js';
 const $ = $$1;
 const DRAGGING_CLASS = 'cell-dragging';
@@ -197,7 +197,7 @@ class CellDragAndDropController extends Disposable {
             }
             textModel.applyEdits([
                 {
-                    editType: 1 ,
+                    editType: CellEditType.Replace,
                     index: originalToIdx,
                     count: 0,
                     cells: ( cellRangesToIndexes([range]).map(
@@ -357,7 +357,7 @@ function performCellDropEdits(editor, draggedCell, dropDirection, draggedOverCel
         }
         const fromIndexDelta = range.start >= originalToIdx ? numCells : 0;
         const edit = {
-            editType: 6 ,
+            editType: CellEditType.Move,
             index: range.start + fromIndexDelta,
             length,
             newIdx

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDragRenderer.js

@@ -2,7 +2,9 @@ import { $, reset } from '../../../../../../base/browser/dom.js';
 import { createTrustedTypesPolicy } from '../../../../../../base/browser/trustedTypes.js';
 import { Color } from '../../../../../../base/common/color.js';
 import { isWindows } from '../../../../../../base/common/platform.js';
+import { EditorOption } from '../../../../../../editor/common/config/editorOptions.js';
 import { Range } from '../../../../../../editor/common/core/range.js';
+import { ColorId } from '../../../../../../editor/common/encodedTokenAttributes.js';
 import { TokenizationRegistry } from '../../../../../../editor/common/languages.js';
 import { tokenizeLineToHTML } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';
 class EditorTextRenderer {
@@ -15,13 +17,13 @@ class EditorTextRenderer {
             return null;
         }
         const colorMap = this.getDefaultColorMap();
-        const fontInfo = editor.getOptions().get(50 );
+        const fontInfo = editor.getOptions().get(EditorOption.fontInfo);
         const fontFamilyVar = '--notebook-editor-font-family';
         const fontSizeVar = '--notebook-editor-font-size';
         const fontWeightVar = '--notebook-editor-font-weight';
         const style = ``
-            + `color: ${colorMap[1 ]};`
-            + `background-color: ${colorMap[2 ]};`
+            + `color: ${colorMap[ColorId.DefaultForeground]};`
+            + `background-color: ${colorMap[ColorId.DefaultBackground]};`
             + `font-family: var(${fontFamilyVar});`
             + `font-weight: var(${fontWeightVar});`
             + `font-size: var(${fontSizeVar});`

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocusIndicator.js

@@ -49,7 +49,7 @@ class CellFocusIndicator extends CellContentPart {
     updateInternalLayoutNow(element) {
         if (element.cellKind === CellKind.Markup) {
             const indicatorPostion = this.notebookEditor.notebookOptions.computeIndicatorPosition(element.layoutInfo.totalHeight, element.layoutInfo.foldHintHeight, this.notebookEditor.textModel?.viewType);
-            this.bottom.domNode.style.transform = `translateY(${indicatorPostion.bottomIndicatorTop}px)`;
+            this.bottom.domNode.style.transform = `translateY(${indicatorPostion.bottomIndicatorTop + 6}px)`;
             this.left.setHeight(indicatorPostion.verticalIndicatorHeight);
             this.right.setHeight(indicatorPostion.verticalIndicatorHeight);
             this.codeFocusIndicator.setHeight(indicatorPostion.verticalIndicatorHeight - this.getIndicatorTopMargin() * 2 - element.layoutInfo.chatHeight);