@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js

@@ -3,12 +3,13 @@ import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/i
 import { hash } from '../../../../../base/common/hash.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { transaction } from '../../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/arrays.js';
+import '../../../../../base/common/event.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../base/common/observableInternal/utils.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
-import '../../../../../base/common/arrays.js';
-import { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../../../editor/common/config/editorOptions.js';
+import '../../../../../base/common/observableInternal/utils.js';
+import { EDITOR_FONT_DEFAULTS } from '../../../../../editor/common/config/editorOptions.js';
 import { localize } from '../../../../../nls.js';
 import { ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from '../model/modifiedBaseRange.js';
 import { FixedZoneWidget } from './fixedZoneWidget.js';
@@ -17,7 +18,7 @@ class ConflictActionsFactory extends Disposable {
         super();
         this._editor = _editor;
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(EditorOption.fontInfo) || e.hasChanged(EditorOption.codeLensFontSize) || e.hasChanged(EditorOption.codeLensFontFamily)) {
+            if (e.hasChanged(52 ) || e.hasChanged(19 ) || e.hasChanged(18 )) {
                 this._updateLensStyle();
             }
         }));
@@ -29,8 +30,8 @@ class ConflictActionsFactory extends Disposable {
     }
     _updateLensStyle() {
         const { codeLensHeight, fontSize } = this._getLayoutInfo();
-        const fontFamily = this._editor.getOption(EditorOption.codeLensFontFamily);
-        const editorFontInfo = this._editor.getOption(EditorOption.fontInfo);
+        const fontFamily = this._editor.getOption(18 );
+        const editorFontInfo = this._editor.getOption(52 );
         const fontFamilyVar = `--codelens-font-family${this._styleClassName}`;
         const fontFeaturesVar = `--codelens-font-features${this._styleClassName}`;
         let newStyle = `
@@ -45,10 +46,10 @@ class ConflictActionsFactory extends Disposable {
         this._editor.getContainerDomNode().style?.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
     }
     _getLayoutInfo() {
-        const lineHeightFactor = Math.max(1.3, this._editor.getOption(EditorOption.lineHeight) / this._editor.getOption(EditorOption.fontSize));
-        let fontSize = this._editor.getOption(EditorOption.codeLensFontSize);
+        const lineHeightFactor = Math.max(1.3, this._editor.getOption(69 ) / this._editor.getOption(54 ));
+        let fontSize = this._editor.getOption(19 );
         if (!fontSize || fontSize < 5) {
-            fontSize = (this._editor.getOption(EditorOption.fontSize) * .9) | 0;
+            fontSize = (this._editor.getOption(54 ) * .9) | 0;
         }
         return {
             fontSize,
@@ -84,15 +85,15 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localize(11438, "Manual Resolution")),
-                    tooltip: ( localize(11439, "This conflict has been resolved manually.")),
+                    text: ( localize(11472, "Manual Resolution")),
+                    tooltip: ( localize(11473, "This conflict has been resolved manually.")),
                 });
             }
             else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localize(11440, 'No Changes Accepted')),
+                    text: ( localize(11474, 'No Changes Accepted')),
                     tooltip: ( localize(
-                        11441,
+                        11475,
                         'The current resolution of this conflict equals the common ancestor of both the right and left changes.'
                     )),
                 });
@@ -114,20 +115,20 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localize(11442, 'Remove {0}', model.input1.title)), async () => {
+                stateToggles.push(command(( localize(11476, 'Remove {0}', model.input1.title)), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, state.withInputValue(1, false), true, tx);
                         model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
                     });
-                }, ( localize(11443, 'Remove {0} from the result document.', model.input1.title))));
+                }, ( localize(11477, 'Remove {0} from the result document.', model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localize(11442, 'Remove {0}', model.input2.title)), async () => {
+                stateToggles.push(command(( localize(11476, 'Remove {0}', model.input2.title)), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
                         model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
                     });
-                }, ( localize(11443, 'Remove {0} from the result document.', model.input2.title))));
+                }, ( localize(11477, 'Remove {0} from the result document.', model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both &&
                 state.firstInput === 2) {
@@ -135,13 +136,13 @@ class ActionsSource {
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localize(11444, 'Reset to base')), async () => {
+                result.push(command(( localize(11478, 'Reset to base')), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
                 }, ( localize(
-                    11445,
+                    11479,
                     'Reset this conflict to the common ancestor of both the right and left changes.'
                 ))));
             }
@@ -173,16 +174,16 @@ class ActionsSource {
             const otherInputNumber = inputNumber === 1 ? 2 : 1;
             if (state.kind !== ModifiedBaseRangeStateKind.unrecognized && !state.isInputIncluded(inputNumber)) {
                 if (!state.isInputIncluded(otherInputNumber) || !this.viewModel.shouldUseAppendInsteadOfAccept.read(reader)) {
-                    result.push(command(( localize(11446, "Accept {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11480, "Accept {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11447, "Accept {0} in the result document.", inputData.title))));
+                    }, ( localize(11481, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
                         const commandName = modifiedBaseRange.isOrderRelevant
-                            ? ( localize(11448, "Accept Combination ({0} First)", inputData.title))
-                            : ( localize(11449, "Accept Combination"));
+                            ? ( localize(11482, "Accept Combination ({0} First)", inputData.title))
+                            : ( localize(11483, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, ModifiedBaseRangeState.base
@@ -191,36 +192,36 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11450,
+                            11484,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 else {
-                    result.push(command(( localize(11451, "Append {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11485, "Append {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11452, "Append {0} to the result document.", inputData.title))));
+                    }, ( localize(11486, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localize(11453, "Accept Combination", inputData.title)), async () => {
+                        result.push(command(( localize(11487, "Accept Combination", inputData.title)), async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, true), inputNumber, tx);
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11450,
+                            11484,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localize(11454, 'Ignore')), async () => {
+                    result.push(command(( localize(11488, 'Ignore')), async () => {
                         transaction((tx) => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localize(11455, "Don't take this side of the conflict."))));
+                    }, ( localize(11489, "Don't take this side of the conflict."))));
                 }
             }
             return result;

package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js

@@ -1,32 +1,32 @@
 import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(10884, 'The editor is a merge editor')) })));
+const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(10974, 'The editor is a merge editor')) })));
 const ctxIsMergeResultEditor = ( (new RawContextKey(
  'isMergeResultEditor',
  false,
- { type: 'boolean', description: ( localize(10885, 'The editor is a the result editor of a merge editor.')) }
+ { type: 'boolean', description: ( localize(10975, 'The editor is a the result editor of a merge editor.')) }
 )));
 const ctxMergeEditorLayout = ( (new RawContextKey(
  'mergeEditorLayout',
  'mixed',
- { type: 'string', description: ( localize(10886, 'The layout mode of a merge editor')) }
+ { type: 'string', description: ( localize(10976, 'The layout mode of a merge editor')) }
 )));
 const ctxMergeEditorShowBase = ( (new RawContextKey(
  'mergeEditorShowBase',
  false,
- { type: 'boolean', description: ( localize(10887, 'If the merge editor shows the base version')) }
+ { type: 'boolean', description: ( localize(10977, 'If the merge editor shows the base version')) }
 )));
 const ctxMergeEditorShowBaseAtTop = ( (new RawContextKey(
  'mergeEditorShowBaseAtTop',
  false,
- { type: 'boolean', description: ( localize(10888, 'If base should be shown at the top')) }
+ { type: 'boolean', description: ( localize(10978, 'If base should be shown at the top')) }
 )));
 const ctxMergeEditorShowNonConflictingChanges = ( (new RawContextKey(
  'mergeEditorShowNonConflictingChanges',
  false,
- { type: 'boolean', description: ( localize(10889, 'If the merge editor shows non-conflicting changes')) }
+ { type: 'boolean', description: ( localize(10979, 'If the merge editor shows non-conflicting changes')) }
 )));
-const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(10890, 'The uri of the baser of a merge editor')) })));
-const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(10891, 'The uri of the result of a merge editor')) })));
+const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(10980, 'The uri of the baser of a merge editor')) })));
+const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(10981, 'The uri of the result of a merge editor')) })));
 const StorageCloseWithConflicts = 'mergeEditorCloseWithConflicts';
 export { StorageCloseWithConflicts, ctxIsMergeEditor, ctxIsMergeResultEditor, ctxMergeBaseUri, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, ctxMergeResultUri };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js

@@ -1,5 +1,5 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localize(10308, 'Icon of the multi diff editor label.')));
+const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localize(10393, 'Icon of the multi diff editor label.')));
 export { MultiDiffEditorIcon };

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

@@ -7,11 +7,12 @@ import { parse } from '../../../../base/common/marshalling.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { deepClone } from '../../../../base/common/objects.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/arrays.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromValueWithChangeEvent, constObservable, mapObservableArrayCached, recomputeInitiallyAndOnChange, ValueWithChangeEventFromObservable, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
 import { ObservableLazyPromise } from '../../../../base/common/observableInternal/promise.js';
-import '../../../../base/common/arrays.js';
+import '../../../../base/common/cancellation.js';
+import { observableFromValueWithChangeEvent, constObservable, mapObservableArrayCached, recomputeInitiallyAndOnChange, ValueWithChangeEventFromObservable, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import { isDefined, isObject } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { RefCounted } from '../../../../editor/browser/widget/diffEditor/utils.js';
@@ -19,16 +20,15 @@ import { MultiDiffEditorViewModel } from '../../../../editor/browser/widget/mult
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { localize } from '../../../../nls.js';
-import { ConfirmResult } from '../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { EditorInputCapabilities, DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
+import { 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';
-import { IMultiDiffSourceResolverService } from './multiDiffSourceResolverService.service.js';
 import { RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
+import { MultiDiffEditorIcon } from './icons.contribution.js';
+import { MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
+import { IMultiDiffSourceResolverService } from './multiDiffSourceResolverService.service.js';
 var MultiDiffEditorInput_1;
 let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
     static { MultiDiffEditorInput_1 = this; }
@@ -58,7 +58,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
     }
     static { this.ID = 'workbench.input.multiDiffEditor'; }
     get resource() { return this.multiDiffSource; }
-    get capabilities() { return EditorInputCapabilities.Readonly; }
+    get capabilities() { return 2 ; }
     get typeId() { return MultiDiffEditorInput_1.ID; }
     getName() { return this._name; }
     get editorId() { return DEFAULT_EDITOR_ASSOCIATION.id; }
@@ -108,7 +108,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         this.onDidChangeDirty = Event.fromObservableLight(this._isDirtyObservable);
         this.closeHandler = {
             async confirm() {
-                return ConfirmResult.DONT_SAVE;
+                return 1 ;
             },
             showConfirm() {
                 return false;
@@ -116,9 +116,9 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         };
         this._register(autorun((reader) => {
             const resources = this.resources.read(reader);
-            const label = this.label ?? ( localize(6119, "Multi Diff Editor"));
+            const label = this.label ?? ( localize(6175, "Multi Diff Editor"));
             if (resources) {
-                this._name = label + ( localize(6120, " ({0} files)", resources.length));
+                this._name = label + ( localize(6176, " ({0} files)", resources.length));
             }
             else {
                 this._name = label;
@@ -196,7 +196,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
             };
             return store.add(RefCounted.createOfNonDisposable(result, multiDiffItemStore, this));
         }, i => JSON.stringify([i.modifiedUri?.toString(), i.originalUri?.toString()]));
-        const documents = observableValue('documents', []);
+        const documents = observableValue('documents', 'loading');
         const updateDocuments = derived(async (reader) => {
             const docsPromises = documentsWithPromises.read(reader);
             const docs = await Promise.all(docsPromises);

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

@@ -1,18 +1,21 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/arrays.js';
-import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/event.js';
 import '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { waitForState } from '../../../../base/common/observableInternal/utilsCancellation.js';
 import { observableFromEvent, ValueWithChangeEventFromObservable } from '../../../../base/common/observableInternal/utils.js';
-import { waitForState } from '../../../../base/common/observableInternal/promise.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize2 } from '../../../../nls.js';
 import { Action2 } from '../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ProgressBadge } from '../../../services/activity/common/activity.js';
+import { IActivityService } from '../../../services/activity/common/activity.service.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+import { ISCMService } from '../../scm/common/scm.service.js';
 import { MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
 import { IMultiDiffSourceResolverService } from './multiDiffSourceResolverService.service.js';
-import { ISCMService } from '../../scm/common/scm.service.js';
-import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 var ScmMultiDiffSourceResolver_1;
 let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {
     static { ScmMultiDiffSourceResolver_1 = this; }
@@ -45,8 +48,9 @@ let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {
         }
         return { repositoryUri: ( (URI.parse(repositoryUri))), groupId };
     }
-    constructor(_scmService) {
+    constructor(_scmService, _activityService) {
         this._scmService = _scmService;
+        this._activityService = _activityService;
     }
     canHandleUri(uri) {
         return ScmMultiDiffSourceResolver_1.parseUri(uri) !== undefined;
@@ -55,13 +59,19 @@ let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {
         const { repositoryUri, groupId } = ScmMultiDiffSourceResolver_1.parseUri(uri);
         const repository = await waitForState(observableFromEvent(this, this._scmService.onDidAddRepository, () => [...this._scmService.repositories].find(r => r.provider.rootUri?.toString() === ( (repositoryUri.toString())))));
         const group = await waitForState(observableFromEvent(this, repository.provider.onDidChangeResourceGroups, () => repository.provider.groups.find(g => g.id === groupId)));
+        const scmActivities = observableFromEvent(this._activityService.onDidChangeActivity, () => [...this._activityService.getViewContainerActivities('workbench.view.scm')]);
+        const scmViewHasNoProgressBadge = ( (scmActivities.map(
+            activities => !( (activities.some(a => a.badge instanceof ProgressBadge)))
+        )));
+        await waitForState(scmViewHasNoProgressBadge, v => v);
         return (
              (new ScmResolvedMultiDiffSource(group, repository))
         );
     }
 };
 ScmMultiDiffSourceResolver = ScmMultiDiffSourceResolver_1 = ( (__decorate([
-    ( (__param(0, ISCMService)))
+    ( (__param(0, ISCMService))),
+    ( (__param(1, IActivityService)))
 ], ScmMultiDiffSourceResolver)));
 class ScmResolvedMultiDiffSource {
     constructor(_group, _repository) {
@@ -99,7 +109,7 @@ class OpenScmGroupAction extends Action2 {
     constructor() {
         super({
             id: '_workbench.openScmMultiDiffEditor',
-            title: ( localize2(6124, 'View Changes')),
+            title: ( localize2(6177, 'View Changes')),
             f1: false
         });
     }

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

@@ -10,7 +10,7 @@ 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, CellStatusbarAlignment } from '../../../common/notebookCommon.js';
+import { NotebookCellExecutionState } from '../../../common/notebookCommon.js';
 import { NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 import { INotebookService } from '../../../common/notebookService.service.js';
@@ -132,8 +132,8 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                     text: `$(${successStateIcon.id})`,
                     color: themeColorFromId(cellStatusIconSuccess),
-                    tooltip: ( localize(8011, "Success")),
-                    alignment: CellStatusbarAlignment.Left,
+                    tooltip: ( localize(8071, "Success")),
+                    alignment: 1 ,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
         }
@@ -141,16 +141,16 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                     text: `$(${errorStateIcon.id})`,
                     color: themeColorFromId(cellStatusIconError),
-                    tooltip: ( localize(8012, "Failed")),
-                    alignment: CellStatusbarAlignment.Left,
+                    tooltip: ( localize(8072, "Failed")),
+                    alignment: 1 ,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
         }
         else if (state === NotebookCellExecutionState.Pending || state === NotebookCellExecutionState.Unconfirmed) {
             return [{
                     text: `$(${pendingStateIcon.id})`,
-                    tooltip: ( localize(8013, "Pending")),
-                    alignment: CellStatusbarAlignment.Left,
+                    tooltip: ( localize(8073, "Pending")),
+                    alignment: 1 ,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
         }
@@ -160,8 +160,8 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
                 ThemeIcon.modify(executingStateIcon, 'spin');
             return [{
                     text: `$(${icon.id})`,
-                    tooltip: ( localize(8014, "Executing")),
-                    alignment: CellStatusbarAlignment.Left,
+                    tooltip: ( localize(8074, "Executing")),
+                    alignment: 1 ,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
         }
@@ -264,10 +264,10 @@ let TimerCellStatusBarItem = class TimerCellStatusBarItem extends Disposable {
                 }));
                 renderTimes += `- [${rendererInfo?.displayName ?? key}](command:workbench.action.openIssueReporter?${args}) ${formatCellDuration(renderDuration[key])}\n`;
             }
-            renderTimes += `\n*${( localize(8015, "Use the links above to file an issue using the issue reporter."))}*\n`;
+            renderTimes += `\n*${( localize(8075, "Use the links above to file an issue using the issue reporter."))}*\n`;
             tooltip = {
                 value: ( localize(
-                    8016,
+                    8076,
                     "**Last Execution** {0}\n\n**Execution Time** {1}\n\n**Overhead Time** {2}\n\n**Render Times**\n\n{3}",
                     lastExecution,
                     formatCellDuration(executionDuration),
@@ -279,7 +279,7 @@ let TimerCellStatusBarItem = class TimerCellStatusBarItem extends Disposable {
         }
         return {
             text: formatCellDuration(duration, false),
-            alignment: CellStatusbarAlignment.Left,
+            alignment: 1 ,
             priority: Number.MAX_SAFE_INTEGER - 5,
             tooltip
         };

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

@@ -3,17 +3,15 @@ import { localize } from '../../../../../../nls.js';
 import { $, trackFocus, addDisposableListener, getTotalWidth } from '../../../../../../base/browser/dom.js';
 import './notebookFindReplaceWidget.css.js';
 import { ActionBar } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
-import { AnchorAlignment } from '../../../../../../base/browser/ui/contextview/contextview.js';
 import { DropdownMenuActionViewItem } from '../../../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
 import { FindInput } from '../../../../../../base/browser/ui/findinput/findInput.js';
 import { ProgressBar } from '../../../../../../base/browser/ui/progressbar/progressbar.js';
-import { Sash, Orientation } from '../../../../../../base/browser/ui/sash/sash.js';
+import { Sash } from '../../../../../../base/browser/ui/sash/sash.js';
 import { Toggle } from '../../../../../../base/browser/ui/toggle/toggle.js';
 import { Widget } from '../../../../../../base/browser/ui/widget.js';
 import { Action, ActionRunner, Separator } from '../../../../../../base/common/actions.js';
 import { Delayer } from '../../../../../../base/common/async.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
-import { KeyCode } from '../../../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { isSafari } from '../../../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
@@ -44,23 +42,23 @@ import { registerThemingParticipant } from '../../../../../../platform/theme/com
 import { filterIcon } from '../../../../extensions/browser/extensionsIcons.js';
 import { NotebookFindFilters } from './findFilters.js';
 import { NotebookSetting, NotebookFindScopeType } from '../../../common/notebookCommon.js';
-const NLS_FIND_INPUT_LABEL = ( localize(11335, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localize(11336, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(11337, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localize(11338, "Next Match"));
-const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(11339, "Find in Selection"));
-const NLS_CLOSE_BTN_LABEL = ( localize(11340, "Close"));
-const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(11341, "Toggle Replace"));
-const NLS_REPLACE_INPUT_LABEL = ( localize(11342, "Replace"));
-const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(11343, "Replace"));
-const NLS_REPLACE_BTN_LABEL = ( localize(11344, "Replace"));
-const NLS_REPLACE_ALL_BTN_LABEL = ( localize(11345, "Replace All"));
-registerIcon('find-filter', Codicon.filter, ( localize(11346, 'Icon for Find Filter in find widget.')));
-const NOTEBOOK_FIND_FILTERS = ( localize(11347, "Find Filters"));
-const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( localize(11348, "Markdown Source"));
-const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( localize(11349, "Rendered Markdown"));
-const NOTEBOOK_FIND_IN_CODE_INPUT = ( localize(11350, "Code Cell Source"));
-const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( localize(11351, "Code Cell Output"));
+const NLS_FIND_INPUT_LABEL = ( localize(11453, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(11454, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(11455, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(11456, "Next Match"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(11457, "Find in Selection"));
+const NLS_CLOSE_BTN_LABEL = ( localize(11458, "Close"));
+const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(11459, "Toggle Replace"));
+const NLS_REPLACE_INPUT_LABEL = ( localize(11460, "Replace"));
+const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(11461, "Replace"));
+const NLS_REPLACE_BTN_LABEL = ( localize(11462, "Replace"));
+const NLS_REPLACE_ALL_BTN_LABEL = ( localize(11463, "Replace All"));
+registerIcon('find-filter', Codicon.filter, ( localize(11464, 'Icon for Find Filter in find widget.')));
+const NOTEBOOK_FIND_FILTERS = ( localize(11465, "Find Filters"));
+const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( localize(11466, "Markdown Source"));
+const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( localize(11467, "Rendered Markdown"));
+const NOTEBOOK_FIND_IN_CODE_INPUT = ( localize(11468, "Code Cell Source"));
+const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( localize(11469, "Code Cell Output"));
 const NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH = 419;
 const NOTEBOOK_FIND_WIDGET_INITIAL_HORIZONTAL_PADDING = 4;
 let NotebookFindFilterActionViewItem = class NotebookFindFilterActionViewItem extends DropdownMenuActionViewItem {
@@ -69,7 +67,7 @@ let NotebookFindFilterActionViewItem = class NotebookFindFilterActionViewItem ex
             ...options,
             actionRunner,
             classNames: action.class,
-            anchorAlignmentProvider: () => AnchorAlignment.RIGHT
+            anchorAlignmentProvider: () => 1
         });
         this.filters = filters;
     }
@@ -429,7 +427,7 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
         this._innerFindDomNode.appendChild(closeBtn.domNode);
         this._domNode.appendChild(this._innerFindDomNode);
         this.onkeyup(this._innerFindDomNode, e => {
-            if (e.equals(KeyCode.Escape)) {
+            if (e.equals(9 )) {
                 this.hide();
                 e.preventDefault();
                 return;
@@ -481,7 +479,7 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
         this._resizeSash = this._register(( (new Sash(
             this._domNode,
             { getVerticalSashLeft: () => 0 },
-            { orientation: Orientation.VERTICAL, size: 2 }
+            { orientation: 0 , size: 2 }
         ))));
         this._register(this._resizeSash.onDidStart(() => {
             this._resizeOriginalWidth = this._getDomWidth();

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

@@ -1,7 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { append, addDisposableListener, getWindow, isHTMLElement, EventType } from '../../../../../../base/browser/dom.js';
 import { alert } from '../../../../../../base/browser/ui/aria/aria.js';
-import { KeyCode, KeyMod as KeyMod$1 } from '../../../../../../base/common/keyCodes.js';
 import { Lazy } from '../../../../../../base/common/lazy.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { format } from '../../../../../../base/common/strings.js';
@@ -80,19 +79,19 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
         }, true));
     }
     _onFindInputKeyDown(e) {
-        if (e.equals(KeyCode.Enter)) {
+        if (e.equals(3 )) {
             this.find(false);
             e.preventDefault();
             return;
         }
-        else if (e.equals(KeyMod$1.Shift | KeyCode.Enter)) {
+        else if (e.equals(1024  | 3 )) {
             this.find(true);
             e.preventDefault();
             return;
         }
     }
     _onReplaceInputKeyDown(e) {
-        if (e.equals(KeyCode.Enter)) {
+        if (e.equals(3 )) {
             this.replaceOne();
             e.preventDefault();
             return;
@@ -274,10 +273,10 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localize(10138, "{0} found", label))
-                : ( localize(10139, "{0} found for '{1}'", label, searchString));
+                ? ( localize(10252, "{0} found", label))
+                : ( localize(10253, "{0} found for '{1}'", label, searchString));
         }
-        return ( localize(10140, "{0} found for '{1}'", label, searchString));
+        return ( localize(10254, "{0} found for '{1}'", label, searchString));
     }
     dispose() {
         this._notebookEditor?.removeClassName(FIND_SHOW_TRANSITION);