@codingame/monaco-vscode-api 4.4.1 → 4.5.0-improve-code-splitting.1

package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js

@@ -8,49 +8,53 @@ import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Action } from '../../../../base/common/actions.js';
 import { dispose } from '../../../../base/common/lifecycle.js';
 import { VIEWLET_ID, VIEW_ID } from '../common/files.js';
-import { IFileService } from '../../../../platform/files/common/files.js';
+import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
-import { IQuickInputService, ItemActivation } from '../../../../platform/quickinput/common/quickInput.js';
+import { ItemActivation } from '../../../../platform/quickinput/common/quickInput.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IHostService } from '../../../services/host/browser/host.js';
+import { IHostService } from '../../../services/host/browser/host.service.js';
 import { SAVE_ALL_IN_GROUP_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from './fileConstants.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
-import { ICommandService, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { Schemas } from '../../../../base/common/network.js';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
+import '../../../../platform/notification/common/notification.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { CLOSE_EDITORS_AND_GROUP_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
 import { coalesce } from '../../../../base/common/arrays.js';
 import { NewExplorerItem } from '../common/explorerModel.js';
 import { getErrorMessage } from '../../../../base/common/errors.js';
 import { triggerUpload } from '../../../../base/browser/dom.js';
-import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
-import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.service.js';
 import { timeout } from '../../../../base/common/async.js';
-import { IWorkingCopyFileService } from '../../../services/workingCopy/common/workingCopyFileService.js';
+import { IWorkingCopyFileService } from '../../../services/workingCopy/common/workingCopyFileService.service.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { trim, rtrim } from '../../../../base/common/strings.js';
-import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
 import { ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
-import { IExplorerService } from './files.js';
+import { IExplorerService } from './files.service.js';
 import { FileDownload, BrowserFileUpload } from './fileImportExport.js';
-import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
-import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
-import { IPathService } from '../../../services/path/common/pathService.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.service.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.service.js';
+import { IPathService } from '../../../services/path/common/pathService.service.js';
 import { Action2 } from '../../../../platform/actions/common/actions.js';
 import { ActiveEditorContext, EmptyWorkspaceSupportContext, ActiveEditorCanToggleReadonlyContext } from '../../../common/contextkeys.js';
 import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
-import { IDialogService, getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
+import Severity$1 from '../../../../base/common/severity.js';
 const NEW_FILE_COMMAND_ID = 'explorer.newFile';
 const NEW_FILE_LABEL = ( localize2WithPath('vs/workbench/contrib/files/browser/fileActions', 'newFile', "New File..."));
 const NEW_FOLDER_COMMAND_ID = 'explorer.newFolder';
@@ -541,7 +545,7 @@ async function askForOverwrite(fileService, dialogService, targetResource) {
         return true;
     }
     const { confirmed } = await dialogService.confirm({
-        type: Severity.Warning,
+        type: Severity$1.Warning,
         message: ( localizeWithPath(
             'vs/workbench/contrib/files/browser/fileActions',
             'confirmOverwrite',
@@ -772,7 +776,7 @@ function validateFileName(pathService, item, name, os) {
                 'emptyFileNameError',
                 "A file or folder name must be provided."
             )),
-            severity: Severity.Error
+            severity: Severity$1.Error
         };
     }
     if (name[0] === '/' || name[0] === '\\') {
@@ -782,7 +786,7 @@ function validateFileName(pathService, item, name, os) {
                 'fileNameStartsWithSlashError',
                 "A file or folder name cannot start with a slash."
             )),
-            severity: Severity.Error
+            severity: Severity$1.Error
         };
     }
     const names = coalesce(name.split(/[\\/]/));
@@ -797,7 +801,7 @@ function validateFileName(pathService, item, name, os) {
                     "A file or folder **{0}** already exists at this location. Please choose a different name.",
                     name
                 )),
-                severity: Severity.Error
+                severity: Severity$1.Error
             };
         }
     }
@@ -810,7 +814,7 @@ function validateFileName(pathService, item, name, os) {
                 "The name **{0}** is not valid as a file or folder name. Please choose a different name.",
                 trimLongName(escapedName)
             )),
-            severity: Severity.Error
+            severity: Severity$1.Error
         };
     }
     if (( names.some(name => /^\s|\s$/.test(name)))) {
@@ -820,7 +824,7 @@ function validateFileName(pathService, item, name, os) {
                 'fileNameWhitespaceWarning',
                 "Leading or trailing whitespace detected in file or folder name."
             )),
-            severity: Severity.Warning
+            severity: Severity$1.Warning
         };
     }
     return null;
@@ -934,7 +938,7 @@ ClipboardContentProvider = ( __decorate([
     ( __param(2, IModelService))
 ], ClipboardContentProvider));
 function onErrorWithRetry(notificationService, error, retry) {
-    notificationService.prompt(Severity.Error, toErrorMessage(error, false), [{
+    notificationService.prompt(Severity$1.Error, toErrorMessage(error, false), [{
             label: ( localizeWithPath('vs/workbench/contrib/files/browser/fileActions', 'retry', "Retry")),
             run: () => retry()
         }]);

package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.save.js

@@ -11,16 +11,18 @@ import { localizeWithPath } from '../../../../nls.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { IListService } from '../../../../platform/list/browser/listService.js';
-import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IListService } from '../../../../platform/list/browser/listService.service.js';
+import '../../../../platform/notification/common/notification.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { getMultiSelectedEditorContexts } from '../../../browser/parts/editor/editorCommands.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { getOpenEditorsViewMultiSelection } from './files.js';
-import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 import { SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID } from './fileConstants.js';
+import Severity$1 from '../../../../base/common/severity.js';
 async function saveSelectedEditors(accessor, options) {
     const listService = accessor.get(IListService);
     const editorGroupService = accessor.get(IEditorGroupsService);
@@ -81,7 +83,7 @@ async function doSaveEditors(accessor, editors, options) {
         if (!isCancellationError(error)) {
             notificationService.notify({
                 id: ( editors.map(({ editor }) => hash(editor.resource?.toString()))).join(),
-                severity: Severity.Error,
+                severity: Severity$1.Error,
                 message: ( localizeWithPath(
                     'vs/workbench/contrib/files/browser/fileCommands.save',
                     { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] },

package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js

@@ -1,26 +1,29 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { ByteSize, IFileService } from '../../../../platform/files/common/files.js';
-import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
-import { IProgressService } from '../../../../platform/progress/common/progress.js';
-import { IExplorerService } from './files.js';
+import { getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
+import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
+import { ByteSize } from '../../../../platform/files/common/files.js';
+import { IFileService } from '../../../../platform/files/common/files.service.js';
+import '../../../../platform/notification/common/notification.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
+import { IExplorerService } from './files.service.js';
 import { VIEW_ID } from '../common/files.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { Promises, RunOnceWorker, Limiter } from '../../../../base/common/async.js';
 import { VSBuffer, newWriteableBufferStream } from '../../../../base/common/buffer.js';
 import { joinPath, dirname, basename } from '../../../../base/common/resources.js';
 import { ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
 import { ExplorerItem } from '../common/explorerModel.js';
 import { URI } from '../../../../base/common/uri.js';
-import { IHostService } from '../../../services/host/browser/host.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IHostService } from '../../../services/host/browser/host.service.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { extractEditorsAndFilesDropData } from '../../../../platform/dnd/browser/dnd.js';
-import { IWorkspaceEditingService } from '../../../services/workspaces/common/workspaceEditing.js';
+import { IWorkspaceEditingService } from '../../../services/workspaces/common/workspaceEditing.service.js';
 import { isWeb } from '../../../../base/common/platform.js';
 import { isDragEvent, getActiveWindow, triggerDownload } from '../../../../base/browser/dom.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { FileAccess, Schemas } from '../../../../base/common/network.js';
 import { mnemonicButtonLabel } from '../../../../base/common/labels.js';
 import { listenStream } from '../../../../base/common/stream.js';
@@ -28,11 +31,11 @@ import { toDisposable, DisposableStore } from '../../../../base/common/lifecycle
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
 import { coalesce } from '../../../../base/common/arrays.js';
 import { canceled } from '../../../../base/common/errors.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { WebFileSystemAccess } from '../../../../platform/files/browser/webFileSystemAccess.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.js';
-import { getFileNamesMessage, IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+import Severity$1 from '../../../../base/common/severity.js';
 var BrowserFileUpload_1, FileDownload_1;
 let BrowserFileUpload = class BrowserFileUpload {
     static { BrowserFileUpload_1 = this; }
@@ -398,7 +401,7 @@ let ExternalFileImport = class ExternalFileImport {
                     ));
             }
             const { result } = await this.dialogService.prompt({
-                type: Severity.Info,
+                type: Severity$1.Info,
                 message,
                 buttons,
                 cancelButton: true

package/vscode/src/vs/workbench/contrib/files/browser/files.d.ts

@@ -1,44 +1,7 @@
-import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
 import { URI } from '../../../../base/common/uri.js';
-import { ISortOrderConfiguration } from '../common/files.js';
 import '../../../../editor/editor.api.js';
-import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { ExplorerItem } from '../common/explorerModel.js';
-import { IEditableData } from '../../../common/views.js';
-import { ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
 
-interface IExplorerService {
-    readonly _serviceBrand: undefined;
-    readonly roots: ExplorerItem[];
-    readonly sortOrderConfiguration: ISortOrderConfiguration;
-    getContext(respectMultiSelection: boolean, ignoreNestedChildren?: boolean): ExplorerItem[];
-    hasViewFocus(): boolean;
-    setEditable(stat: ExplorerItem, data: IEditableData | null): Promise<void>;
-    getEditable(): {
-        stat: ExplorerItem;
-        data: IEditableData;
-    } | undefined;
-    getEditableData(stat: ExplorerItem): IEditableData | undefined;
-    isEditable(stat: ExplorerItem | undefined): boolean;
-    findClosest(resource: URI): ExplorerItem | null;
-    findClosestRoot(resource: URI): ExplorerItem | null;
-    refresh(): Promise<void>;
-    setToCopy(stats: ExplorerItem[], cut: boolean): Promise<void>;
-    isCut(stat: ExplorerItem): boolean;
-    applyBulkEdit(edit: ResourceFileEdit[], options: {
-        undoLabel: string;
-        progressLabel: string;
-        confirmBeforeUndo?: boolean;
-        progressLocation?: ProgressLocation.Explorer | ProgressLocation.Window;
-    }): Promise<void>;
-    /**
-     * Selects and reveal the file element provided by the given resource if its found in the explorer.
-     * Will try to resolve the path in case the explorer is not yet expanded to the file yet.
-     */
-    select(resource: URI, reveal?: boolean | string): Promise<void>;
-    registerView(contextAndRefreshProvider: IExplorerView): void;
-}
-declare const IExplorerService: ServiceIdentifier<IExplorerService>;
 interface IExplorerView {
     autoReveal: boolean | 'force' | 'focusNoScroll';
     getContext(respectMultiSelection: boolean): ExplorerItem[];
@@ -55,4 +18,4 @@ interface IExplorerView {
     focusLast(): void;
 }
 
-export { IExplorerService, type IExplorerView };
+export type { IExplorerView };

package/vscode/src/vs/workbench/contrib/files/browser/files.editorPane.contribution.js

@@ -12,7 +12,7 @@ import { BinaryFileEditor } from './editors/binaryFileEditor.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { isWindows } from '../../../../base/common/platform.js';
 import { EditorPaneDescriptor } from '../../../browser/editor.js';
-import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { WorkspaceWatcher } from './workspaceWatcher.js';
 import { DirtyFilesIndicator } from '../common/dirtyFilesIndicator.js';

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

@@ -5,9 +5,7 @@ import { List } from '../../../../base/browser/ui/list/listWidget.js';
 import { ExplorerItem } from '../common/explorerModel.js';
 import { coalesce } from '../../../../base/common/arrays.js';
 import { AsyncDataTree } from '../../../../base/browser/ui/tree/asyncDataTree.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { isActiveElement } from '../../../../base/browser/dom.js';
-const IExplorerService = ( createDecorator('explorerService'));
 function getFocus(listService) {
     const list = listService.lastFocusedList;
     const element = list?.getHTMLElement();
@@ -92,4 +90,4 @@ function getOpenEditorsViewMultiSelection(listService, editorGroupService) {
     }
     return undefined;
 }
-export { IExplorerService, getMultiSelectedResources, getOpenEditorsViewMultiSelection, getResourceForCommand };
+export { getMultiSelectedResources, getOpenEditorsViewMultiSelection, getResourceForCommand };

package/vscode/src/vs/workbench/contrib/files/browser/files.service.d.ts

@@ -0,0 +1,43 @@
+import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ISortOrderConfiguration } from '../common/files.js';
+import { ExplorerItem } from '../common/explorerModel.js';
+import { IEditableData } from '../../../common/views.js';
+import { ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IExplorerView } from './files.js';
+
+interface IExplorerService {
+    readonly _serviceBrand: undefined;
+    readonly roots: ExplorerItem[];
+    readonly sortOrderConfiguration: ISortOrderConfiguration;
+    getContext(respectMultiSelection: boolean, ignoreNestedChildren?: boolean): ExplorerItem[];
+    hasViewFocus(): boolean;
+    setEditable(stat: ExplorerItem, data: IEditableData | null): Promise<void>;
+    getEditable(): {
+        stat: ExplorerItem;
+        data: IEditableData;
+    } | undefined;
+    getEditableData(stat: ExplorerItem): IEditableData | undefined;
+    isEditable(stat: ExplorerItem | undefined): boolean;
+    findClosest(resource: URI): ExplorerItem | null;
+    findClosestRoot(resource: URI): ExplorerItem | null;
+    refresh(): Promise<void>;
+    setToCopy(stats: ExplorerItem[], cut: boolean): Promise<void>;
+    isCut(stat: ExplorerItem): boolean;
+    applyBulkEdit(edit: ResourceFileEdit[], options: {
+        undoLabel: string;
+        progressLabel: string;
+        confirmBeforeUndo?: boolean;
+        progressLocation?: ProgressLocation.Explorer | ProgressLocation.Window;
+    }): Promise<void>;
+    /**
+    * Selects and reveal the file element provided by the given resource if its found in the explorer.
+    * Will try to resolve the path in case the explorer is not yet expanded to the file yet.
+    */
+    select(resource: URI, reveal?: boolean | string): Promise<void>;
+    registerView(contextAndRefreshProvider: IExplorerView): void;
+}
+declare const IExplorerService: ServiceIdentifier<IExplorerService>;
+
+export { IExplorerService };

package/vscode/src/vs/workbench/contrib/files/browser/files.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const IExplorerService = ( createDecorator('explorerService'));
+export { IExplorerService };

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

@@ -1,11 +1,12 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { localize2WithPath } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
-import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
-import { isTemporaryWorkspace, IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.service.js';
+import { isTemporaryWorkspace } from '../../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.service.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
 import { ResourcesDropHandler } from '../../../../browser/dnd.js';
 import '../../../../../platform/theme/common/colorUtils.js';
@@ -19,11 +20,11 @@ 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 { ILabelService } from '../../../../../platform/label/common/label.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IViewDescriptorService } from '../../../../common/views.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { ILabelService } from '../../../../../platform/label/common/label.service.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
+import { IViewDescriptorService } from '../../../../common/views.service.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { isWeb } from '../../../../../base/common/platform.js';
 import { DragAndDropObserver, getWindow } from '../../../../../base/browser/dom.js';
 var EmptyView_1;

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { localizeWithPath } from '../../../../../nls.js';
-import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.service.js';
 import '../../../../../platform/theme/common/colorUtils.js';
 import '../../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../../platform/theme/common/colors/chartsColors.js';
@@ -15,7 +15,7 @@ import '../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../platform/theme/common/colors/searchColors.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { explorerRootErrorEmitter } from './explorerViewer.js';
-import { IExplorerService } from '../files.js';
+import { IExplorerService } from '../files.service.js';
 import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
 function provideDecorations(fileStat) {
     if (fileStat.isRoot && fileStat.error) {

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

@@ -5,42 +5,44 @@ import { memoize } from '../../../../../base/common/decorators.js';
 import { ExplorerFolderContext, ExplorerResourceReadonlyContext, ExplorerResourceAvailableEditorIdsContext, ExplorerRootContext, ExplorerResourceMoveableToTrash, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, ViewHasSomeCollapsibleRootItemContext, FoldersViewVisibleContext, ExplorerResourceCut, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerResourceNotReadonlyContext, VIEW_ID } from '../../common/files.js';
 import { FileCopiedContext, NEW_FILE_COMMAND_ID, NEW_FOLDER_COMMAND_ID } from '../fileActions.js';
 import { append, $, addDisposableListener, getWindow, isAncestorOfActiveElement, isKeyboardEvent, getLargestChildWidth, EventType } from '../../../../../base/browser/dom.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
+import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.service.js';
 import { ExplorerDecorationsProvider } from './explorerDecorationsProvider.js';
-import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.service.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IProgressService } from '../../../../../platform/progress/common/progress.js';
-import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
-import { IContextKeyService, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IProgressService } from '../../../../../platform/progress/common/progress.service.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.service.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
 import { ResourceContextKey } from '../../../../common/contextkeys.js';
-import { IDecorationsService } from '../../../../services/decorations/common/decorations.js';
+import { IDecorationsService } from '../../../../services/decorations/common/decorations.service.js';
 import { WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
 import { DelayedDragHandler } from '../../../../../base/browser/dnd.js';
-import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js';
+import { SIDE_GROUP, ACTIVE_GROUP } from '../../../../services/editor/common/editorService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
-import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { ILabelService } from '../../../../../platform/label/common/label.service.js';
 import { FilesFilter, FilesRenderer, ExplorerDelegate, ExplorerCompressionDelegate, ExplorerDataSource, FileSorter, FileDragAndDrop, isCompressedFolderName } from './explorerViewer.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
 import { MenuId, registerAction2, Action2 } from '../../../../../platform/actions/common/actions.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { ExplorerItem, NewExplorerItem } from '../../common/explorerModel.js';
 import { ResourceLabels } from '../../../../browser/labels.js';
-import { IStorageService } from '../../../../../platform/storage/common/storage.js';
-import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
-import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.service.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.service.js';
+import { IFileService } from '../../../../../platform/files/common/files.service.js';
 import { Event } from '../../../../../base/common/event.js';
 import { SIDE_BAR_BACKGROUND } from '../../../../common/theme.js';
-import { IViewDescriptorService } from '../../../../common/views.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IViewDescriptorService } from '../../../../common/views.service.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.service.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.service.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
-import { IExplorerService } from '../files.js';
+import { IExplorerService } from '../files.service.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
+import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.service.js';
 import { EditorOpenSource } from '../../../../../platform/editor/common/editor.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { isInputElement } from '../../../../../base/browser/ui/list/listWidget.js';

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

@@ -1,15 +1,18 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { addDisposableListener, addStandardDisposableListener, getWindow, EventType, isActiveElement, hasParentWithClass } from '../../../../../base/browser/dom.js';
 import { parse } from '../../../../../base/common/glob.js';
-import { IProgressService } from '../../../../../platform/progress/common/progress.js';
-import { Severity, INotificationService } from '../../../../../platform/notification/common/notification.js';
-import { FileKind, IFileService } from '../../../../../platform/files/common/files.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
-import { isTemporaryWorkspace, IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IProgressService } from '../../../../../platform/progress/common/progress.service.js';
+import '../../../../../platform/notification/common/notification.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.service.js';
+import { FileKind } from '../../../../../platform/files/common/files.js';
+import { IFileService } from '../../../../../platform/files/common/files.service.js';
+import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.service.js';
+import { isTemporaryWorkspace } from '../../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.service.js';
 import { DisposableStore, toDisposable, Disposable, dispose } from '../../../../../base/common/lifecycle.js';
-import { IContextViewService, IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextViewService, IContextMenuService } from '../../../../../platform/contextview/browser/contextView.service.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { dirname, joinPath, distinctParents } from '../../../../../base/common/resources.js';
 import { InputBox } from '../../../../../base/browser/ui/inputbox/inputBox.js';
 import { localizeWithPath } from '../../../../../nls.js';
@@ -25,17 +28,18 @@ import { DataTransfers } from '../../../../../base/browser/dnd.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { ExternalElementsDragAndDropData, NativeDragAndDropData } from '../../../../../base/browser/ui/list/listView.js';
 import { isWeb, isMacintosh } from '../../../../../base/common/platform.js';
-import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IWorkspaceEditingService } from '../../../../services/workspaces/common/workspaceEditing.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { getFileNamesMessage } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.service.js';
+import { IWorkspaceEditingService } from '../../../../services/workspaces/common/workspaceEditing.service.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { findValidPasteFileTarget } from '../fileActions.js';
 import { createMatches } from '../../../../../base/common/filters.js';
 import { Emitter, EventMultiplexer, Event } from '../../../../../base/common/event.js';
-import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { ILabelService } from '../../../../../platform/label/common/label.service.js';
 import { isStringArray, isNumber } from '../../../../../base/common/types.js';
-import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.service.js';
 import { ResourceFileEdit } from '../../../../../editor/browser/services/bulkEditService.js';
-import { IExplorerService } from '../files.js';
+import { IExplorerService } from '../files.service.js';
 import { ExternalFileImport, BrowserFileUpload, getMultipleFilesOverwriteConfirm } from '../fileImportExport.js';
 import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
 import { WebFileSystemAccess } from '../../../../../platform/files/browser/webFileSystemAccess.js';
@@ -44,11 +48,11 @@ import { ResourceSet } from '../../../../../base/common/map.js';
 import { TernarySearchTree } from '../../../../../base/common/ternarySearchTree.js';
 import { defaultInputBoxStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { timeout } from '../../../../../base/common/async.js';
-import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
-import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.service.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { mainWindow } from '../../../../../base/browser/window.js';
 import { explorerFileContribRegistry } from '../explorerFileContrib.js';
-import { getFileNamesMessage, IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import Severity$1 from '../../../../../base/common/severity.js';
 var FilesRenderer_1, FileDragAndDrop_1;
 class ExplorerDelegate {
     static { this.ITEM_HEIGHT = 22; }
@@ -430,7 +434,7 @@ let FilesRenderer = class FilesRenderer {
             validationOptions: {
                 validation: (value) => {
                     const message = editableData.validationMessage(value);
-                    if (!message || message.severity !== Severity.Error) {
+                    if (!message || message.severity !== Severity$1.Error) {
                         return null;
                     }
                     return {
@@ -468,7 +472,7 @@ let FilesRenderer = class FilesRenderer {
                     inputBox.showMessage({
                         content: message.content,
                         formatContent: true,
-                        type: message.severity === Severity.Info ? 1  : message.severity === Severity.Warning ? 2  : 3
+                        type: message.severity === Severity$1.Info ? 1  : message.severity === Severity$1.Warning ? 2  : 3
                     });
                 }
                 else {