@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js

@@ -3,7 +3,7 @@ import './media/sidebysideeditor.css.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { Dimension, $, multibyteAwareBtoa, clearNode } from '../../../../base/browser/dom.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { SIDE_BY_SIDE_EDITOR_ID, SideBySideEditor as SideBySideEditor$1, EditorExtensions, isEditorPaneWithSelection } from '../../../common/editor.js';
+import { SIDE_BY_SIDE_EDITOR_ID, SideBySideEditor as SideBySideEditor$1, EditorExtensions, isEditorPaneWithSelection, EditorPaneSelectionCompareResult } from '../../../common/editor.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -22,6 +22,7 @@ import { ITextResourceConfigurationService } from '../../../../editor/common/ser
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
+import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
 var SideBySideEditor_1;
 const _moduleId = "vs/workbench/browser/parts/editor/sideBySideEditor";
 function isSideBySideEditorViewState(thing) {
@@ -61,7 +62,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         this.secondaryEditorPane = undefined;
         this.splitviewDisposables = this._register(( (new DisposableStore())));
         this.editorDisposables = this._register(( (new DisposableStore())));
-        this.orientation = this.configurationService.getValue(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? 0  : 1 ;
+        this.orientation = this.configurationService.getValue(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? Orientation.VERTICAL : Orientation.HORIZONTAL;
         this.dimension = ( (new Dimension(0, 0)));
         this.lastFocusedSide = undefined;
         this.registerListeners();
@@ -71,7 +72,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     }
     onConfigurationUpdated(event) {
         if (event.affectsConfiguration(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING)) {
-            this.orientation = this.configurationService.getValue(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? 0  : 1 ;
+            this.orientation = this.configurationService.getValue(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? Orientation.VERTICAL : Orientation.HORIZONTAL;
             if (this.splitview) {
                 this.recreateSplitview();
             }
@@ -93,7 +94,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
             const leftViewSize = this.splitview.getViewSize(0);
             const rightViewSize = this.splitview.getViewSize(1);
             if (Math.abs(leftViewSize - rightViewSize) > 1) {
-                const totalSize = this.splitview.orientation === 1  ? this.dimension.width : this.dimension.height;
+                const totalSize = this.splitview.orientation === Orientation.HORIZONTAL ? this.dimension.width : this.dimension.height;
                 ratio = leftViewSize / totalSize;
             }
         }
@@ -108,7 +109,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     createSplitView(parent, ratio) {
         this.splitview = this.splitviewDisposables.add(( (new SplitView(parent, { orientation: this.orientation }))));
         this.splitviewDisposables.add(this.splitview.onDidSashReset(() => this.splitview?.distributeViewSizes()));
-        if (this.orientation === 1 ) {
+        if (this.orientation === Orientation.HORIZONTAL) {
             this.splitview.orthogonalEndSash = this._boundarySashes?.bottom;
         }
         else {
@@ -118,16 +119,16 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         let leftSizing = Sizing.Distribute;
         let rightSizing = Sizing.Distribute;
         if (ratio) {
-            const totalSize = this.splitview.orientation === 1  ? this.dimension.width : this.dimension.height;
+            const totalSize = this.splitview.orientation === Orientation.HORIZONTAL ? this.dimension.width : this.dimension.height;
             leftSizing = Math.round(totalSize * ratio);
             rightSizing = totalSize - leftSizing;
-            this.splitview.layout(this.orientation === 1  ? this.dimension.width : this.dimension.height);
+            this.splitview.layout(this.orientation === Orientation.HORIZONTAL ? this.dimension.width : this.dimension.height);
         }
         const secondaryEditorContainer = assertIsDefined(this.secondaryEditorContainer);
         this.splitview.addView({
             element: secondaryEditorContainer,
             layout: size => this.layoutPane(this.secondaryEditorPane, size),
-            minimumSize: this.orientation === 1  ? DEFAULT_EDITOR_MIN_DIMENSIONS.width : DEFAULT_EDITOR_MIN_DIMENSIONS.height,
+            minimumSize: this.orientation === Orientation.HORIZONTAL ? DEFAULT_EDITOR_MIN_DIMENSIONS.width : DEFAULT_EDITOR_MIN_DIMENSIONS.height,
             maximumSize: Number.POSITIVE_INFINITY,
             onDidChange: Event.None
         }, leftSizing);
@@ -135,7 +136,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         this.splitview.addView({
             element: primaryEditorContainer,
             layout: size => this.layoutPane(this.primaryEditorPane, size),
-            minimumSize: this.orientation === 1  ? DEFAULT_EDITOR_MIN_DIMENSIONS.width : DEFAULT_EDITOR_MIN_DIMENSIONS.height,
+            minimumSize: this.orientation === Orientation.HORIZONTAL ? DEFAULT_EDITOR_MIN_DIMENSIONS.width : DEFAULT_EDITOR_MIN_DIMENSIONS.height,
             maximumSize: Number.POSITIVE_INFINITY,
             onDidChange: Event.None
         }, rightSizing);
@@ -159,7 +160,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         const { primary, secondary, viewState } = this.loadViewState(input, options, context);
         this.lastFocusedSide = viewState?.focus;
         if (typeof viewState?.ratio === 'number' && this.splitview) {
-            const totalSize = this.splitview.orientation === 1  ? this.dimension.width : this.dimension.height;
+            const totalSize = this.splitview.orientation === Orientation.HORIZONTAL ? this.dimension.width : this.dimension.height;
             this.splitview.resizeView(0, Math.round(totalSize * viewState.ratio));
         }
         else {
@@ -267,7 +268,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     layout(dimension) {
         this.dimension = dimension;
         const splitview = assertIsDefined(this.splitview);
-        splitview.layout(this.orientation === 1  ? dimension.width : dimension.height);
+        splitview.layout(this.orientation === Orientation.HORIZONTAL ? dimension.width : dimension.height);
     }
     setBoundarySashes(sashes) {
         this._boundarySashes = sashes;
@@ -276,7 +277,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         }
     }
     layoutPane(pane, size) {
-        pane?.layout(this.orientation === 1  ? ( (new Dimension(size, this.dimension.height))) : ( (new Dimension(this.dimension.width, size))));
+        pane?.layout(this.orientation === Orientation.HORIZONTAL ? ( (new Dimension(size, this.dimension.height))) : ( (new Dimension(this.dimension.width, size))));
     }
     getControl() {
         return this.getLastFocusedEditorPane()?.getControl();
@@ -325,7 +326,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     updateStyles() {
         super.updateStyles();
         if (this.primaryEditorContainer) {
-            if (this.orientation === 1 ) {
+            if (this.orientation === Orientation.HORIZONTAL) {
                 this.primaryEditorContainer.style.borderLeftWidth = '1px';
                 this.primaryEditorContainer.style.borderLeftStyle = 'solid';
                 this.primaryEditorContainer.style.borderLeftColor = this.getColor(SIDE_BY_SIDE_EDITOR_VERTICAL_BORDER) ?? '';
@@ -373,10 +374,10 @@ class SideBySideAwareEditorPaneSelection {
     }
     compare(other) {
         if (!(other instanceof SideBySideAwareEditorPaneSelection)) {
-            return 3 ;
+            return EditorPaneSelectionCompareResult.DIFFERENT;
         }
         if (this.side !== other.side) {
-            return 3 ;
+            return EditorPaneSelectionCompareResult.DIFFERENT;
         }
         return this.selection.compare(other.selection);
     }

package/vscode/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.js

@@ -1,10 +1,10 @@
 import './media/singleeditortabscontrol.css.js';
-import { preventEditorClose, EditorCloseMethod, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { preventEditorClose, EditorCloseMethod, EditorResourceAccessor, SideBySideEditor, Verbosity } from '../../../common/editor.js';
 import { EditorTabsControl } from './editorTabsControl.js';
 import { ResourceLabel } from '../../labels.js';
 import { TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND } from '../../../common/theme.js';
 import { Gesture, EventType as EventType$1 } from '../../../../base/browser/touch.js';
-import { addDisposableListener, EventType, DragAndDropObserver, EventHelper, isAncestor, Dimension } from '../../../../base/browser/dom.js';
+import { addDisposableListener, EventType, DragAndDropObserver, EventHelper, isHTMLElement, isAncestor, Dimension } from '../../../../base/browser/dom.js';
 import { CLOSE_EDITOR_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID } from './editorCommands.js';
 import { Color } from '../../../../base/common/color.js';
 import { assertIsDefined, assertAllDefined } from '../../../../base/common/types.js';
@@ -78,7 +78,7 @@ class SingleEditorTabsControl extends EditorTabsControl {
     }
     onTitleTap(e) {
         const target = e.initialTarget;
-        if (!(target instanceof HTMLElement) || !this.editorLabel || !isAncestor(target, this.editorLabel.element)) {
+        if (!(isHTMLElement(target)) || !this.editorLabel || !isAncestor(target, this.editorLabel.element)) {
             return;
         }
         setTimeout(() => this.quickInputService.quickAccess.show(), 50);
@@ -110,13 +110,12 @@ class SingleEditorTabsControl extends EditorTabsControl {
     pinEditor(editor) {
         this.ifEditorIsActive(editor, () => this.redraw());
     }
-    stickEditor(editor) {
-    }
-    unstickEditor(editor) {
-    }
+    stickEditor(editor) { }
+    unstickEditor(editor) { }
     setActive(isActive) {
         this.redraw();
     }
+    updateEditorSelections() { }
     updateEditorLabel(editor) {
         this.ifEditorIsActive(editor, () => this.redraw());
     }
@@ -228,9 +227,9 @@ class SingleEditorTabsControl extends EditorTabsControl {
     }
     getVerbosity(style) {
         switch (style) {
-            case 'short': return 0 ;
-            case 'long': return 2 ;
-            default: return 1 ;
+            case 'short': return Verbosity.SHORT;
+            case 'long': return Verbosity.LONG;
+            default: return Verbosity.MEDIUM;
         }
     }
     prepareEditorActions(editorActions) {
@@ -240,7 +239,7 @@ class SingleEditorTabsControl extends EditorTabsControl {
         }
         else {
             return {
-                primary: editorActions.primary.filter(action => action.id === CLOSE_EDITOR_COMMAND_ID || action.id === UNLOCK_GROUP_COMMAND_ID),
+                primary: this.groupsView.partOptions.alwaysShowEditorActions ? editorActions.primary : editorActions.primary.filter(action => action.id === CLOSE_EDITOR_COMMAND_ID || action.id === UNLOCK_GROUP_COMMAND_ID),
                 secondary: editorActions.secondary
             };
         }

package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js

@@ -4,6 +4,7 @@ import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js'
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import '../../../../../../../override/vs/workbench/browser/parts/editor/textEditor.js';
 import { AbstractTextEditor } from './textEditor.js';
 const _moduleId = "vs/workbench/browser/parts/editor/textCodeEditor";
@@ -56,7 +57,7 @@ class AbstractTextCodeEditor extends AbstractTextEditor {
     setOptions(options) {
         super.setOptions(options);
         if (options) {
-            applyTextEditorOptions(options, assertIsDefined(this.editorControl), 0 );
+            applyTextEditorOptions(options, assertIsDefined(this.editorControl), ScrollType.Smooth);
         }
     }
     focus() {

package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js

@@ -12,6 +12,8 @@ import { IStorageService } from '../../../../platform/storage/common/storage.ser
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import { TextFileOperationResult } from '../../../services/textfile/common/textfiles.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
@@ -20,7 +22,7 @@ import { EditorActivation } from '../../../../platform/editor/common/editor.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { multibyteAwareBtoa } from '../../../../base/browser/dom.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 { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
@@ -89,7 +91,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
             }
             let optionsGotApplied = false;
             if (options) {
-                optionsGotApplied = applyTextEditorOptions(options, control, 1 );
+                optionsGotApplied = applyTextEditorOptions(options, control, ScrollType.Immediate);
             }
             if (!optionsGotApplied && !hasPreviousViewState) {
                 control.revealFirstDiff();
@@ -109,7 +111,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (this.isFileBinaryError(error)) {
             return this.openAsBinary(input, options);
         }
-        if (error.fileOperationResult === 7 ) {
+        if (error.fileOperationResult === FileOperationResult.FILE_TOO_LARGE) {
             let message;
             if (error instanceof TooLargeFileOperationError) {
                 message = ( localizeWithPath(
@@ -169,7 +171,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
     setOptions(options) {
         super.setOptions(options);
         if (options) {
-            applyTextEditorOptions(options, assertIsDefined(this.diffEditorControl), 0 );
+            applyTextEditorOptions(options, assertIsDefined(this.diffEditorControl), ScrollType.Smooth);
         }
     }
     shouldHandleConfigurationChangeEvent(e, resource) {
@@ -218,7 +220,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
                  (errors.some(error => this.isFileBinaryError(error)))
             );
         }
-        return error.textFileOperationResult === 0 ;
+        return error.textFileOperationResult === TextFileOperationResult.FILE_IS_BINARY;
     }
     clearInput() {
         if (this._previousViewModel) {

package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js

@@ -4,6 +4,7 @@ import { deepClone, distinct } from '../../../../base/common/objects.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { isObject, assertIsDefined } from '../../../../base/common/types.js';
 import { MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult } from '../../../common/editor.js';
 import { computeEditorAriaLabel } from '../../editor.js';
 import { AbstractEditorWithViewState } from './editorWithViewState.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
@@ -13,6 +14,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+import { TextEditorSelectionSource, TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 var AbstractTextEditor_1;
 const _moduleId = "vs/workbench/browser/parts/editor/textEditor";
@@ -108,16 +110,16 @@ let AbstractTextEditor = class AbstractTextEditor extends AbstractEditorWithView
             this._register(mainControl.onDidChangeModelLanguage(() => this.updateEditorConfiguration()));
             this._register(mainControl.onDidChangeModel(() => this.updateEditorConfiguration()));
             this._register(mainControl.onDidChangeCursorPosition(e => this._onDidChangeSelection.fire({ reason: this.toEditorPaneSelectionChangeReason(e) })));
-            this._register(mainControl.onDidChangeModelContent(() => this._onDidChangeSelection.fire({ reason: 3  })));
+            this._register(mainControl.onDidChangeModelContent(() => this._onDidChangeSelection.fire({ reason: EditorPaneSelectionChangeReason.EDIT })));
             this._register(mainControl.onDidScrollChange(() => this._onDidChangeScroll.fire()));
         }
     }
     toEditorPaneSelectionChangeReason(e) {
         switch (e.source) {
-            case "api" : return 1 ;
-            case "code.navigation" : return 4 ;
-            case "code.jump" : return 5 ;
-            default: return 2 ;
+            case TextEditorSelectionSource.PROGRAMMATIC: return EditorPaneSelectionChangeReason.PROGRAMMATIC;
+            case TextEditorSelectionSource.NAVIGATION: return EditorPaneSelectionChangeReason.NAVIGATION;
+            case TextEditorSelectionSource.JUMP: return EditorPaneSelectionChangeReason.JUMP;
+            default: return EditorPaneSelectionChangeReason.USER;
         }
     }
     getSelection() {
@@ -225,23 +227,23 @@ class TextEditorPaneSelection {
     }
     compare(other) {
         if (!(other instanceof TextEditorPaneSelection)) {
-            return 3 ;
+            return EditorPaneSelectionCompareResult.DIFFERENT;
         }
         const thisLineNumber = Math.min(this.textSelection.selectionStartLineNumber, this.textSelection.positionLineNumber);
         const otherLineNumber = Math.min(other.textSelection.selectionStartLineNumber, other.textSelection.positionLineNumber);
         if (thisLineNumber === otherLineNumber) {
-            return 1 ;
+            return EditorPaneSelectionCompareResult.IDENTICAL;
         }
         if (Math.abs(thisLineNumber - otherLineNumber) < TextEditorPaneSelection.TEXT_EDITOR_SELECTION_THRESHOLD) {
-            return 2 ;
+            return EditorPaneSelectionCompareResult.SIMILAR;
         }
-        return 3 ;
+        return EditorPaneSelectionCompareResult.DIFFERENT;
     }
     restore(options) {
         const textEditorOptions = {
             ...options,
             selection: this.textSelection,
-            selectionRevealType: 1
+            selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport
         };
         return textEditorOptions;
     }

package/vscode/src/vs/workbench/browser/parts/editor/textResourceEditor.js

@@ -11,11 +11,14 @@ import { IStorageService } from '../../../../platform/storage/common/storage.ser
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { ModelConstants } from '../../../../editor/common/model.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 var TextResourceEditor_1;
 let AbstractTextResourceEditor = class AbstractTextResourceEditor extends AbstractTextCodeEditor {
@@ -44,7 +47,7 @@ let AbstractTextResourceEditor = class AbstractTextResourceEditor extends Abstra
             }
         }
         if (options) {
-            applyTextEditorOptions(options, control, 1 );
+            applyTextEditorOptions(options, control, ScrollType.Immediate);
         }
         control.updateOptions(this.getReadonlyConfiguration(resolvedModel.isReadonly()));
     }
@@ -56,7 +59,7 @@ let AbstractTextResourceEditor = class AbstractTextResourceEditor extends Abstra
         const model = control.getModel();
         if (model) {
             const lastLine = model.getLineCount();
-            control.revealPosition({ lineNumber: lastLine, column: model.getLineMaxColumn(lastLine) }, 0 );
+            control.revealPosition({ lineNumber: lastLine, column: model.getLineMaxColumn(lastLine) }, ScrollType.Smooth);
         }
     }
     clearInput() {
@@ -99,7 +102,7 @@ let TextResourceEditor = class TextResourceEditor extends AbstractTextResourceEd
         if (e.range.startLineNumber !== 1 || e.range.startColumn !== 1) {
             return;
         }
-        if (codeEditor.getOption(91 )) {
+        if (codeEditor.getOption(EditorOption.readOnly)) {
             return;
         }
         const textModel = codeEditor.getModel();
@@ -119,7 +122,7 @@ let TextResourceEditor = class TextResourceEditor extends AbstractTextResourceEd
             candidateLanguage = { id: e.languageId, source: 'event' };
         }
         else {
-            const guess = this.languageService.guessLanguageIdByFilepathOrFirstLine(textModel.uri, textModel.getLineContent(1).substr(0, 1000 )) ?? undefined;
+            const guess = this.languageService.guessLanguageIdByFilepathOrFirstLine(textModel.uri, textModel.getLineContent(1).substr(0, ModelConstants.FIRST_LINE_DETECTION_LENGTH_LIMIT)) ?? undefined;
             if (guess) {
                 candidateLanguage = { id: guess, source: 'guess' };
             }

package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js

@@ -1,12 +1,13 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../nls.js';
-import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionBar, ActionsOrientation } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { GLOBAL_ACTIVITY_ID, ACCOUNTS_ACTIVITY_ID } from '../../common/activity.js';
 import { NumberBadge } from '../../services/activity/common/activity.js';
 import { IActivityService } from '../../services/activity/common/activity.service.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.service.js';
+import { StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../platform/storage/common/storage.service.js';
 import { IExtensionService } from '../../services/extensions/common/extensions.service.js';
 import { CompositeBarAction, CompositeBarActionViewItem } from './compositeBarActions.js';
@@ -20,6 +21,7 @@ import { runWhenWindowIdle, getWindow, append, $, clearNode, hide, show, addDisp
 import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
 import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
 import { EventType as EventType$1 } from '../../../base/browser/touch.js';
+import { AnchorAlignment, AnchorAxisAlignment } from '../../../base/browser/ui/contextview/contextview.js';
 import { Lazy } from '../../../base/common/lazy.js';
 import { createAndFillInActionBarActions } from '../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
@@ -33,10 +35,12 @@ import { getCurrentAuthenticationSessionInfo } from '../../services/authenticati
 import { IAuthenticationService } from '../../services/authentication/common/authentication.service.js';
 import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.service.js';
 import { IHoverService } from '../../../platform/hover/browser/hover.service.js';
+import { LifecyclePhase } from '../../services/lifecycle/common/lifecycle.js';
 import { ILifecycleService } from '../../services/lifecycle/common/lifecycle.service.js';
 import { IUserDataProfileService } from '../../services/userDataProfile/common/userDataProfile.service.js';
 import { DEFAULT_ICON } from '../../services/userDataProfile/common/userDataProfileIcons.js';
 import { isString } from '../../../base/common/types.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
 import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from '../../common/theme.js';
 import { ICommandService } from '../../../platform/commands/common/commands.service.js';
 var GlobalCompositeBar_1;
@@ -57,8 +61,8 @@ let GlobalCompositeBar = class GlobalCompositeBar extends Disposable {
         this.accountAction = this._register(( (new Action(ACCOUNTS_ACTIVITY_ID))));
         this.element = document.createElement('div');
         const contextMenuAlignmentOptions = () => ({
-            anchorAlignment: configurationService.getValue('workbench.sideBar.location') === 'left' ? 1  : 0 ,
-            anchorAxisAlignment: 1
+            anchorAlignment: configurationService.getValue('workbench.sideBar.location') === 'left' ? AnchorAlignment.RIGHT : AnchorAlignment.LEFT,
+            anchorAxisAlignment: AnchorAxisAlignment.HORIZONTAL
         });
         this.globalActivityActionBar = this._register(( (new ActionBar(this.element, {
             actionViewItemProvider: (action, options) => {
@@ -79,7 +83,7 @@ let GlobalCompositeBar = class GlobalCompositeBar extends Disposable {
                 }
                 throw ( (new Error(`No view item for action '${action.id}'`)));
             },
-            orientation: 1 ,
+            orientation: ActionsOrientation.VERTICAL,
             ariaLabel: ( localizeWithPath(_moduleId, 2, "Manage")),
             preventLoopNavigation: true
         }))));
@@ -92,7 +96,7 @@ let GlobalCompositeBar = class GlobalCompositeBar extends Disposable {
     registerListeners() {
         this.extensionService.whenInstalledExtensionsRegistered().then(() => {
             if (!this._store.isDisposed) {
-                this._register(this.storageService.onDidChangeValue(0 , AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, this._store)(() => this.toggleAccountsActivity()));
+                this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, this._store)(() => this.toggleAccountsActivity()));
             }
         });
     }
@@ -199,7 +203,7 @@ let AbstractGlobalActivityActionViewItem = class AbstractGlobalActivityActionVie
         }));
         this._register(addDisposableListener(this.container, EventType.KEY_UP, (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(3 ) || event.equals(10 )) {
+            if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
                 EventHelper.stop(e, true);
                 this.run();
             }
@@ -293,7 +297,7 @@ let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extend
         }));
     }
     async initialize() {
-        await this.lifecycleService.when(3 );
+        await this.lifecycleService.when(LifecyclePhase.Restored);
         if (this._store.isDisposed) {
             return;
         }
@@ -599,9 +603,9 @@ function simpleActivityContextMenuActions(storageService, isAccount) {
     ];
 }
 function isAccountsActionVisible(storageService) {
-    return storageService.getBoolean(AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, 0 , true);
+    return storageService.getBoolean(AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, StorageScope.PROFILE, true);
 }
 function setAccountsActionVisible(storageService, visible) {
-    storageService.store(AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, visible, 0 , 0 );
+    storageService.store(AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, visible, StorageScope.PROFILE, StorageTarget.USER);
 }
 export { AccountsActivityActionViewItem, GlobalActivityActionViewItem, GlobalCompositeBar, SimpleAccountActivityActionViewItem, SimpleGlobalActivityActionViewItem, isAccountsActionVisible };

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js

@@ -1,5 +1,6 @@
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { NotificationChangeType, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { NotificationPriority } from '../../../../platform/notification/common/notification.js';
@@ -19,7 +20,7 @@ class NotificationsAlerts extends Disposable {
         this._register(this.model.onDidChangeNotification(e => this.onDidChangeNotification(e)));
     }
     onDidChangeNotification(e) {
-        if (e.kind === 0 ) {
+        if (e.kind === NotificationChangeType.ADD) {
             this.triggerAriaAlert(e.item);
             if (e.item.severity === Severity$1.Error) {
                 if (e.item.message.original instanceof Error) {
@@ -36,7 +37,7 @@ class NotificationsAlerts extends Disposable {
             return;
         }
         const listener = notification.onDidChangeContent(e => {
-            if (e.kind === 1 ) {
+            if (e.kind === NotificationViewItemContentChangeKind.MESSAGE) {
                 this.doTriggerAriaAlert(notification);
             }
         });

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js

@@ -4,6 +4,8 @@ import './media/notificationsActions.css.js';
 import { NOTIFICATIONS_CENTER_BORDER, NOTIFICATIONS_CENTER_HEADER_FOREGROUND, NOTIFICATIONS_CENTER_HEADER_BACKGROUND } from '../../../common/theme.js';
 import { Themable } from '../../../../platform/theme/common/themeService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import { NotificationChangeType, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
+import { Parts } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -187,26 +189,26 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
         let focusEditor = false;
         const [notificationsList, notificationsCenterContainer] = assertAllDefined(this.notificationsList, this.notificationsCenterContainer);
         switch (e.kind) {
-            case 0 :
+            case NotificationChangeType.ADD:
                 notificationsList.updateNotificationsList(e.index, 0, [e.item]);
                 e.item.updateVisibility(true);
                 break;
-            case 1 :
+            case NotificationChangeType.CHANGE:
                 switch (e.detail) {
-                    case 2 :
+                    case NotificationViewItemContentChangeKind.ACTIONS:
                         notificationsList.updateNotificationsList(e.index, 1, [e.item]);
                         break;
-                    case 1 :
+                    case NotificationViewItemContentChangeKind.MESSAGE:
                         if (e.item.expanded) {
                             notificationsList.updateNotificationHeight(e.item);
                         }
                         break;
                 }
                 break;
-            case 2 :
+            case NotificationChangeType.EXPAND_COLLAPSE:
                 notificationsList.updateNotificationsList(e.index, 1, [e.item]);
                 break;
-            case 3 :
+            case NotificationChangeType.REMOVE:
                 focusEditor = isAncestorOfActiveElement(notificationsCenterContainer);
                 notificationsList.updateNotificationsList(e.index, 1);
                 e.item.updateVisibility(false);
@@ -258,10 +260,10 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
                 availableWidth = this.workbenchDimensions.width;
                 availableWidth -= (2 * 8);
                 availableHeight = this.workbenchDimensions.height - 35 ;
-                if (this.layoutService.isVisible("workbench.parts.statusbar" , mainWindow)) {
+                if (this.layoutService.isVisible(Parts.STATUSBAR_PART, mainWindow)) {
                     availableHeight -= 22;
                 }
-                if (this.layoutService.isVisible("workbench.parts.titlebar" , mainWindow)) {
+                if (this.layoutService.isVisible(Parts.TITLEBAR_PART, mainWindow)) {
                     availableHeight -= 22;
                 }
                 availableHeight -= (2 * 12);