@codingame/monaco-vscode-api 5.3.0 → 6.0.0

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

@@ -1,10 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { isRelativePattern } from '../../../../base/common/glob.js';
+import { EditorInputCapabilities, Verbosity } from '../../../common/editor.js';
 import { SimpleNotebookProviderInfo } from './notebookService.js';
 import { INotebookService } from './notebookService.service.js';
 import { joinPath, isEqual } from '../../../../base/common/resources.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { INotebookEditorModelResolverService } from './notebookEditorModelResolverService.service.js';
+import { CellEditType } from './notebookCommon.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
@@ -73,27 +75,27 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         return this.viewType;
     }
     get capabilities() {
-        let capabilities = 0 ;
+        let capabilities = EditorInputCapabilities.None;
         if (this.resource.scheme === Schemas.untitled) {
-            capabilities |= 4 ;
+            capabilities |= EditorInputCapabilities.Untitled;
         }
         if (this._editorModelReference) {
             if (this._editorModelReference.object.isReadonly()) {
-                capabilities |= 2 ;
+                capabilities |= EditorInputCapabilities.Readonly;
             }
         }
         else {
             if (this.filesConfigurationService.isReadonly(this.resource)) {
-                capabilities |= 2 ;
+                capabilities |= EditorInputCapabilities.Readonly;
             }
         }
-        if (!((capabilities & 2) )) {
-            capabilities |= 128 ;
+        if (!(capabilities & EditorInputCapabilities.Readonly)) {
+            capabilities |= EditorInputCapabilities.CanDropIntoEditor;
         }
         return capabilities;
     }
-    getDescription(verbosity = 1 ) {
-        if (!this.hasCapability(4 ) || this._editorModelReference?.object.hasAssociatedFilePath()) {
+    getDescription(verbosity = Verbosity.MEDIUM) {
+        if (!this.hasCapability(EditorInputCapabilities.Untitled) || this._editorModelReference?.object.hasAssociatedFilePath()) {
             return super.getDescription(verbosity);
         }
         return undefined;
@@ -112,14 +114,14 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
     }
     isSaving() {
         const model = this._editorModelReference?.object;
-        if (!model || !model.isDirty() || model.hasErrorState || this.hasCapability(4 )) {
+        if (!model || !model.isDirty() || model.hasErrorState || this.hasCapability(EditorInputCapabilities.Untitled)) {
             return false;
         }
         return this.filesConfigurationService.hasShortAutoSaveDelay(this);
     }
     async save(group, options) {
         if (this._editorModelReference) {
-            if (this.hasCapability(4 )) {
+            if (this.hasCapability(EditorInputCapabilities.Untitled)) {
                 return this.saveAs(group, options);
             }
             else {
@@ -137,7 +139,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         if (!provider) {
             return undefined;
         }
-        const pathCandidate = this.hasCapability(4 ) ? await this._suggestName(provider, this.labelService.getUriBasenameLabel(this.resource)) : this._editorModelReference.object.resource;
+        const pathCandidate = this.hasCapability(EditorInputCapabilities.Untitled) ? await this._suggestName(provider, this.labelService.getUriBasenameLabel(this.resource)) : this._editorModelReference.object.resource;
         let target;
         if (this._editorModelReference.object.hasAssociatedFilePath()) {
             target = pathCandidate;
@@ -236,7 +238,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
             const data = await info.serializer.dataToNotebook(VSBuffer.fromString(JSON.stringify({ __webview_backup: this.options._backupId })));
             this._editorModelReference.object.notebook.applyEdits([
                 {
-                    editType: 1 ,
+                    editType: CellEditType.Replace,
                     index: 0,
                     count: this._editorModelReference.object.notebook.length,
                     cells: data.cells

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

@@ -7,11 +7,15 @@ import { Schemas } from '../../../../base/common/network.js';
 import { filter } from '../../../../base/common/objects.js';
 import { assertType } from '../../../../base/common/types.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { EditorModel } from '../../../common/editor/editorModel.js';
 import { NotebookCellsChangeType, NotebookSetting } from './notebookCommon.js';
 import { SimpleNotebookProviderInfo } from './notebookService.js';
 import { INotebookService } from './notebookService.service.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
+import { SnapshotContext } from '../../../services/workingCopy/common/fileWorkingCopy.js';
+import { StoredFileWorkingCopyState } from '../../../services/workingCopy/common/storedFileWorkingCopy.js';
+import { WorkingCopyCapabilities } from '../../../services/workingCopy/common/workingCopy.js';
 var SimpleNotebookEditorModel_1;
 let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebookEditorModel extends EditorModel {
     constructor(resource, _hasAssociatedFilePath, viewType, _workingCopyManager, scratchpad, _filesConfigurationService) {
@@ -62,7 +66,7 @@ let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebo
         return this._workingCopy?.isModified() ?? false;
     }
     isOrphaned() {
-        return SimpleNotebookEditorModel_1._isStoredFileWorkingCopy(this._workingCopy) && this._workingCopy.hasState(4 );
+        return SimpleNotebookEditorModel_1._isStoredFileWorkingCopy(this._workingCopy) && this._workingCopy.hasState(StoredFileWorkingCopyState.ORPHAN);
     }
     hasAssociatedFilePath() {
         return !SimpleNotebookEditorModel_1._isStoredFileWorkingCopy(this._workingCopy) && !!this._workingCopy?.hasAssociatedFilePath;
@@ -77,7 +81,7 @@ let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebo
     }
     get hasErrorState() {
         if (this._workingCopy && 'hasState' in this._workingCopy) {
-            return this._workingCopy.hasState(5 );
+            return this._workingCopy.hasState(StoredFileWorkingCopyState.ERROR);
         }
         return false;
     }
@@ -135,7 +139,7 @@ let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebo
         return { resource: newWorkingCopy.resource };
     }
     static _isStoredFileWorkingCopy(candidate) {
-        const isUntitled = candidate && candidate.capabilities & 2 ;
+        const isUntitled = candidate && candidate.capabilities & WorkingCopyCapabilities.Untitled;
         return !isUntitled;
     }
 };
@@ -143,11 +147,12 @@ SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = ( __decorate([
     ( __param(5, IFilesConfigurationService))
 ], SimpleNotebookEditorModel));
 class NotebookFileWorkingCopyModel extends Disposable {
-    constructor(_notebookModel, _notebookService, _configurationService) {
+    constructor(_notebookModel, _notebookService, _configurationService, _telemetryService) {
         super();
         this._notebookModel = _notebookModel;
         this._notebookService = _notebookService;
         this._configurationService = _configurationService;
+        this._telemetryService = _telemetryService;
         this._onDidChangeContent = this._register(( new Emitter()));
         this.onDidChangeContent = this._onDidChangeContent.event;
         this.configuration = undefined;
@@ -175,15 +180,29 @@ class NotebookFileWorkingCopyModel extends Disposable {
             };
         }
         if (saveWithReducedCommunication) {
-            this.save = async (options, token) => {
-                const serializer = await this.getNotebookSerializer();
-                if (token.isCancellationRequested) {
-                    throw ( new CancellationError());
-                }
+            this.setSaveDelegate().catch(console.error);
+        }
+    }
+    async setSaveDelegate() {
+        const serializer = await this.getNotebookSerializer();
+        this.save = async (options, token) => {
+            if (token.isCancellationRequested) {
+                throw ( new CancellationError());
+            }
+            try {
                 const stat = await serializer.save(this._notebookModel.uri, this._notebookModel.versionId, options, token);
                 return stat;
-            };
-        }
+            }
+            catch (error) {
+                if (!token.isCancellationRequested) {
+                    this._telemetryService.publicLogError2('notebook/SaveError', {
+                        isRemote: this._notebookModel.uri.scheme === Schemas.vscodeRemote,
+                        error: error
+                    });
+                }
+                throw error;
+            }
+        };
     }
     dispose() {
         this._notebookModel.dispose();
@@ -209,7 +228,7 @@ class NotebookFileWorkingCopyModel extends Disposable {
                 internalMetadata: cell.internalMetadata
             };
             const outputSizeLimit = this._configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
-            if (context === 2  && outputSizeLimit > 0) {
+            if (context === SnapshotContext.Backup && outputSizeLimit > 0) {
                 cell.outputs.forEach(output => {
                     output.outputs.forEach(item => {
                         outputSize += item.data.byteLength;
@@ -253,10 +272,11 @@ class NotebookFileWorkingCopyModel extends Disposable {
     }
 }
 let NotebookFileWorkingCopyModelFactory = class NotebookFileWorkingCopyModelFactory {
-    constructor(_viewType, _notebookService, _configurationService) {
+    constructor(_viewType, _notebookService, _configurationService, _telemetryService) {
         this._viewType = _viewType;
         this._notebookService = _notebookService;
         this._configurationService = _configurationService;
+        this._telemetryService = _telemetryService;
     }
     async createModel(resource, stream, token) {
         const info = await this._notebookService.withNotebookDataProvider(this._viewType);
@@ -269,11 +289,17 @@ let NotebookFileWorkingCopyModelFactory = class NotebookFileWorkingCopyModelFact
             throw ( new CancellationError());
         }
         const notebookModel = this._notebookService.createNotebookTextModel(info.viewType, resource, data, info.serializer.options);
-        return ( new NotebookFileWorkingCopyModel(notebookModel, this._notebookService, this._configurationService));
+        return ( new NotebookFileWorkingCopyModel(
+            notebookModel,
+            this._notebookService,
+            this._configurationService,
+            this._telemetryService
+        ));
     }
 };
 NotebookFileWorkingCopyModelFactory = ( __decorate([
     ( __param(1, INotebookService)),
-    ( __param(2, IConfigurationService))
+    ( __param(2, IConfigurationService)),
+    ( __param(3, ITelemetryService))
 ], NotebookFileWorkingCopyModelFactory));
 export { NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel };

package/vscode/src/vs/workbench/contrib/outline/browser/outline.js

@@ -1,10 +1,16 @@
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+var OutlineSortOrder;
+( (function(OutlineSortOrder) {
+    OutlineSortOrder[OutlineSortOrder["ByPosition"] = 0] = "ByPosition";
+    OutlineSortOrder[OutlineSortOrder["ByName"] = 1] = "ByName";
+    OutlineSortOrder[OutlineSortOrder["ByKind"] = 2] = "ByKind";
+})(OutlineSortOrder || (OutlineSortOrder = {})));
 var IOutlinePane;
 ( (function(IOutlinePane) {
     IOutlinePane.Id = 'outline';
 })(IOutlinePane || (IOutlinePane = {})));
 const ctxFollowsCursor = ( new RawContextKey('outlineFollowsCursor', false));
 const ctxFilterOnType = ( new RawContextKey('outlineFiltersOnType', false));
-const ctxSortMode = ( new RawContextKey('outlineSortMode', 0 ));
+const ctxSortMode = ( new RawContextKey('outlineSortMode', OutlineSortOrder.ByPosition));
 const ctxAllCollapsed = ( new RawContextKey('outlineAllCollapsed', false));
-export { IOutlinePane, ctxAllCollapsed, ctxFilterOnType, ctxFollowsCursor, ctxSortMode };
+export { IOutlinePane, OutlineSortOrder, ctxAllCollapsed, ctxFilterOnType, ctxFollowsCursor, ctxSortMode };

package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js

@@ -6,6 +6,7 @@ import { DisposableStore, Disposable, toDisposable } from '../../../../base/comm
 import { Emitter } from '../../../../base/common/event.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { append, $, clearNode, Dimension, addDisposableListener, EventType } from '../../../../base/browser/dom.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
@@ -24,6 +25,7 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { SearchWidget } from './preferencesWidgets.js';
 import { Promises, timeout } from '../../../../base/common/async.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -69,11 +71,11 @@ let KeybindingsSearchWidget = class KeybindingsSearchWidget extends SearchWidget
         keyboardEvent.preventDefault();
         keyboardEvent.stopPropagation();
         const options = this.options;
-        if (!options.recordEnter && keyboardEvent.equals(3 )) {
+        if (!options.recordEnter && keyboardEvent.equals(KeyCode.Enter)) {
             this._onEnter.fire();
             return;
         }
-        if (keyboardEvent.equals(9 )) {
+        if (keyboardEvent.equals(KeyCode.Escape)) {
             this._onEscape.fire();
             return;
         }
@@ -266,7 +268,7 @@ let DefineKeybindingOverlayWidget = class DefineKeybindingOverlayWidget extends
     }
     start() {
         if (this._editor.hasModel()) {
-            this._editor.revealPositionInCenterIfOutsideViewport(this._editor.getPosition(), 0 );
+            this._editor.revealPositionInCenterIfOutsideViewport(this._editor.getPosition(), ScrollType.Smooth);
         }
         const layoutInfo = this._editor.getLayoutInfo();
         this._widget.layout(new Dimension(layoutInfo.width, layoutInfo.height));

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js

@@ -1,19 +1,23 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { append, $, addDisposableListener, EventHelper, EventType, trackFocus, getTotalWidth } from '../../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionBar, ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { BaseActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { Action } from '../../../../base/common/actions.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
+import { MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -31,7 +35,7 @@ import { badgeBackground, badgeForeground } from '../../../../platform/theme/com
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { isWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { isWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { settingsScopeDropDownIcon, settingsEditIcon } from './preferencesIcons.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.service.js';
@@ -87,8 +91,8 @@ let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends Ba
     onKeyUp(event) {
         const keyboardEvent = ( (new StandardKeyboardEvent(event)));
         switch (keyboardEvent.keyCode) {
-            case 3 :
-            case 10 :
+            case KeyCode.Enter:
+            case KeyCode.Space:
                 this.onClick(event);
                 return;
         }
@@ -154,14 +158,16 @@ let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends Ba
     getDropdownMenuActions() {
         const actions = [];
         const workspaceFolders = this.contextService.getWorkspace().folders;
-        if (this.contextService.getWorkbenchState() === 3  && workspaceFolders.length > 0) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && workspaceFolders.length > 0) {
             actions.push(...( (workspaceFolders.map((folder, index) => {
                 const folderCount = this._folderSettingCounts.get(( (folder.uri.toString())));
                 return {
                     id: 'folderSettingsTarget' + index,
                     label: this.labelWithCount(folder.name, folderCount),
-                    checked: this.folder && isEqual(this.folder.uri, folder.uri),
+                    tooltip: this.labelWithCount(folder.name, folderCount),
+                    checked: !!this.folder && isEqual(this.folder.uri, folder.uri),
                     enabled: true,
+                    class: undefined,
                     run: () => this._action.run(folder)
                 };
             }))));
@@ -207,7 +213,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     create(parent) {
         const settingsTabsWidget = append(parent, $('.settings-tabs-widget'));
         this.settingsSwitcherBar = this._register(( (new ActionBar(settingsTabsWidget, {
-            orientation: 0 ,
+            orientation: ActionsOrientation.HORIZONTAL,
             focusOnlyEnabledItems: true,
             ariaLabel: ( localizeWithPath(_moduleId, 4, "Settings Switcher")),
             actionViewItemProvider: (action, options) => action.id === 'folderSettings' ? this.folderSettings : undefined
@@ -217,7 +223,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
             '',
             '.settings-tab',
             true,
-            () => this.updateTarget(3 )
+            () => this.updateTarget(ConfigurationTarget.USER_LOCAL)
         )));
         this.userLocalSettings.tooltip = ( localizeWithPath(_moduleId, 0, "User"));
         this.userRemoteSettings = ( (new Action(
@@ -225,7 +231,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
             '',
             '.settings-tab',
             true,
-            () => this.updateTarget(4 )
+            () => this.updateTarget(ConfigurationTarget.USER_REMOTE)
         )));
         const remoteAuthority = this.environmentService.remoteAuthority;
         const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
@@ -235,10 +241,10 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
             '',
             '.settings-tab',
             false,
-            () => this.updateTarget(5 )
+            () => this.updateTarget(ConfigurationTarget.WORKSPACE)
         )));
         this.folderSettingsAction = ( (new Action('folderSettings', '', '.settings-tab', false, async (folder) => {
-            this.updateTarget(isWorkspaceFolder(folder) ? folder.uri : 3 );
+            this.updateTarget(isWorkspaceFolder(folder) ? folder.uri : ConfigurationTarget.USER_LOCAL);
         })));
         this.folderSettings = this.instantiationService.createInstance(FolderSettingsActionViewItem, this.folderSettingsAction);
         this.resetLabels();
@@ -250,9 +256,9 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     }
     set settingsTarget(settingsTarget) {
         this._settingsTarget = settingsTarget;
-        this.userLocalSettings.checked = 3  === this.settingsTarget;
-        this.userRemoteSettings.checked = 4  === this.settingsTarget;
-        this.workspaceSettings.checked = 5  === this.settingsTarget;
+        this.userLocalSettings.checked = ConfigurationTarget.USER_LOCAL === this.settingsTarget;
+        this.userRemoteSettings.checked = ConfigurationTarget.USER_REMOTE === this.settingsTarget;
+        this.workspaceSettings.checked = ConfigurationTarget.WORKSPACE === this.settingsTarget;
         if (this.settingsTarget instanceof URI) {
             this.folderSettings.action.checked = true;
             this.folderSettings.folder = this.contextService.getWorkspaceFolder(this.settingsTarget);
@@ -262,14 +268,14 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
         }
     }
     setResultCount(settingsTarget, count) {
-        if (settingsTarget === 5 ) {
+        if (settingsTarget === ConfigurationTarget.WORKSPACE) {
             let label = ( localizeWithPath(_moduleId, 2, "Workspace"));
             if (count) {
                 label += ` (${count})`;
             }
             this.workspaceSettings.label = label;
         }
-        else if (settingsTarget === 3 ) {
+        else if (settingsTarget === ConfigurationTarget.USER_LOCAL) {
             let label = ( localizeWithPath(_moduleId, 0, "User"));
             if (count) {
                 label += ` (${count})`;
@@ -296,8 +302,8 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
     onWorkbenchStateChanged() {
         this.folderSettings.folder = null;
         this.update();
-        if (this.settingsTarget === 5  && this.contextService.getWorkbenchState() === 3 ) {
-            this.updateTarget(3 );
+        if (this.settingsTarget === ConfigurationTarget.WORKSPACE && this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
+            this.updateTarget(ConfigurationTarget.USER_LOCAL);
         }
     }
     updateTarget(settingsTarget) {
@@ -312,10 +318,10 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
         return Promise.resolve(undefined);
     }
     async update() {
-        this.settingsSwitcherBar.domNode.classList.toggle('empty-workbench', this.contextService.getWorkbenchState() === 1 );
+        this.settingsSwitcherBar.domNode.classList.toggle('empty-workbench', this.contextService.getWorkbenchState() === WorkbenchState.EMPTY);
         this.userRemoteSettings.enabled = !!(this.options.enableRemoteSettings && this.environmentService.remoteAuthority);
-        this.workspaceSettings.enabled = this.contextService.getWorkbenchState() !== 1 ;
-        this.folderSettings.action.enabled = this.contextService.getWorkbenchState() === 3  && this.contextService.getWorkspace().folders.length > 0;
+        this.workspaceSettings.enabled = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY;
+        this.folderSettings.action.enabled = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.contextService.getWorkspace().folders.length > 0;
         this.workspaceSettings.tooltip = ( localizeWithPath(_moduleId, 2, "Workspace"));
     }
 };
@@ -438,7 +444,7 @@ class EditPreferenceWidget extends Disposable {
         this._onClick = this._register(( (new Emitter())));
         this.onClick = this._onClick.event;
         this._register(this.editor.onMouseDown((e) => {
-            if (e.target.type !== 2  || e.target.detail.isAfterLines || !this.isVisible()) {
+            if (e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN || e.target.detail.isAfterLines || !this.isVisible()) {
                 return;
             }
             this._onClick.fire(e);
@@ -459,7 +465,7 @@ class EditPreferenceWidget extends Disposable {
                 description: 'edit-preference-widget-decoration',
                 glyphMarginClassName: ThemeIcon.asClassName(settingsEditIcon),
                 glyphMarginHoverMessage: ( (new MarkdownString())).appendText(hoverMessage),
-                stickiness: 1 ,
+                stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
             },
             range: {
                 startLineNumber: line,

package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js

@@ -133,7 +133,7 @@ const tocData = {
                 {
                     id: 'features/accessibilitySignals',
                     label: ( localizeWithPath(_moduleId, 21, 'Accessibility Signals')),
-                    settings: ['accessibility.signals.*', 'audioCues.*']
+                    settings: ['accessibility.signal*']
                 },
                 {
                     id: 'features/accessibility',

package/vscode/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.js

@@ -3,6 +3,7 @@ import { distinct } from '../../../../base/common/arrays.js';
 import { escapeRegExpCharacters, isFalsyOrWhitespace } from '../../../../base/common/strings.js';
 import { isUndefinedOrNull } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { knownAcronyms, knownTermMappings, tocData } from './settingsLayout.js';
 import { MODIFIED_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, POLICY_SETTING_TAG, compareTwoNullableNumbers } from '../common/preferences.js';
 import { SettingValueType, SettingMatchType } from '../../../services/preferences/common/preferences.js';
@@ -11,7 +12,7 @@ import { APPLICATION_SCOPES, FOLDER_SCOPES, WORKSPACE_SCOPES, REMOTE_MACHINE_SCO
 import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.service.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { EditPresentationTypes, Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { EditPresentationTypes, ConfigurationScope, Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.service.js';
@@ -187,11 +188,11 @@ class SettingsTreeSettingElement extends SettingsTreeElement {
     }
     getTargetToInspect(setting) {
         if (!this.userDataProfileService.currentProfile.isDefault && !this.userDataProfileService.currentProfile.useDefaultFlags?.settings) {
-            if (setting.scope === 1 ) {
-                return 1 ;
+            if (setting.scope === ConfigurationScope.APPLICATION) {
+                return ConfigurationTarget.APPLICATION;
             }
-            if (this.configurationService.isSettingAppliedForAllProfiles(setting.key) && this.settingsTarget === 3 ) {
-                return 1 ;
+            if (this.configurationService.isSettingAppliedForAllProfiles(setting.key) && this.settingsTarget === ConfigurationTarget.USER_LOCAL) {
+                return ConfigurationTarget.APPLICATION;
             }
         }
         return this.settingsTarget;
@@ -290,23 +291,23 @@ class SettingsTreeSettingElement extends SettingsTreeElement {
             Array.from(tagFilters).every(tag => ( this.tags.has(tag)));
     }
     matchesScope(scope, isRemote) {
-        const configTarget = URI.isUri(scope) ? 6  : scope;
+        const configTarget = URI.isUri(scope) ? ConfigurationTarget.WORKSPACE_FOLDER : scope;
         if (!this.setting.scope) {
             return true;
         }
-        if (configTarget === 1 ) {
+        if (configTarget === ConfigurationTarget.APPLICATION) {
             return APPLICATION_SCOPES.includes(this.setting.scope);
         }
-        if (configTarget === 6 ) {
+        if (configTarget === ConfigurationTarget.WORKSPACE_FOLDER) {
             return FOLDER_SCOPES.includes(this.setting.scope);
         }
-        if (configTarget === 5 ) {
+        if (configTarget === ConfigurationTarget.WORKSPACE) {
             return WORKSPACE_SCOPES.includes(this.setting.scope);
         }
-        if (configTarget === 4 ) {
+        if (configTarget === ConfigurationTarget.USER_REMOTE) {
             return REMOTE_MACHINE_SCOPES.includes(this.setting.scope);
         }
-        if (configTarget === 3 ) {
+        if (configTarget === ConfigurationTarget.USER_LOCAL) {
             if (isRemote) {
                 return LOCAL_MACHINE_SCOPES.includes(this.setting.scope);
             }
@@ -358,7 +359,7 @@ class SettingsTreeSettingElement extends SettingsTreeElement {
         if (!this.languageService.isRegisteredLanguageId(languageFilter)) {
             return false;
         }
-        if (this.setting.scope === 5 ) {
+        if (this.setting.scope === ConfigurationScope.LANGUAGE_OVERRIDABLE) {
             return true;
         }
         return false;
@@ -480,15 +481,15 @@ SettingsTreeModel = ( __decorate([
 function inspectSetting(key, target, languageFilter, configurationService) {
     const inspectOverrides = URI.isUri(target) ? { resource: target } : undefined;
     const inspected = configurationService.inspect(key, inspectOverrides);
-    const targetSelector = target === 1  ? 'applicationValue' :
-        target === 3  ? 'userLocalValue' :
-            target === 4  ? 'userRemoteValue' :
-                target === 5  ? 'workspaceValue' :
+    const targetSelector = target === ConfigurationTarget.APPLICATION ? 'applicationValue' :
+        target === ConfigurationTarget.USER_LOCAL ? 'userLocalValue' :
+            target === ConfigurationTarget.USER_REMOTE ? 'userRemoteValue' :
+                target === ConfigurationTarget.WORKSPACE ? 'workspaceValue' :
                     'workspaceFolderValue';
-    const targetOverrideSelector = target === 1  ? 'application' :
-        target === 3  ? 'userLocal' :
-            target === 4  ? 'userRemote' :
-                target === 5  ? 'workspace' :
+    const targetOverrideSelector = target === ConfigurationTarget.APPLICATION ? 'application' :
+        target === ConfigurationTarget.USER_LOCAL ? 'userLocal' :
+            target === ConfigurationTarget.USER_REMOTE ? 'userRemote' :
+                target === ConfigurationTarget.WORKSPACE ? 'workspace' :
                     'workspaceFolder';
     let isConfigured = typeof inspected[targetSelector] !== 'undefined';
     const overrideIdentifiers = inspected.overrideIdentifiers;
@@ -631,6 +632,12 @@ function settingTypeEnumRenderable(_type) {
     const type = Array.isArray(_type) ? _type : [_type];
     return type.every(type => enumRenderableSettingTypes.includes(type));
 }
+var SearchResultIdx;
+( (function(SearchResultIdx) {
+    SearchResultIdx[SearchResultIdx["Local"] = 0] = "Local";
+    SearchResultIdx[SearchResultIdx["Remote"] = 1] = "Remote";
+    SearchResultIdx[SearchResultIdx["NewExtensions"] = 2] = "NewExtensions";
+})(SearchResultIdx || (SearchResultIdx = {})));
 let SearchResultModel = class SearchResultModel extends SettingsTreeModel {
     constructor(viewState, settingsOrderByTocIndex, isWorkspaceTrusted, configurationService, environmentService, languageService, userDataProfileService, productService) {
         super(viewState, isWorkspaceTrusted, configurationService, languageService, userDataProfileService, productService);
@@ -674,16 +681,16 @@ let SearchResultModel = class SearchResultModel extends SettingsTreeModel {
         }
         let combinedFilterMatches = [];
         const localMatchKeys = ( new Set());
-        const localResult = this.rawSearchResults[0 ];
+        const localResult = this.rawSearchResults[SearchResultIdx.Local];
         if (localResult) {
             localResult.filterMatches.forEach(m => localMatchKeys.add(m.setting.key));
             combinedFilterMatches = localResult.filterMatches;
         }
-        const remoteResult = this.rawSearchResults[1 ];
+        const remoteResult = this.rawSearchResults[SearchResultIdx.Remote];
         if (remoteResult) {
             remoteResult.filterMatches = remoteResult.filterMatches.filter(m => !( localMatchKeys.has(m.setting.key)));
             combinedFilterMatches = combinedFilterMatches.concat(remoteResult.filterMatches);
-            this.newExtensionSearchResults = this.rawSearchResults[2 ];
+            this.newExtensionSearchResults = this.rawSearchResults[SearchResultIdx.NewExtensions];
         }
         combinedFilterMatches = this.sortResults(combinedFilterMatches);
         this.cachedUniqueSearchResults = {
@@ -794,4 +801,4 @@ function parseQuery(query) {
         query,
     };
 }
-export { SearchResultModel, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement, inspectSetting, parseQuery, settingKeyToDisplayFormat };
+export { SearchResultIdx, SearchResultModel, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement, inspectSetting, parseQuery, settingKeyToDisplayFormat };