@codingame/monaco-vscode-explorer-service-override 11.1.2 → 12.0.0

package/index.d.ts

@@ -1 +1,3 @@
-export { default } from 'vscode/service-override/explorer';
+import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+declare function getServiceOverride(): IEditorOverrideServices;
+export default getServiceOverride;

package/index.js

@@ -1 +1,15 @@
-export { default } from './explorer.js';
+
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { ExplorerService } from './vscode/src/vs/workbench/contrib/files/browser/explorerService.js';
+import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files.service';
+import '@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/contrib/files/browser/fileCommands';
+import '@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/contrib/files/browser/fileActions.contribution';
+import './vscode/src/vs/workbench/contrib/files/browser/files.contribution._explorer.js';
+
+function getServiceOverride() {
+    return {
+        [IExplorerService.toString()]: new SyncDescriptor(ExplorerService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-explorer-service-override",
-  "version": "11.1.2",
+  "version": "12.0.0",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - explorer service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,18 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - explorer service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-15626ec7-b165-51e1-8caf-7bcc2ae9b95a-common": "12.0.0",
+    "@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common": "12.0.0",
+    "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common": "12.0.0",
+    "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "12.0.0",
+    "@codingame/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common": "12.0.0",
+    "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common": "12.0.0",
+    "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "12.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +34,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.2"
   }
 }

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

@@ -0,0 +1,72 @@
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+import { ISortOrderConfiguration } from "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common/vscode/vs/workbench/contrib/files/common/files";
+import { ExplorerItem } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/contrib/files/common/explorerModel";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IClipboardService } from "vscode/vscode/vs/platform/clipboard/common/clipboardService.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IEditableData } from "vscode/vscode/vs/workbench/common/views";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IBulkEditService, ResourceFileEdit } from "vscode/vscode/vs/editor/browser/services/bulkEditService";
+import { UndoRedoSource } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo";
+import { IExplorerView } from "@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common/vscode/vs/workbench/contrib/files/browser/files";
+import { IExplorerService } from "vscode/vscode/vs/workbench/contrib/files/browser/files.service";
+import { ProgressLocation } from "vscode/vscode/vs/platform/progress/common/progress";
+import { IProgressService } from "vscode/vscode/vs/platform/progress/common/progress.service";
+import { IHostService } from "vscode/vscode/vs/workbench/services/host/browser/host.service";
+import { IFilesConfigurationService } from "vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+export declare const UNDO_REDO_SOURCE: UndoRedoSource;
+export declare class ExplorerService implements IExplorerService {
+    private fileService;
+    private configurationService;
+    private contextService;
+    private clipboardService;
+    private editorService;
+    private readonly uriIdentityService;
+    private readonly bulkEditService;
+    private readonly progressService;
+    private readonly filesConfigurationService;
+    private readonly telemetryService;
+    readonly _serviceBrand: undefined;
+    private static readonly EXPLORER_FILE_CHANGES_REACT_DELAY;
+    private readonly disposables;
+    private editable;
+    private config;
+    private cutItems;
+    private view;
+    private model;
+    private onFileChangesScheduler;
+    private fileChangeEvents;
+    private revealExcludeMatcher;
+    constructor(fileService: IFileService, configurationService: IConfigurationService, contextService: IWorkspaceContextService, clipboardService: IClipboardService, editorService: IEditorService, uriIdentityService: IUriIdentityService, bulkEditService: IBulkEditService, progressService: IProgressService, hostService: IHostService, filesConfigurationService: IFilesConfigurationService, telemetryService: ITelemetryService);
+    get roots(): ExplorerItem[];
+    get sortOrderConfiguration(): ISortOrderConfiguration;
+    registerView(contextProvider: IExplorerView): void;
+    getContext(respectMultiSelection: boolean, ignoreNestedChildren?: boolean): ExplorerItem[];
+    applyBulkEdit(edit: ResourceFileEdit[], options: {
+        undoLabel: string;
+        progressLabel: string;
+        confirmBeforeUndo?: boolean;
+        progressLocation?: ProgressLocation.Explorer | ProgressLocation.Window;
+    }): Promise<void>;
+    hasViewFocus(): boolean;
+    findClosest(resource: URI): ExplorerItem | null;
+    findClosestRoot(resource: URI): ExplorerItem | null;
+    setEditable(stat: ExplorerItem, data: IEditableData | null): Promise<void>;
+    setToCopy(items: ExplorerItem[], cut: boolean): Promise<void>;
+    isCut(item: ExplorerItem): boolean;
+    getEditable(): {
+        stat: ExplorerItem;
+        data: IEditableData;
+    } | undefined;
+    getEditableData(stat: ExplorerItem): IEditableData | undefined;
+    isEditable(stat: ExplorerItem | undefined): boolean;
+    select(resource: URI, reveal?: boolean | string): Promise<void>;
+    refresh(reveal?: boolean): Promise<void>;
+    private onDidRunOperation;
+    private shouldAutoRevealItem;
+    private onConfigurationUpdated;
+    dispose(): void;
+}

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

@@ -1,8 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ExplorerModel, ExplorerItem } from 'vscode/vscode/vs/workbench/contrib/files/common/explorerModel';
+import { SortOrder, LexicographicOptions } from '@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common/vscode/vs/workbench/contrib/files/common/files';
+import { ExplorerModel, ExplorerItem } from '@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/contrib/files/common/explorerModel';
+import { FileChangeType, FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { dirname, basename } from 'vscode/vscode/vs/base/common/resources';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -11,11 +14,12 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { UndoRedoSource } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
-import { ResourceGlobMatcher } from 'vscode/vscode/vs/workbench/common/resources';
+import { ResourceGlobMatcher } from '@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/common/resources';
 import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 
@@ -50,9 +54,9 @@ let ExplorerService = class ExplorerService {
         this.onFileChangesScheduler = ( new RunOnceScheduler(async () => {
             const events = this.fileChangeEvents;
             this.fileChangeEvents = [];
-            const types = [2 ];
-            if (this.config.sortOrder === "modified" ) {
-                types.push(0 );
+            const types = [FileChangeType.DELETED];
+            if (this.config.sortOrder === SortOrder.Modified) {
+                types.push(FileChangeType.UPDATED);
             }
             let shouldRefresh = false;
             this.roots.forEach(r => {
@@ -149,9 +153,9 @@ let ExplorerService = class ExplorerService {
     }
     async applyBulkEdit(edit, options) {
         const cancellationTokenSource = ( new CancellationTokenSource());
-        const location = options.progressLocation ?? 10 ;
+        const location = options.progressLocation ?? ProgressLocation.Window;
         let progressOptions;
-        if (location === 10 ) {
+        if (location === ProgressLocation.Window) {
             progressOptions = {
                 location: location,
                 title: options.progressLabel,
@@ -176,7 +180,7 @@ let ExplorerService = class ExplorerService {
                 confirmBeforeUndo: options.confirmBeforeUndo
             });
         }, () => cancellationTokenSource.cancel());
-        await this.progressService.withProgress({ location: 1 , delay: 500 }, () => promise);
+        await this.progressService.withProgress({ location: ProgressLocation.Explorer, delay: 500 }, () => promise);
         cancellationTokenSource.dispose();
     }
     hasViewFocus() {
@@ -256,7 +260,7 @@ let ExplorerService = class ExplorerService {
             await this.view.selectResource(fileStat.resource, reveal);
             return Promise.resolve(undefined);
         }
-        const options = { resolveTo: [resource], resolveMetadata: this.config.sortOrder === "modified"  };
+        const options = { resolveTo: [resource], resolveMetadata: this.config.sortOrder === SortOrder.Modified };
         const root = this.findClosestRoot(resource);
         if (!root) {
             return undefined;
@@ -278,6 +282,9 @@ let ExplorerService = class ExplorerService {
         }
     }
     async refresh(reveal = true) {
+        if (this.view?.hasPhantomElements()) {
+            return;
+        }
         this.model.roots.forEach(r => r.forgetChildren());
         if (this.view) {
             await this.view.refresh(true);
@@ -290,7 +297,7 @@ let ExplorerService = class ExplorerService {
     }
     async onDidRunOperation(e) {
         const shouldDeepRefresh = this.config.fileNesting.enabled;
-        if (e.isOperation(0 ) || e.isOperation(3 )) {
+        if (e.isOperation(FileOperation.CREATE) || e.isOperation(FileOperation.COPY)) {
             const addedElement = e.target;
             const parentResource = dirname(addedElement.resource);
             const parents = this.model.findAll(parentResource);
@@ -311,7 +318,7 @@ let ExplorerService = class ExplorerService {
                 })));
             }
         }
-        else if (e.isOperation(2 )) {
+        else if (e.isOperation(FileOperation.MOVE)) {
             const oldResource = e.resource;
             const newElement = e.target;
             const oldParentResource = dirname(oldResource);
@@ -340,7 +347,7 @@ let ExplorerService = class ExplorerService {
                 }
             }
         }
-        else if (e.isOperation(1 )) {
+        else if (e.isOperation(FileOperation.DELETE)) {
             const modelElements = this.model.findAll(e.resource);
             await Promise.all(( modelElements.map(async (modelElement) => {
                 if (modelElement.parent) {
@@ -389,11 +396,11 @@ let ExplorerService = class ExplorerService {
             shouldRefresh = true;
         }
         const configuration = this.configurationService.getValue();
-        const configSortOrder = configuration?.explorer?.sortOrder || "default" ;
+        const configSortOrder = configuration?.explorer?.sortOrder || SortOrder.Default;
         if (this.config.sortOrder !== configSortOrder) {
             shouldRefresh = this.config.sortOrder !== undefined;
         }
-        const configLexicographicOptions = configuration?.explorer?.sortOrderLexicographicOptions || "default" ;
+        const configLexicographicOptions = configuration?.explorer?.sortOrderLexicographicOptions || LexicographicOptions.Default;
         if (this.config.sortOrderLexicographicOptions !== configLexicographicOptions) {
             shouldRefresh = shouldRefresh || this.config.sortOrderLexicographicOptions !== undefined;
         }

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

@@ -0,0 +1 @@
+