@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.js

@@ -4,7 +4,7 @@ import { IEditorWorkerService } from '../../../../../editor/common/services/edit
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { LineRange } from './lineRange.js';
 import { DetailedLineRangeMapping, RangeMapping } from './mapping.js';
-import { observableConfigValue } from '../utils.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
 let MergeDiffComputer = class MergeDiffComputer {
     constructor(editorWorkerService, configurationService) {
         this.editorWorkerService = editorWorkerService;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.js

@@ -1,5 +1,6 @@
 import { compareBy, numberComparator } from '../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { Constants } from '../../../../../base/common/uint.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 class LineRange {
     static { this.compareByStart = compareBy(l => l.startLineNumber, numberComparator); }
@@ -86,7 +87,7 @@ class LineRange {
             this.startLineNumber,
             1,
             this.endLineNumberExclusive - 1,
-            1073741824
+            Constants.MAX_SAFE_SMALL_INTEGER
         ));
     }
     toInclusiveRangeOrEmpty() {
@@ -97,7 +98,7 @@ class LineRange {
             this.startLineNumber,
             1,
             this.endLineNumberExclusive - 1,
-            1073741824
+            Constants.MAX_SAFE_SMALL_INTEGER
         ));
     }
     intersects(lineRange) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -9,12 +9,12 @@ import { waitForState } from '../../../../../base/common/observableInternal/prom
 import { Range } from '../../../../../editor/common/core/range.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { localizeWithPath } from '../../../../../nls.js';
-import { UndoRedoGroup } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { UndoRedoElementType, UndoRedoGroup } from '../../../../../platform/undoRedo/common/undoRedo.js';
 import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.service.js';
 import { EditorModel } from '../../../../common/editor/editorModel.js';
 import { LineRange } from './lineRange.js';
 import { DocumentLineRangeMap, LineRangeMapping, DocumentRangeMap } from './mapping.js';
-import { TextModelDiffs } from './textModelDiffs.js';
+import { TextModelDiffs, TextModelDiffState, TextModelDiffChangeReason } from './textModelDiffs.js';
 import { leftJoin } from '../utils.js';
 import { ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from './modifiedBaseRange.js';
 const _moduleId = "vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
@@ -75,29 +75,29 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
                 this.input2TextModelDiffs,
                 this.resultTextModelDiffs,
             ].map((s) => s.state.read(reader))));
-            if (( (states.some((s) => s === 1 )))) {
-                return 1 ;
+            if (( (states.some((s) => s === TextModelDiffState.initializing)))) {
+                return MergeEditorModelState.initializing;
             }
-            if (( (states.some((s) => s === 3 )))) {
-                return 3 ;
+            if (( (states.some((s) => s === TextModelDiffState.updating)))) {
+                return MergeEditorModelState.updating;
             }
-            return 2 ;
+            return MergeEditorModelState.upToDate;
         });
         this.inputDiffComputingState = derived(this, reader => {
             const states = ( ([
                 this.input1TextModelDiffs,
                 this.input2TextModelDiffs,
             ].map((s) => s.state.read(reader))));
-            if (( (states.some((s) => s === 1 )))) {
-                return 1 ;
+            if (( (states.some((s) => s === TextModelDiffState.initializing)))) {
+                return MergeEditorModelState.initializing;
             }
-            if (( (states.some((s) => s === 3 )))) {
-                return 3 ;
+            if (( (states.some((s) => s === TextModelDiffState.updating)))) {
+                return MergeEditorModelState.updating;
             }
-            return 2 ;
+            return MergeEditorModelState.upToDate;
         });
-        this.isUpToDate = derived(this, reader => this.diffComputingState.read(reader) === 2 );
-        this.onInitialized = waitForState(this.diffComputingState, state => state === 2 ).then(() => { });
+        this.isUpToDate = derived(this, reader => this.diffComputingState.read(reader) === MergeEditorModelState.upToDate);
+        this.onInitialized = waitForState(this.diffComputingState, state => state === MergeEditorModelState.upToDate).then(() => { });
         this.firstRun = true;
         this.unhandledConflictsCount = derived(this, reader => {
             const map = this.modifiedBaseRangeResultStates.read(reader);
@@ -125,7 +125,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
                         shouldRecomputeHandledFromAccepted = true;
                     }
                     return ctx.didChange(this.resultTextModelDiffs.diffs)
-                        ? ctx.change === 1
+                        ? ctx.change === TextModelDiffChangeReason.textChange
                         : true;
                 },
             }, (reader) => {
@@ -155,7 +155,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         }
     }
     async reset() {
-        await waitForState(this.inputDiffComputingState, state => state === 2 );
+        await waitForState(this.inputDiffComputingState, state => state === MergeEditorModelState.upToDate);
         const states = this.modifiedBaseRangeResultStates.get();
         transaction(tx => {
             for (const [range, state] of states) {
@@ -383,7 +383,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         const dataRef = ( (new WeakRef(ModifiedBaseRangeData)));
         const modelRef = ( (new WeakRef(this)));
         this.undoRedoService.pushElement({
-            type: 0 ,
+            type: UndoRedoElementType.Resource,
             resource: this.resultTextModel.uri,
             code: 'setInputHandled',
             label: ( localizeWithPath(_moduleId, 0, "Set Input Handled")),
@@ -450,7 +450,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         return chunks.join();
     }
     async getResultValueWithConflictMarkers() {
-        await waitForState(this.diffComputingState, state => state === 2 );
+        await waitForState(this.diffComputingState, state => state === MergeEditorModelState.upToDate);
         if (this.unhandledConflictsCount.get() === 0) {
             return this.resultTextModel.getValue();
         }
@@ -587,6 +587,12 @@ class ModifiedBaseRangeData {
         this.handled = derived(this, reader => this.handledInput1.read(reader) && this.handledInput2.read(reader));
     }
 }
+var MergeEditorModelState;
+( ((function(MergeEditorModelState) {
+    MergeEditorModelState[MergeEditorModelState["initializing"] = 1] = "initializing";
+    MergeEditorModelState[MergeEditorModelState["upToDate"] = 2] = "upToDate";
+    MergeEditorModelState[MergeEditorModelState["updating"] = 3] = "updating";
+})(MergeEditorModelState || (MergeEditorModelState = {}))));
 class MarkAsHandledUndoRedoElement {
     constructor(resource, mergeEditorModelRef, stateRef, input1Handled, input2Handled) {
         this.resource = resource;
@@ -596,7 +602,7 @@ class MarkAsHandledUndoRedoElement {
         this.input2Handled = input2Handled;
         this.code = 'undoMarkAsHandled';
         this.label = ( localizeWithPath(_moduleId, 1, 'Undo Mark As Handled'));
-        this.type = 0 ;
+        this.type = UndoRedoElementType.Resource;
     }
     redo() {
         const mergeEditorModel = this.mergeEditorModelRef.deref();
@@ -627,4 +633,4 @@ class MarkAsHandledUndoRedoElement {
         });
     }
 }
-export { MergeEditorModel };
+export { MergeEditorModel, MergeEditorModelState };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.js

@@ -1,6 +1,7 @@
 import { equals, tieBreakComparators, compareBy, numberComparator } from '../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { splitLines } from '../../../../../base/common/strings.js';
+import { Constants } from '../../../../../base/common/uint.js';
 import { Position } from '../../../../../editor/common/core/position.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { LineRangeEdit, RangeEdit } from './editing.js';
@@ -157,10 +158,7 @@ function editsToLineRangeEdit(range, sortedEdits, textModel) {
         currentPosition = edit.range.getEndPosition();
     }
     const endsLineAfter = range.endLineNumberExclusive <= textModel.getLineCount();
-    const end = endsLineAfter ? ( new Position(range.endLineNumberExclusive, 1)) : ( new Position(
-        range.endLineNumberExclusive - 1,
-        1073741824
-    ));
+    const end = endsLineAfter ? ( new Position(range.endLineNumberExclusive, 1)) : ( new Position(range.endLineNumberExclusive - 1, Constants.MAX_SAFE_SMALL_INTEGER));
     const originalText = textModel.getValueInRange(Range.fromPositions(currentPosition, end));
     text += originalText;
     const lines = splitLines(text);
@@ -204,9 +202,9 @@ class AbstractModifiedBaseRangeState {
     }
     getInput(inputNumber) {
         if (!this.isInputIncluded(inputNumber)) {
-            return 0 ;
+            return InputState.excluded;
         }
-        return 1 ;
+        return InputState.first;
     }
 }
 class ModifiedBaseRangeStateBase extends AbstractModifiedBaseRangeState {
@@ -282,7 +280,7 @@ class ModifiedBaseRangeStateBoth extends AbstractModifiedBaseRangeState {
         return other.kind === ModifiedBaseRangeStateKind.both && this.firstInput === other.firstInput && this.smartCombination === other.smartCombination;
     }
     getInput(inputNumber) {
-        return inputNumber === this.firstInput ? 1  : 2 ;
+        return inputNumber === this.firstInput ? InputState.first : InputState.second;
     }
 }
 class ModifiedBaseRangeStateUnrecognized extends AbstractModifiedBaseRangeState {
@@ -304,4 +302,11 @@ var ModifiedBaseRangeState;
     ModifiedBaseRangeState.base = ( new ModifiedBaseRangeStateBase());
     ModifiedBaseRangeState.unrecognized = ( new ModifiedBaseRangeStateUnrecognized());
 })(ModifiedBaseRangeState || (ModifiedBaseRangeState = {})));
-export { AbstractModifiedBaseRangeState, ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateBase, ModifiedBaseRangeStateBoth, ModifiedBaseRangeStateInput1, ModifiedBaseRangeStateInput2, ModifiedBaseRangeStateKind, ModifiedBaseRangeStateUnrecognized, getOtherInputNumber };
+var InputState;
+( (function(InputState) {
+    InputState[InputState["excluded"] = 0] = "excluded";
+    InputState[InputState["first"] = 1] = "first";
+    InputState[InputState["second"] = 2] = "second";
+    InputState[InputState["unrecognized"] = 3] = "unrecognized";
+})(InputState || (InputState = {})));
+export { AbstractModifiedBaseRangeState, InputState, ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateBase, ModifiedBaseRangeStateBoth, ModifiedBaseRangeStateInput1, ModifiedBaseRangeStateInput2, ModifiedBaseRangeStateKind, ModifiedBaseRangeStateUnrecognized, getOtherInputNumber };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js

@@ -20,7 +20,7 @@ class TextModelDiffs extends Disposable {
         this.textModel = textModel;
         this.diffComputer = diffComputer;
         this._recomputeCount = 0;
-        this._state = observableValue(this, 1 );
+        this._state = observableValue(this, TextModelDiffState.initializing);
         this._diffs = observableValue(this, []);
         this._barrier = ( new ReentrancyBarrier());
         this._isDisposed = false;
@@ -49,11 +49,11 @@ class TextModelDiffs extends Disposable {
     _recompute(reader) {
         this._recomputeCount++;
         const currentRecomputeIdx = this._recomputeCount;
-        if (this._state.get() === 1 ) {
+        if (this._state.get() === TextModelDiffState.initializing) {
             this._isInitializing = true;
         }
         transaction(tx => {
-            this._state.set(this._isInitializing ? 1  : 3 , tx, 0 );
+            this._state.set(this._isInitializing ? TextModelDiffState.initializing : TextModelDiffState.updating, tx, TextModelDiffChangeReason.other);
         });
         const result = this.diffComputer.computeDiff(this.baseTextModel, this.textModel, reader);
         result.then((result) => {
@@ -65,18 +65,18 @@ class TextModelDiffs extends Disposable {
             }
             transaction(tx => {
                 if (result.diffs) {
-                    this._state.set(2 , tx, 1 );
-                    this._diffs.set(result.diffs, tx, 1 );
+                    this._state.set(TextModelDiffState.upToDate, tx, TextModelDiffChangeReason.textChange);
+                    this._diffs.set(result.diffs, tx, TextModelDiffChangeReason.textChange);
                 }
                 else {
-                    this._state.set(4 , tx, 1 );
+                    this._state.set(TextModelDiffState.error, tx, TextModelDiffChangeReason.textChange);
                 }
                 this._isInitializing = false;
             });
         });
     }
     ensureUpToDate() {
-        if (this.state.get() !== 2 ) {
+        if (this.state.get() !== TextModelDiffState.upToDate) {
             throw ( new BugIndicatingError('Cannot remove diffs when the model is not up to date'));
         }
     }
@@ -99,7 +99,7 @@ class TextModelDiffs extends Disposable {
                 ? d.addOutputLineDelta(diffToRemove.inputRange.lineCount - diffToRemove.outputRange.lineCount)
                 : d));
         }
-        this._diffs.set(diffs, transaction, 0 );
+        this._diffs.set(diffs, transaction, TextModelDiffChangeReason.other);
     }
     applyEditRelativeToOriginal(edit, transaction, group) {
         this.ensureUpToDate();
@@ -133,7 +133,7 @@ class TextModelDiffs extends Disposable {
             const edits = ( new LineRangeEdit(edit.range.delta(delta), edit.newLines)).toEdits(this.textModel.getLineCount());
             this.textModel.pushEditOperations(null, edits, () => null, group);
         });
-        this._diffs.set(newDiffs, transaction, 0 );
+        this._diffs.set(newDiffs, transaction, TextModelDiffChangeReason.other);
     }
     findTouchingDiffs(baseRange) {
         return this.diffs.get().filter(d => d.inputRange.touches(baseRange));
@@ -166,4 +166,16 @@ class TextModelDiffs extends Disposable {
         return LineRange.fromLineNumbers(start, endExclusive);
     }
 }
-export { TextModelDiffs };
+var TextModelDiffChangeReason;
+( (function(TextModelDiffChangeReason) {
+    TextModelDiffChangeReason[TextModelDiffChangeReason["other"] = 0] = "other";
+    TextModelDiffChangeReason[TextModelDiffChangeReason["textChange"] = 1] = "textChange";
+})(TextModelDiffChangeReason || (TextModelDiffChangeReason = {})));
+var TextModelDiffState;
+( (function(TextModelDiffState) {
+    TextModelDiffState[TextModelDiffState["initializing"] = 1] = "initializing";
+    TextModelDiffState[TextModelDiffState["upToDate"] = 2] = "upToDate";
+    TextModelDiffState[TextModelDiffState["updating"] = 3] = "updating";
+    TextModelDiffState[TextModelDiffState["error"] = 4] = "error";
+})(TextModelDiffState || (TextModelDiffState = {})));
+export { TextModelDiffChangeReason, TextModelDiffState, TextModelDiffs };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/utils.js

@@ -4,8 +4,9 @@ import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/derived.js';
 import { autorunOpts } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 function setStyle(element, style) {
     Object.entries(style).forEach(([key, value]) => {
@@ -95,7 +96,7 @@ let PersistentStore = class PersistentStore {
     }
     get() {
         if (!this.hasValue) {
-            const value = this.storageService.get(this.key, 0 );
+            const value = this.storageService.get(this.key, StorageScope.PROFILE);
             if (value !== undefined) {
                 try {
                     this.value = JSON.parse(value);
@@ -110,17 +111,10 @@ let PersistentStore = class PersistentStore {
     }
     set(newValue) {
         this.value = newValue;
-        this.storageService.store(this.key, JSON.stringify(this.value), 0 , 0 );
+        this.storageService.store(this.key, JSON.stringify(this.value), StorageScope.PROFILE, StorageTarget.USER);
     }
 };
 PersistentStore = ( __decorate([
     ( __param(1, IStorageService))
 ], PersistentStore));
-function observableConfigValue(key, defaultValue, configurationService) {
-    return observableFromEvent((handleChange) => configurationService.onDidChangeConfiguration(e => {
-        if (e.affectsConfiguration(key)) {
-            handleChange(e);
-        }
-    }), () => configurationService.getValue(key) ?? defaultValue);
-}
-export { PersistentStore, applyObservableDecorations, concatArrays, deepMerge, join, leftJoin, observableConfigValue, setFields, setStyle, thenIfNotDisposed };
+export { PersistentStore, applyObservableDecorations, concatArrays, deepMerge, join, leftJoin, setFields, setStyle, thenIfNotDisposed };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js

@@ -18,8 +18,9 @@ import { MultiDiffEditorViewModel } from '../../../../editor/browser/widget/mult
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { ConfirmResult } from '../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
+import { EditorInputCapabilities, DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { MultiDiffEditorIcon } from './icons.contribution.js';
 import { MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
@@ -52,7 +53,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
     }
     static { this.ID = 'workbench.input.multiDiffEditor'; }
     get resource() { return this.multiDiffSource; }
-    get capabilities() { return 2 ; }
+    get capabilities() { return EditorInputCapabilities.Readonly; }
     get typeId() { return MultiDiffEditorInput_1.ID; }
     getName() { return this._name; }
     get editorId() { return DEFAULT_EDITOR_ASSOCIATION.id; }
@@ -97,7 +98,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         this.onDidChangeDirty = Event.fromObservableLight(this._isDirtyObservable);
         this.closeHandler = {
             async confirm() {
-                return 1 ;
+                return ConfirmResult.DONT_SAVE;
             },
             showConfirm() {
                 return false;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js

@@ -10,13 +10,10 @@ import { NotebookVisibleCellObserver } from './notebookVisibleCellObserver.js';
 import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
 import { cellStatusIconSuccess, cellStatusIconError } from '../../notebookEditorWidget.js';
 import { successStateIcon, errorStateIcon, pendingStateIcon, executingStateIcon } from '../../notebookIcons.js';
-import { NotebookCellExecutionState } from '../../../common/notebookCommon.js';
+import { NotebookCellExecutionState, CellStatusbarAlignment } from '../../../common/notebookCommon.js';
 import { NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 import { INotebookService } from '../../../common/notebookService.service.js';
-import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
-import { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID } from '../cellCommands/cellCommands.js';
-import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.service.js';
 var ExecutionStateCellStatusBarItem_1, TimerCellStatusBarItem_1;
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController";
 function formatCellDuration(duration, showMilliseconds = true) {
@@ -137,7 +134,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
                     text: `$(${successStateIcon.id})`,
                     color: themeColorFromId(cellStatusIconSuccess),
                     tooltip: ( localizeWithPath(_moduleId, 0, "Success")),
-                    alignment: 1 ,
+                    alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
         }
@@ -146,7 +143,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
                     text: `$(${errorStateIcon.id})`,
                     color: themeColorFromId(cellStatusIconError),
                     tooltip: ( localizeWithPath(_moduleId, 1, "Failed")),
-                    alignment: 1 ,
+                    alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
         }
@@ -154,7 +151,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                     text: `$(${pendingStateIcon.id})`,
                     tooltip: ( localizeWithPath(_moduleId, 2, "Pending")),
-                    alignment: 1 ,
+                    alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
         }
@@ -165,7 +162,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                     text: `$(${icon.id})`,
                     tooltip: ( localizeWithPath(_moduleId, 3, "Executing")),
-                    alignment: 1 ,
+                    alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
         }
@@ -288,7 +285,7 @@ let TimerCellStatusBarItem = class TimerCellStatusBarItem extends Disposable {
         }
         return {
             text: formatCellDuration(duration, false),
-            alignment: 1 ,
+            alignment: CellStatusbarAlignment.Left,
             priority: Number.MAX_SAFE_INTEGER - 5,
             tooltip
         };
@@ -303,51 +300,4 @@ TimerCellStatusBarItem = TimerCellStatusBarItem_1 = ( (__decorate([
     ( (__param(2, INotebookExecutionStateService))),
     ( (__param(3, INotebookService)))
 ], TimerCellStatusBarItem)));
-let DiagnosticCellStatusBarContrib = class DiagnosticCellStatusBarContrib extends Disposable {
-    static { this.id = 'workbench.notebook.statusBar.diagtnostic'; }
-    constructor(notebookEditor, instantiationService) {
-        super();
-        this._register(( (new NotebookStatusBarController(notebookEditor, (vm, cell) => cell instanceof CodeCellViewModel ?
-            instantiationService.createInstance(DiagnosticCellStatusBarItem, vm, cell) :
-            Disposable.None))));
-    }
-};
-DiagnosticCellStatusBarContrib = ( (__decorate([
-    ( (__param(1, IInstantiationService)))
-], DiagnosticCellStatusBarContrib)));
-registerNotebookContribution(DiagnosticCellStatusBarContrib.id, DiagnosticCellStatusBarContrib);
-let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disposable {
-    constructor(_notebookViewModel, cell, keybindingService) {
-        super();
-        this._notebookViewModel = _notebookViewModel;
-        this.cell = cell;
-        this.keybindingService = keybindingService;
-        this._currentItemIds = [];
-        this._update();
-        this._register(this.cell.cellDiagnostics.onDidDiagnosticsChange(() => this._update()));
-    }
-    async _update() {
-        let item;
-        if (!!this.cell.cellDiagnostics.ErrorDetails) {
-            const keybinding = this.keybindingService.lookupKeybinding(OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID)?.getLabel();
-            const tooltip = ( localizeWithPath(_moduleId, 6, "Quick Actions {0}", `(${keybinding})`));
-            item = {
-                text: `$(sparkle)`,
-                tooltip,
-                alignment: 1 ,
-                command: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
-                priority: Number.MAX_SAFE_INTEGER - 1
-            };
-        }
-        const items = item ? [item] : [];
-        this._currentItemIds = this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this.cell.handle, items }]);
-    }
-    dispose() {
-        super.dispose();
-        this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this.cell.handle, items: [] }]);
-    }
-};
-DiagnosticCellStatusBarItem = ( (__decorate([
-    ( (__param(2, IKeybindingService)))
-], DiagnosticCellStatusBarItem)));
-export { DiagnosticCellStatusBarContrib, ExecutionStateCellStatusBarContrib, NotebookStatusBarController, TimerCellStatusBarContrib, formatCellDuration };
+export { ExecutionStateCellStatusBarContrib, NotebookStatusBarController, TimerCellStatusBarContrib, formatCellDuration };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findFilters.js

@@ -37,7 +37,25 @@ class NotebookFindFilters extends Disposable {
             this._onDidChange.fire({ codeOutput: value });
         }
     }
-    constructor(markupInput, markupPreview, codeInput, codeOutput) {
+    get searchInRanges() {
+        return this._searchInRanges;
+    }
+    set searchInRanges(value) {
+        if (this._searchInRanges !== value) {
+            this._searchInRanges = value;
+            this._onDidChange.fire({ searchInRanges: value });
+        }
+    }
+    get selectedRanges() {
+        return this._selectedRanges;
+    }
+    set selectedRanges(value) {
+        if (this._selectedRanges !== value) {
+            this._selectedRanges = value;
+            this._onDidChange.fire({ searchInRanges: this._searchInRanges });
+        }
+    }
+    constructor(markupInput, markupPreview, codeInput, codeOutput, searchInRanges, selectedRanges) {
         super();
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
@@ -45,10 +63,14 @@ class NotebookFindFilters extends Disposable {
         this._markupPreview = true;
         this._codeInput = true;
         this._codeOutput = true;
+        this._searchInRanges = false;
+        this._selectedRanges = [];
         this._markupInput = markupInput;
         this._markupPreview = markupPreview;
         this._codeInput = codeInput;
         this._codeOutput = codeOutput;
+        this._searchInRanges = searchInRanges;
+        this._selectedRanges = selectedRanges;
         this._initialMarkupInput = markupInput;
         this._initialMarkupPreview = markupPreview;
         this._initialCodeInput = codeInput;
@@ -65,6 +87,8 @@ class NotebookFindFilters extends Disposable {
         this._markupPreview = v.markupPreview;
         this._codeInput = v.codeInput;
         this._codeOutput = v.codeOutput;
+        this._searchInRanges = v.searchInRanges;
+        this._selectedRanges = v.selectedRanges;
     }
 }
 export { NotebookFindFilters };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.js

@@ -76,10 +76,7 @@ let FindModel = class FindModel extends Disposable {
         this._findMatchDecorationModel = ( new FindMatchDecorationModel(this._notebookEditor, this._notebookEditor.getId()));
     }
     _updateCellStates(e) {
-        if (!this._state.filters?.markupInput) {
-            return;
-        }
-        if (!this._state.filters?.markupPreview) {
+        if (!this._state.filters?.markupInput || !this._state.filters?.markupPreview || !this._state.filters?.searchInRanges || !this._state.filters?.selectedRanges) {
             return;
         }
         const updateEditingState = () => {
@@ -96,7 +93,9 @@ let FindModel = class FindModel extends Disposable {
                 includeMarkupInput: true,
                 includeCodeInput: false,
                 includeMarkupPreview: false,
-                includeOutput: false
+                includeOutput: false,
+                searchInRanges: this._state.filters?.searchInRanges,
+                selectedRanges: this._state.filters?.selectedRanges
             };
             const contentMatches = viewModel.find(this._state.searchString, options);
             for (let i = 0; i < viewModel.length; i++) {
@@ -356,7 +355,9 @@ let FindModel = class FindModel extends Disposable {
             includeMarkupInput: this._state.filters?.markupInput ?? true,
             includeCodeInput: this._state.filters?.codeInput ?? true,
             includeMarkupPreview: !!this._state.filters?.markupPreview,
-            includeOutput: !!this._state.filters?.codeOutput
+            includeOutput: !!this._state.filters?.codeOutput,
+            searchInRanges: this._state.filters?.searchInRanges,
+            selectedRanges: this._state.filters?.selectedRanges
         };
         ret = await this._notebookEditor.find(val, options, token);
         if (token.isCancellationRequested) {