@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js

@@ -6,10 +6,11 @@ import { ActionRunner } from '../../../../../base/common/actions.js';
 import { append, isMouseEvent, getLargestChildWidth, $ as $$1 } from '../../../../../base/browser/dom.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { GroupsOrder, GroupOrientation } from '../../../../services/editor/common/editorGroupsService.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.service.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
-import { preventEditorClose, EditorResourceAccessor, SideBySideEditor, EditorCloseMethod } from '../../../../common/editor.js';
+import { preventEditorClose, EditorResourceAccessor, SideBySideEditor, Verbosity, GroupModelChangeKind, EditorCloseMethod } from '../../../../common/editor.js';
 import { SaveAllInGroupAction, CloseGroupAction } from '../fileActions.js';
 import { OpenEditor, OpenEditorsFocusedContext, ExplorerFocusedContext } from '../../common/files.js';
 import { CloseEditorAction, UnpinEditorAction, CloseAllEditorsAction } from '../../../../browser/parts/editor/editorActions.js';
@@ -28,6 +29,7 @@ import { badgeBackground, badgeForeground } from '../../../../../platform/theme/
 import '../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../platform/theme/common/colors/searchColors.js';
 import { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
+import { ListDragOverEffectType, ListDragOverEffectPosition } from '../../../../../base/browser/ui/list/list.js';
 import { ResourceLabels } from '../../../../browser/labels.js';
 import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
@@ -40,19 +42,24 @@ import { ResourcesDropHandler, fillEditorsDragData } from '../../../../browser/d
 import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
 import { DataTransfers } from '../../../../../base/browser/dnd.js';
 import { memoize } from '../../../../../base/common/decorators.js';
-import { NativeDragAndDropData, ElementsDragAndDropData } from '../../../../../base/browser/ui/list/listView.js';
+import { NativeDragAndDropData, ElementsDragAndDropData, ListViewTargetSector } from '../../../../../base/browser/ui/list/listView.js';
 import { IWorkingCopyService } from '../../../../services/workingCopy/common/workingCopyService.service.js';
+import { WorkingCopyCapabilities } from '../../../../services/workingCopy/common/workingCopy.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { IViewDescriptorService } from '../../../../common/views.service.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
+import '../../../../../base/browser/ui/splitview/splitview.js';
 import { compareFileNamesDefault } from '../../../../../base/common/comparers.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { extUriIgnorePathCase } from '../../../../../base/common/resources.js';
 import { mainWindow } from '../../../../../base/browser/window.js';
 import { EditorGroupView } from '../../../../browser/parts/editor/editorGroupView.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.service.js';
+import { Orientation } from '../../../../../base/browser/ui/sash/sash.js';
 var OpenEditorsView_1;
 const _moduleId = "vs/workbench/contrib/files/browser/views/openEditorsView";
 const $ = $$1;
@@ -96,26 +103,26 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
                 }
                 const index = this.getIndex(group, e.editor);
                 switch (e.kind) {
-                    case 7 :
+                    case GroupModelChangeKind.EDITOR_ACTIVE:
                         this.focusActiveEditor();
                         break;
-                    case 1 :
-                    case 2 :
+                    case GroupModelChangeKind.GROUP_INDEX:
+                    case GroupModelChangeKind.GROUP_LABEL:
                         if (index >= 0) {
                             this.list.splice(index, 1, [group]);
                         }
                         break;
-                    case 13 :
-                    case 12 :
-                    case 9 :
-                    case 10 :
-                    case 8 :
+                    case GroupModelChangeKind.EDITOR_DIRTY:
+                    case GroupModelChangeKind.EDITOR_STICKY:
+                    case GroupModelChangeKind.EDITOR_CAPABILITIES:
+                    case GroupModelChangeKind.EDITOR_PIN:
+                    case GroupModelChangeKind.EDITOR_LABEL:
                         this.list.splice(index, 1, [( (new OpenEditor(e.editor, group)))]);
                         this.focusActiveEditor();
                         break;
-                    case 4 :
-                    case 6 :
-                    case 5 :
+                    case GroupModelChangeKind.EDITOR_OPEN:
+                    case GroupModelChangeKind.EDITOR_MOVE:
+                    case GroupModelChangeKind.EDITOR_CLOSE:
                         updateWholeList();
                         break;
                 }
@@ -273,7 +280,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
     }
     getElements() {
         this.elements = [];
-        this.editorGroupService.getGroups(2 ).forEach(g => {
+        this.editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE).forEach(g => {
             if (this.showGroups) {
                 this.elements.push(g);
             }
@@ -388,13 +395,13 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         }
     }
     updateSize() {
-        this.minimumBodySize = this.orientation === 0  ? this.getMinExpandedBodySize() : 170;
-        this.maximumBodySize = this.orientation === 0  ? this.getMaxExpandedBodySize() : Number.POSITIVE_INFINITY;
+        this.minimumBodySize = this.orientation === Orientation.VERTICAL ? this.getMinExpandedBodySize() : 170;
+        this.maximumBodySize = this.orientation === Orientation.VERTICAL ? this.getMaxExpandedBodySize() : Number.POSITIVE_INFINITY;
     }
     updateDirtyIndicator(workingCopy) {
         if (workingCopy) {
             const gotDirty = workingCopy.isDirty();
-            if (gotDirty && !((workingCopy.capabilities & 2) ) && this.filesConfigurationService.hasShortAutoSaveDelay(workingCopy.resource)) {
+            if (gotDirty && !(workingCopy.capabilities & WorkingCopyCapabilities.Untitled) && this.filesConfigurationService.hasShortAutoSaveDelay(workingCopy.resource)) {
                 return;
             }
         }
@@ -540,12 +547,12 @@ class OpenEditorRenderer {
         templateData.root.setResource({
             resource: EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.BOTH }),
             name: editor.getName(),
-            description: editor.getDescription(1 )
+            description: editor.getDescription(Verbosity.MEDIUM)
         }, {
             italic: openedEditor.isPreview(),
             extraClasses: ['open-editor'].concat(openedEditor.editor.getLabelExtraClasses()),
             fileDecorations: this.configurationService.getValue().explorer.decorations,
-            title: editor.getTitle(2 ),
+            title: editor.getTitle(Verbosity.LONG),
             icon: editor.getIcon()
         });
         const editorAction = openedEditor.isSticky() ? this.unpinEditorAction : this.closeEditorAction;
@@ -617,35 +624,35 @@ class OpenEditorsDragAndDrop {
                 return false;
             }
             else {
-                return { accept: true, effect: { type: 1  }, feedback: [-1] };
+                return { accept: true, effect: { type: ListDragOverEffectType.Move }, feedback: [-1] };
             }
         }
         let dropEffectPosition = undefined;
         switch (targetSector) {
-            case 0 :
-            case 1 :
-                dropEffectPosition = (_targetIndex === 0 && _targetElement instanceof EditorGroupView) ? "drop-target-after"  : "drop-target-before" ;
+            case ListViewTargetSector.TOP:
+            case ListViewTargetSector.CENTER_TOP:
+                dropEffectPosition = (_targetIndex === 0 && _targetElement instanceof EditorGroupView) ? ListDragOverEffectPosition.After : ListDragOverEffectPosition.Before;
                 break;
-            case 2 :
-            case 3 :
-                dropEffectPosition = "drop-target-after" ;
+            case ListViewTargetSector.CENTER_BOTTOM:
+            case ListViewTargetSector.BOTTOM:
+                dropEffectPosition = ListDragOverEffectPosition.After;
                 break;
         }
-        return { accept: true, effect: { type: 1 , position: dropEffectPosition }, feedback: [_targetIndex] };
+        return { accept: true, effect: { type: ListDragOverEffectType.Move, position: dropEffectPosition }, feedback: [_targetIndex] };
     }
     drop(data, targetElement, _targetIndex, targetSector, originalEvent) {
         let group = targetElement instanceof OpenEditor ? targetElement.group : targetElement || this.editorGroupService.groups[this.editorGroupService.count - 1];
         let targetEditorIndex = targetElement instanceof OpenEditor ? targetElement.group.getIndexOfEditor(targetElement.editor) : 0;
         switch (targetSector) {
-            case 0 :
-            case 1 :
+            case ListViewTargetSector.TOP:
+            case ListViewTargetSector.CENTER_TOP:
                 if (targetElement instanceof EditorGroupView && group.index !== 0) {
                     group = this.editorGroupService.groups[group.index - 1];
                     targetEditorIndex = group.count;
                 }
                 break;
-            case 3 :
-            case 2 :
+            case ListViewTargetSector.BOTTOM:
+            case ListViewTargetSector.CENTER_BOTTOM:
                 if (targetElement instanceof OpenEditor) {
                     targetEditorIndex++;
                 }
@@ -690,9 +697,9 @@ registerAction2(class extends Action2 {
             title: ( localize2WithPath(_moduleId, 2, "Toggle Vertical/Horizontal Editor Layout")),
             f1: true,
             keybinding: {
-                primary: 1024  | 512  | 21 ,
-                mac: { primary: 2048  | 512  | 21  },
-                weight: 200
+                primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.Digit0,
+                mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.Digit0 },
+                weight: KeybindingWeight.WorkbenchContrib
             },
             icon: Codicon.editorLayout,
             menu: {
@@ -708,7 +715,7 @@ registerAction2(class extends Action2 {
     }
     async run(accessor) {
         const editorGroupService = accessor.get(IEditorGroupsService);
-        const newOrientation = ((editorGroupService.orientation === 1) ) ? 0  : 1 ;
+        const newOrientation = (editorGroupService.orientation === GroupOrientation.VERTICAL) ? GroupOrientation.HORIZONTAL : GroupOrientation.VERTICAL;
         editorGroupService.setGroupOrientation(newOrientation);
     }
 });

package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js

@@ -5,6 +5,7 @@ import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle
 import { NumberBadge } from '../../../services/activity/common/activity.js';
 import { IActivityService } from '../../../services/activity/common/activity.service.js';
 import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.service.js';
+import { WorkingCopyCapabilities } from '../../../services/workingCopy/common/workingCopy.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 const _moduleId = "vs/workbench/contrib/files/common/dirtyFilesIndicator";
 let DirtyFilesIndicator = class DirtyFilesIndicator extends Disposable {
@@ -24,7 +25,7 @@ let DirtyFilesIndicator = class DirtyFilesIndicator extends Disposable {
     }
     onWorkingCopyDidChangeDirty(workingCopy) {
         const gotDirty = workingCopy.isDirty();
-        if (gotDirty && !((workingCopy.capabilities & 2) ) && this.filesConfigurationService.hasShortAutoSaveDelay(workingCopy.resource)) {
+        if (gotDirty && !(workingCopy.capabilities & WorkingCopyCapabilities.Untitled) && this.filesConfigurationService.hasShortAutoSaveDelay(workingCopy.resource)) {
             return;
         }
         if (gotDirty || this.lastKnownDirtyCount > 0) {

package/vscode/src/vs/workbench/contrib/files/common/explorerFileNestingTrie.js

@@ -168,6 +168,13 @@ class SufTrie {
         return ( lines.map(l => indentation + l)).join('\n');
     }
 }
+var SubstitutionType;
+( (function(SubstitutionType) {
+    SubstitutionType["capture"] = "capture";
+    SubstitutionType["basename"] = "basename";
+    SubstitutionType["dirname"] = "dirname";
+    SubstitutionType["extname"] = "extname";
+})(SubstitutionType || (SubstitutionType = {})));
 const substitutionStringTokenizer = /\$[({](capture|basename|dirname|extname)[)}]/g;
 class SubstitutionString {
     constructor(pattern) {
@@ -180,10 +187,10 @@ class SubstitutionString {
             this.tokens.push(prefix);
             const type = token[1];
             switch (type) {
-                case "basename" :
-                case "dirname" :
-                case "extname" :
-                case "capture" :
+                case SubstitutionType.basename:
+                case SubstitutionType.dirname:
+                case SubstitutionType.extname:
+                case SubstitutionType.capture:
                     this.tokens.push({ capture: type });
                     break;
                 default: throw Error('unknown substitution type: ' + type);
@@ -201,10 +208,10 @@ class SubstitutionString {
                 return t;
             }
             switch (t.capture) {
-                case "basename" : return attributes.basename;
-                case "dirname" : return attributes.dirname;
-                case "extname" : return attributes.extname;
-                case "capture" : return capture || '';
+                case SubstitutionType.basename: return attributes.basename;
+                case SubstitutionType.dirname: return attributes.dirname;
+                case SubstitutionType.extname: return attributes.extname;
+                case SubstitutionType.capture: return capture || '';
             }
         })).join('');
     }

package/vscode/src/vs/workbench/contrib/files/common/explorerModel.js

@@ -3,12 +3,14 @@ import { URI } from '../../../../base/common/uri.js';
 import { isEqual } from '../../../../base/common/extpath.js';
 import { posix } from '../../../../base/common/path.js';
 import { ResourceMap } from '../../../../base/common/map.js';
+import { FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
 import { equalsIgnoreCase, startsWithIgnoreCase, rtrim } from '../../../../base/common/strings.js';
 import { coalesce } from '../../../../base/common/arrays.js';
 import { dispose } from '../../../../base/common/lifecycle.js';
 import { memoize } from '../../../../base/common/decorators.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { basenameOrAuthority, isEqualOrParent, joinPath } from '../../../../base/common/resources.js';
+import { SortOrder } from './files.js';
 import { ExplorerFileNestingTrie } from './explorerFileNestingTrie.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 class ExplorerModel {
@@ -230,7 +232,7 @@ class ExplorerItem {
         }
         return (async () => {
             if (!this._isDirectoryResolved) {
-                const resolveMetadata = sortOrder === "modified" ;
+                const resolveMetadata = sortOrder === SortOrder.Modified;
                 this.error = undefined;
                 try {
                     const stat = await this.fileService.resolve(this.resource, { resolveSingleChildDescendants: true, resolveMetadata });
@@ -309,7 +311,7 @@ class ExplorerItem {
         this._fileNester = undefined;
     }
     getPlatformAwareName(name) {
-        return this.fileService.hasCapability(this.resource, 1024 ) ? name : name.toLowerCase();
+        return this.fileService.hasCapability(this.resource, FileSystemProviderCapabilities.PathCaseSensitive) ? name : name.toLowerCase();
     }
     move(newParent) {
         this.nestedParent?.removeChild(this);
@@ -336,7 +338,7 @@ class ExplorerItem {
         this.updateResource(true);
     }
     find(resource) {
-        const ignoreCase = !this.fileService.hasCapability(resource, 1024 );
+        const ignoreCase = !this.fileService.hasCapability(resource, FileSystemProviderCapabilities.PathCaseSensitive);
         if (resource && this.resource.scheme === resource.scheme && equalsIgnoreCase(this.resource.authority, resource.authority) &&
             (ignoreCase ? startsWithIgnoreCase(resource.path, this.resource.path) : resource.path.startsWith(this.resource.path))) {
             return this.findByPath(rtrim(resource.path, posix.sep), this.resource.path.length, ignoreCase);

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { FileChangeType } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
@@ -119,6 +120,28 @@ const TEXT_FILE_EDITOR_ID = 'workbench.editors.files.textFileEditor';
 const FILE_EDITOR_INPUT_ID = 'workbench.editors.files.fileEditorInput';
 const BINARY_FILE_EDITOR_ID = 'workbench.editors.files.binaryFileEditor';
 const BINARY_TEXT_FILE_MODE = 'code-text-binary';
+var SortOrder;
+( ((function(SortOrder) {
+    SortOrder["Default"] = "default";
+    SortOrder["Mixed"] = "mixed";
+    SortOrder["FilesFirst"] = "filesFirst";
+    SortOrder["Type"] = "type";
+    SortOrder["Modified"] = "modified";
+    SortOrder["FoldersNestsFiles"] = "foldersNestsFiles";
+})(SortOrder || (SortOrder = {}))));
+var UndoConfirmLevel;
+( ((function(UndoConfirmLevel) {
+    UndoConfirmLevel["Verbose"] = "verbose";
+    UndoConfirmLevel["Default"] = "default";
+    UndoConfirmLevel["Light"] = "light";
+})(UndoConfirmLevel || (UndoConfirmLevel = {}))));
+var LexicographicOptions;
+( ((function(LexicographicOptions) {
+    LexicographicOptions["Default"] = "default";
+    LexicographicOptions["Upper"] = "upper";
+    LexicographicOptions["Lower"] = "lower";
+    LexicographicOptions["Unicode"] = "unicode";
+})(LexicographicOptions || (LexicographicOptions = {}))));
 let TextFileContentProvider = TextFileContentProvider_1 = class TextFileContentProvider extends Disposable {
     constructor(textFileService, fileService, languageService, modelService) {
         super();
@@ -153,7 +176,7 @@ let TextFileContentProvider = TextFileContentProvider_1 = class TextFileContentP
             const disposables = ( (new DisposableStore()));
             this.fileWatcherDisposable.value = disposables;
             disposables.add(this.fileService.onDidFilesChange(changes => {
-                if (changes.contains(savedFileResource, 0 )) {
+                if (changes.contains(savedFileResource, FileChangeType.UPDATED)) {
                     this.resolveEditorModel(resource, false );
                 }
             }));
@@ -219,4 +242,4 @@ class OpenEditor {
         return EditorResourceAccessor.getOriginalUri(this.editor, { supportSideBySide: SideBySideEditor.PRIMARY });
     }
 }
-export { BINARY_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE, ExplorerCompressedFirstFocusContext, ExplorerCompressedFocusContext, ExplorerCompressedLastFocusContext, ExplorerFocusCondition, ExplorerFocusedContext, ExplorerFolderContext, ExplorerResourceAvailableEditorIdsContext, ExplorerResourceCut, ExplorerResourceMoveableToTrash, ExplorerResourceNotReadonlyContext, ExplorerResourceReadonlyContext, ExplorerRootContext, ExplorerViewletVisibleContext, FILE_EDITOR_INPUT_ID, FilesExplorerFocusCondition, FilesExplorerFocusedContext, FoldersViewVisibleContext, OpenEditor, OpenEditorsFocusedContext, TEXT_FILE_EDITOR_ID, TextFileContentProvider, VIEWLET_ID, VIEW_ID, ViewHasSomeCollapsibleRootItemContext };
+export { BINARY_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE, ExplorerCompressedFirstFocusContext, ExplorerCompressedFocusContext, ExplorerCompressedLastFocusContext, ExplorerFocusCondition, ExplorerFocusedContext, ExplorerFolderContext, ExplorerResourceAvailableEditorIdsContext, ExplorerResourceCut, ExplorerResourceMoveableToTrash, ExplorerResourceNotReadonlyContext, ExplorerResourceReadonlyContext, ExplorerRootContext, ExplorerViewletVisibleContext, FILE_EDITOR_INPUT_ID, FilesExplorerFocusCondition, FilesExplorerFocusedContext, FoldersViewVisibleContext, LexicographicOptions, OpenEditor, OpenEditorsFocusedContext, SortOrder, TEXT_FILE_EDITOR_ID, TextFileContentProvider, UndoConfirmLevel, VIEWLET_ID, VIEW_ID, ViewHasSomeCollapsibleRootItemContext };

package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js

@@ -6,6 +6,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions as Extensions$1 } from '../../../common/contributions.js';
 import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 var DefaultFoldingRangeProvider_1;
@@ -85,4 +86,4 @@ DefaultFoldingRangeProvider = DefaultFoldingRangeProvider_1 = ( (__decorate([
         }
     }
 });
-( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(DefaultFoldingRangeProvider, 3 );
+( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(DefaultFoldingRangeProvider, LifecyclePhase.Restored);

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js

@@ -7,13 +7,14 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { CancellationTokenSource, CancellationToken } from '../../../../base/common/cancellation.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { FormattingConflicts, getRealAndSyntheticDocumentFormattersOrdered, formatDocumentWithProvider, formatDocumentRangesWithProvider } from '../../../../editor/contrib/format/browser/format.js';
+import { FormattingConflicts, FormattingMode, getRealAndSyntheticDocumentFormattersOrdered, FormattingKind, formatDocumentWithProvider, formatDocumentRangesWithProvider } from '../../../../editor/contrib/format/browser/format.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions as Extensions$1 } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { Extensions } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { toExtension } from '../../../services/extensions/common/extensions.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
@@ -105,7 +106,7 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
             const extension = await this._extensionService.getExtension(defaultFormatterId);
             if (extension && this._extensionEnablementService.isEnabled(toExtension(extension))) {
                 const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
-                const detail = kind === 1
+                const detail = kind === FormattingKind.File
                     ? ( localizeWithPath(
                     _moduleId,
                     2,
@@ -147,7 +148,7 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         if (typeof formatterOrMessage !== 'string') {
             return formatterOrMessage;
         }
-        if (mode !== 2 ) {
+        if (mode !== FormattingMode.Silent) {
             const { confirmed } = await this._dialogService.confirm({
                 message: ( localizeWithPath(_moduleId, 6, "Configure Default Formatter")),
                 detail: formatterOrMessage,
@@ -199,7 +200,7 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         }
         const cts = ( (new CancellationTokenSource()));
         this._languageStatusStore.add(toDisposable(() => cts.dispose(true)));
-        this._analyzeFormatter(1 , formatter, document).then(result => {
+        this._analyzeFormatter(FormattingKind.File, formatter, document).then(result => {
             if (cts.token.isCancellationRequested) {
                 return;
             }
@@ -235,7 +236,7 @@ DefaultFormatter = DefaultFormatter_1 = ( (__decorate([
     ( (__param(8, ILanguageStatusService))),
     ( (__param(9, IEditorService)))
 ], DefaultFormatter)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DefaultFormatter, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DefaultFormatter, LifecyclePhase.Restored);
 ( (Registry.as(Extensions$1.Configuration))).registerConfiguration({
     ...editorConfigurationBaseNode,
     properties: {
@@ -336,7 +337,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
         const provider = getRealAndSyntheticDocumentFormattersOrdered(languageFeaturesService.documentFormattingEditProvider, languageFeaturesService.documentRangeFormattingEditProvider, model);
         const pick = await instaService.invokeFunction(showFormatterPick, model, provider);
         if (typeof pick === 'number') {
-            await instaService.invokeFunction(formatDocumentWithProvider, provider[pick], editor, 1 , CancellationToken.None);
+            await instaService.invokeFunction(formatDocumentWithProvider, provider[pick], editor, FormattingMode.Explicit, CancellationToken.None);
         }
         logFormatterTelemetry(telemetryService, 'document', provider, typeof pick === 'number' && provider[pick] || undefined);
     }
@@ -383,3 +384,4 @@ registerEditorAction(class FormatSelectionMultipleAction extends EditorAction {
         logFormatterTelemetry(telemetryService, 'range', provider, typeof pick === 'number' && provider[pick] || undefined);
     }
 });
+export { DefaultFormatter };

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js

@@ -1,16 +1,19 @@
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { registerEditorAction, EditorAction } from '../../../../editor/browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { VIEWLET_ID } from '../../extensions/common/extensions.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.service.js';
+import { ViewContainerLocation } from '../../../common/views.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 const _moduleId = "vs/workbench/contrib/format/browser/formatActionsNone";
 async function showExtensionQuery(paneCompositeService, query) {
-    const viewlet = await paneCompositeService.openPaneComposite(VIEWLET_ID, 0 , true);
+    const viewlet = await paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
     if (viewlet) {
         (viewlet?.getViewPaneContainer()).search(query);
     }
@@ -27,9 +30,9 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
             ))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 1024  | 512  | 36 ,
-                linux: { primary: 2048  | 1024  | 39  },
-                weight: 100 ,
+                primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.KeyF,
+                linux: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyI },
+                weight: KeybindingWeight.EditorContrib,
             }
         });
     }

package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js

@@ -6,7 +6,7 @@ import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.j
 import { shouldSynchronizeModel } from '../../../../editor/common/model.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { formatDocumentRangesWithSelectedProvider } from '../../../../editor/contrib/format/browser/format.js';
+import { formatDocumentRangesWithSelectedProvider, FormattingMode } from '../../../../editor/contrib/format/browser/format.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -33,7 +33,7 @@ registerEditorAction(class FormatModifiedAction extends EditorAction {
         }
         const ranges = await instaService.invokeFunction(getModifiedRanges, editor.getModel());
         if (isNonEmptyArray(ranges)) {
-            return instaService.invokeFunction(formatDocumentRangesWithSelectedProvider, editor, ranges, 1 , Progress.None, CancellationToken.None, true);
+            return instaService.invokeFunction(formatDocumentRangesWithSelectedProvider, editor, ranges, FormattingMode.Explicit, Progress.None, CancellationToken.None, true);
         }
     }
 });

package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js

@@ -1,8 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { clearNode, reset, addDisposableListener } from '../../../../base/browser/dom.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution, EditorAction2 } from '../../../../editor/browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation, EditorAction2 } from '../../../../editor/browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { asCommandLink } from '../../../../editor/contrib/inlayHints/browser/inlayHints.js';
 import { InlayHintsController } from '../../../../editor/contrib/inlayHints/browser/inlayHintsController.js';
@@ -13,6 +14,7 @@ import { IAccessibilitySignalService } from '../../../../platform/accessibilityS
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { Link } from '../../../../platform/opener/browser/link.js';
 var InlayHintsAccessibility_1;
 const _moduleId = "vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty";
@@ -158,8 +160,8 @@ registerAction2(class StopReadHints extends EditorAction2 {
             precondition: InlayHintsAccessibility.IsReading,
             f1: true,
             keybinding: {
-                weight: 100 ,
-                primary: 9
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.Escape
             }
         });
     }
@@ -168,5 +170,5 @@ registerAction2(class StopReadHints extends EditorAction2 {
         ctrl?.stopInlayHintsReading();
     }
 });
-registerEditorContribution(InlayHintsAccessibility.ID, InlayHintsAccessibility, 4 );
+registerEditorContribution(InlayHintsAccessibility.ID, InlayHintsAccessibility, EditorContributionInstantiation.Lazy);
 export { InlayHintsAccessibility };