@codingame/monaco-vscode-base-service-override 5.3.0 → 6.0.0

package/base.js

@@ -4,14 +4,12 @@ import { IRequestService } from 'vscode/vscode/vs/platform/request/common/reques
 import { IDecorationsService } from 'vscode/vscode/vs/workbench/services/decorations/common/decorations.service';
 import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing.service';
 import { ITreeViewsDnDService } from 'vscode/vscode/vs/editor/common/services/treeViewsDndService';
-import { ITreeViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/treeViewsService.service';
 import { TreeViewsDnDService } from 'vscode/vscode/vs/editor/common/services/treeViewsDnd';
 import { IURLService } from 'vscode/vscode/vs/platform/url/common/url.service';
 import { JSONEditingService } from './vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js';
 import { DecorationsService } from './vscode/src/vs/workbench/services/decorations/browser/decorationsService.js';
 import { BrowserRequestService } from './vscode/src/vs/workbench/services/request/browser/requestService.js';
 import { BrowserURLService } from './vscode/src/vs/workbench/services/url/browser/urlService.js';
-import { TreeviewsService } from './vscode/src/vs/workbench/services/views/common/treeViewsService.js';
 import { CanonicalUriService } from './vscode/src/vs/workbench/services/workspaces/common/canonicalUriService.js';
 import { ICanonicalUriService } from 'vscode/vscode/vs/platform/workspace/common/canonicalUri.service';
 import { IUserActivityService } from 'vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service';
@@ -26,6 +24,8 @@ import { guessLocalUserHome } from './vscode/src/vs/workbench/services/path/brow
 import { AbstractPathService } from './vscode/src/vs/workbench/services/path/common/pathService.js';
 import { UserActivityService } from './vscode/src/vs/workbench/services/userActivity/common/userActivityService.js';
 import { WorkingCopyFileService } from './vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.js';
+import { ITrustedDomainService } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomainService.service';
+import { TrustedDomainService } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
 import { getEnvironmentOverride } from 'vscode/workbench';
 
 let BrowserPathServiceOverride = class BrowserPathServiceOverride extends AbstractPathService {
@@ -45,12 +45,12 @@ function getServiceOverride() {
         [( IDecorationsService.toString())]: new SyncDescriptor(DecorationsService, [], true),
         [( IJSONEditingService.toString())]: new SyncDescriptor(JSONEditingService, [], true),
         [( ITreeViewsDnDService.toString())]: new SyncDescriptor(TreeViewsDnDService, [], true),
-        [( ITreeViewsService.toString())]: new SyncDescriptor(TreeviewsService, [], true),
         [( IURLService.toString())]: new SyncDescriptor(BrowserURLService, [], true),
         [( ICanonicalUriService.toString())]: new SyncDescriptor(CanonicalUriService, [], false),
         [( IUserActivityService.toString())]: new SyncDescriptor(UserActivityService, [], true),
         [( IWorkingCopyFileService.toString())]: new SyncDescriptor(WorkingCopyFileService, [], false),
-        [( IPathService.toString())]: new SyncDescriptor(BrowserPathServiceOverride, [], true)
+        [( IPathService.toString())]: new SyncDescriptor(BrowserPathServiceOverride, [], true),
+        [( ITrustedDomainService.toString())]: new SyncDescriptor(TrustedDomainService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "5.3.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
   }
 }

package/vscode/src/vs/platform/url/common/urlService.js

@@ -1,5 +1,7 @@
 import { first } from 'vscode/vscode/vs/base/common/async';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/common/charCode';
+import 'vscode/vscode/vs/base/common/marshallingIds';
 import 'vscode/vscode/vs/base/common/path';
 import 'vscode/vscode/vs/base/common/platform';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';

package/vscode/src/vs/workbench/services/configuration/common/jsonEditing.js

@@ -1,3 +1,7 @@
+var JSONEditingErrorCode;
+( (function(JSONEditingErrorCode) {
+    JSONEditingErrorCode[JSONEditingErrorCode["ERROR_INVALID_FILE"] = 0] = "ERROR_INVALID_FILE";
+})(JSONEditingErrorCode || (JSONEditingErrorCode = {})));
 class JSONEditingError extends Error {
     constructor(message, code) {
         super(message);
@@ -5,4 +9,4 @@ class JSONEditingError extends Error {
     }
 }
 
-export { JSONEditingError };
+export { JSONEditingError, JSONEditingErrorCode };

package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js

@@ -9,8 +9,9 @@ import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { JSONEditingError } from './jsonEditing.js';
+import { JSONEditingErrorCode, JSONEditingError } from './jsonEditing.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 const _moduleId = "vs/workbench/services/configuration/common/jsonEditingService";
 let JSONEditingService = class JSONEditingService {
@@ -95,7 +96,7 @@ let JSONEditingService = class JSONEditingService {
         const model = reference.object.textEditorModel;
         if (this.hasParseErrors(model)) {
             reference.dispose();
-            return this.reject(0 );
+            return this.reject(JSONEditingErrorCode.ERROR_INVALID_FILE);
         }
         return reference;
     }
@@ -105,7 +106,7 @@ let JSONEditingService = class JSONEditingService {
     }
     toErrorMessage(error) {
         switch (error) {
-            case 0 : {
+            case JSONEditingErrorCode.ERROR_INVALID_FILE: {
                 return ( localizeWithPath(
                     _moduleId,
                     0,

package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js

@@ -12,6 +12,7 @@ import { isFalsyOrWhitespace } from 'vscode/vscode/vs/base/common/strings';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { hash } from 'vscode/vscode/vs/base/common/hash';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { distinct, asArray } from 'vscode/vscode/vs/base/common/arrays';

package/vscode/src/vs/workbench/services/path/browser/pathService.js

@@ -1,3 +1,4 @@
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { AbstractPathService } from '../common/pathService.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';

package/vscode/src/vs/workbench/services/path/common/pathService.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { isValidBasename } from 'vscode/vscode/vs/base/common/extpath';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { win32, posix } from 'vscode/vscode/vs/base/common/path';
-import { OS } from 'vscode/vscode/vs/base/common/platform';
+import { OS, OperatingSystem } from 'vscode/vscode/vs/base/common/platform';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { getVirtualWorkspaceScheme } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
@@ -35,7 +35,7 @@ let AbstractPathService = AbstractPathService_1 = class AbstractPathService {
     }
     doHasValidBasename(resource, os, name) {
         if (resource.scheme === Schemas.file || resource.scheme === Schemas.vscodeRemote) {
-            return isValidBasename(name ?? basename(resource), os === 1 );
+            return isValidBasename(name ?? basename(resource), os === OperatingSystem.Windows);
         }
         return true;
     }
@@ -68,7 +68,7 @@ let AbstractPathService = AbstractPathService_1 = class AbstractPathService {
     }
     get path() {
         return this.resolveOS.then(os => {
-            return os === 1  ?
+            return os === OperatingSystem.Windows ?
                 win32 :
                 posix;
         });
@@ -76,7 +76,7 @@ let AbstractPathService = AbstractPathService_1 = class AbstractPathService {
     async fileURI(_path) {
         let authority = '';
         const os = await this.resolveOS;
-        if (os === 1 ) {
+        if (os === OperatingSystem.Windows) {
             _path = _path.replace(/\\/g, '/');
         }
         if (_path[0] === '/' && _path[1] === '/') {

package/vscode/src/vs/workbench/services/url/browser/urlService.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { AbstractURLService } from '../../../../platform/url/common/urlService.js';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';

package/vscode/src/vs/workbench/services/userActivity/common/userActivityService.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { RunOnceScheduler, runWhenGlobalIdle } from 'vscode/vscode/vs/base/common/async';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { userActivityRegistry } from './userActivityRegistry.js';
 

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js

@@ -3,6 +3,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { raceCancellation } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { insert } from 'vscode/vscode/vs/base/common/arrays';
@@ -24,7 +25,7 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
         const cts = ( (new CancellationTokenSource(token)));
         return this.progressService.withProgress({
             title: ( localizeWithPath(_moduleId, 0, "Saving '{0}'", workingCopy.name)),
-            location: 15 ,
+            location: ProgressLocation.Notification,
             cancellable: true,
             delay: workingCopy.isDirty() ? 3000 : 5000
         }, async (progress) => {

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.js

@@ -1,9 +1,11 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { AsyncEmitter } from 'vscode/vscode/vs/base/common/event';
 import { Promises } from 'vscode/vscode/vs/base/common/async';
 import { insert } from 'vscode/vscode/vs/base/common/arrays';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
@@ -57,8 +59,8 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
             }
         }
         const files = ( operations.map(operation => ({ target: operation.resource })));
-        await this.runFileOperationParticipants(files, 0 , undoInfo, token);
-        const event = { correlationId: this.correlationIds++, operation: 0 , files };
+        await this.runFileOperationParticipants(files, FileOperation.CREATE, undoInfo, token);
+        const event = { correlationId: this.correlationIds++, operation: FileOperation.CREATE, files };
         await this._onWillRunWorkingCopyFileOperation.fireAsync(event, CancellationToken.None );
         let stats;
         try {
@@ -93,8 +95,8 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
             }
         }
         const files = ( operations.map(o => o.file));
-        await this.runFileOperationParticipants(files, move ? 2  : 3 , undoInfo, token);
-        const event = { correlationId: this.correlationIds++, operation: move ? 2  : 3 , files };
+        await this.runFileOperationParticipants(files, move ? FileOperation.MOVE : FileOperation.COPY, undoInfo, token);
+        const event = { correlationId: this.correlationIds++, operation: move ? FileOperation.MOVE : FileOperation.COPY, files };
         await this._onWillRunWorkingCopyFileOperation.fireAsync(event, CancellationToken.None );
         try {
             for (const { file: { source, target }, overwrite } of operations) {
@@ -125,8 +127,8 @@ let WorkingCopyFileService = class WorkingCopyFileService extends Disposable {
             }
         }
         const files = ( operations.map(operation => ({ target: operation.resource })));
-        await this.runFileOperationParticipants(files, 1 , undoInfo, token);
-        const event = { correlationId: this.correlationIds++, operation: 1 , files };
+        await this.runFileOperationParticipants(files, FileOperation.DELETE, undoInfo, token);
+        const event = { correlationId: this.correlationIds++, operation: FileOperation.DELETE, files };
         await this._onWillRunWorkingCopyFileOperation.fireAsync(event, CancellationToken.None );
         for (const operation of operations) {
             const dirtyWorkingCopies = this.getDirty(operation.resource);

package/vscode/src/vs/workbench/services/workspaces/common/canonicalUriService.js

@@ -1,3 +1,4 @@
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
 class CanonicalUriService {

package/vscode/src/vs/workbench/services/views/common/treeViewsService.js

@@ -1,21 +0,0 @@
-class TreeviewsService {
-    constructor() {
-        this._renderedElements = ( new Map());
-    }
-    getRenderedTreeElement(node) {
-        if (( this._renderedElements.has(node))) {
-            return this._renderedElements.get(node);
-        }
-        return undefined;
-    }
-    addRenderedTreeItemElement(node, element) {
-        this._renderedElements.set(node, element);
-    }
-    removeRenderedTreeItemElement(node) {
-        if (( this._renderedElements.has(node))) {
-            this._renderedElements.delete(node);
-        }
-    }
-}
-
-export { TreeviewsService };