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

package/index.d.ts

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

package/index.js

@@ -1 +1,65 @@
-export { default } from './base.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { IRequestService } from 'vscode/vscode/vs/platform/request/common/request.service';
+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 { 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 { 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';
+import { IDownloadService } from 'vscode/vscode/vs/platform/download/common/download.service';
+import { DownloadService } from './vscode/src/vs/platform/download/common/downloadService.js';
+import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
+import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { guessLocalUserHome } from './vscode/src/vs/workbench/services/path/browser/pathService.js';
+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 '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
+import { LabelService } from './vscode/src/vs/workbench/services/label/common/labelService.js';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { IEditorWorkerService } from 'vscode/vscode/vs/editor/common/services/editorWorker';
+import { WorkbenchEditorWorkerService } from './vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.js';
+import { getEnvironmentOverride } from 'vscode/workbench';
+
+let BrowserPathServiceOverride = class BrowserPathServiceOverride extends AbstractPathService {
+    constructor(remoteAgentService, environmentService, contextService) {
+        super(getEnvironmentOverride().userHome ?? guessLocalUserHome(environmentService, contextService), remoteAgentService, environmentService, contextService);
+    }
+};
+BrowserPathServiceOverride = __decorate([
+    __param(0, IRemoteAgentService),
+    __param(1, IWorkbenchEnvironmentService),
+    __param(2, IWorkspaceContextService)
+], BrowserPathServiceOverride);
+function getServiceOverride() {
+    return {
+        [IRequestService.toString()]: new SyncDescriptor(BrowserRequestService, [], true),
+        [IDownloadService.toString()]: new SyncDescriptor(DownloadService, [], true),
+        [IDecorationsService.toString()]: new SyncDescriptor(DecorationsService, [], true),
+        [IJSONEditingService.toString()]: new SyncDescriptor(JSONEditingService, [], true),
+        [ITreeViewsDnDService.toString()]: new SyncDescriptor(TreeViewsDnDService, [], 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),
+        [ITrustedDomainService.toString()]: new SyncDescriptor(TrustedDomainService, [], true),
+        [ILabelService.toString()]: new SyncDescriptor(LabelService, [], true),
+        [IEditorWorkerService.toString()]: new SyncDescriptor(WorkbenchEditorWorkerService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "11.1.2",
+  "version": "12.0.0",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - base service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,28 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - base service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common": "12.0.0",
+    "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "12.0.0",
+    "@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-common": "12.0.0",
+    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "12.0.0",
+    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "12.0.0",
+    "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common": "12.0.0",
+    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "12.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
+  },
+  "peerDependencies": {
+    "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common": "12.0.0",
+    "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common": "12.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common": {
+      "optional": true
+    },
+    "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common": {
+      "optional": true
+    }
+  },
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +44,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/base/parts/request/common/requestImpl.d.ts

@@ -0,0 +1,3 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common/vscode/vs/base/parts/request/common/request";
+export declare function request(options: IRequestOptions, token: CancellationToken, isOnline?: () => boolean): Promise<IRequestContext>;

package/vscode/src/vs/base/parts/request/{browser/request.js → common/requestImpl.js}

@@ -1,8 +1,9 @@
+
 import { bufferToStream, VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { canceled } from 'vscode/vscode/vs/base/common/errors';
-import { OfflineError } from 'vscode/vscode/vs/base/parts/request/common/request';
+import { OfflineError } from '@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common/vscode/vs/base/parts/request/common/request';
 
-async function request(options, token) {
+async function request(options, token, isOnline) {
     if (token.isCancellationRequested) {
         throw canceled();
     }
@@ -13,12 +14,16 @@ async function request(options, token) {
         AbortSignal.timeout(options.timeout),
     ]) : cancellation.signal;
     try {
-        const res = await fetch(options.url || '', {
+        const fetchInit = {
             method: options.type || 'GET',
             headers: getRequestHeaders(options),
             body: options.data,
-            signal,
-        });
+            signal
+        };
+        if (options.disableCache) {
+            fetchInit.cache = 'no-store';
+        }
+        const res = await fetch(options.url || '', fetchInit);
         return {
             res: {
                 statusCode: res.status,
@@ -28,7 +33,7 @@ async function request(options, token) {
         };
     }
     catch (err) {
-        if (!navigator.onLine) {
+        if (!isOnline()) {
             throw ( new OfflineError());
         }
         if (err?.name === 'AbortError') {

package/vscode/src/vs/platform/download/common/downloadService.d.ts

@@ -0,0 +1,12 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IDownloadService } from "vscode/vscode/vs/platform/download/common/download.service";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { IRequestService } from "vscode/vscode/vs/platform/request/common/request.service";
+export declare class DownloadService implements IDownloadService {
+    private readonly requestService;
+    private readonly fileService;
+    readonly _serviceBrand: undefined;
+    constructor(requestService: IRequestService, fileService: IFileService);
+    download(resource: URI, target: URI, cancellationToken?: CancellationToken): Promise<void>;
+}

package/vscode/src/vs/platform/download/common/downloadService.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';

package/vscode/src/vs/platform/request/common/requestIpc.d.ts

@@ -0,0 +1,22 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IChannel, IServerChannel } from "vscode/vscode/vs/base/parts/ipc/common/ipc";
+import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common/vscode/vs/base/parts/request/common/request";
+import { AuthInfo, Credentials } from "vscode/vscode/vs/platform/request/common/request";
+import { IRequestService } from "vscode/vscode/vs/platform/request/common/request.service";
+export declare class RequestChannel implements IServerChannel {
+    private readonly service;
+    constructor(service: IRequestService);
+    listen(context: any, event: string): Event<any>;
+    call(context: any, command: string, args?: any, token?: CancellationToken): Promise<any>;
+}
+export declare class RequestChannelClient implements IRequestService {
+    private readonly channel;
+    readonly _serviceBrand: undefined;
+    constructor(channel: IChannel);
+    request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;
+    resolveProxy(url: string): Promise<string | undefined>;
+    lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;
+    lookupKerberosAuthorization(url: string): Promise<string | undefined>;
+    loadCertificates(): Promise<string[]>;
+}

package/vscode/src/vs/platform/request/common/requestIpc.js

@@ -1,3 +1,4 @@
+
 import { bufferToStream } from 'vscode/vscode/vs/base/common/buffer';
 import 'vscode/vscode/vs/base/common/cancellation';
 

package/vscode/src/vs/platform/url/common/urlService.d.ts

@@ -0,0 +1,17 @@
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI, UriComponents } from "vscode/vscode/vs/base/common/uri";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+import { IOpenURLOptions, IURLHandler } from "vscode/vscode/vs/platform/url/common/url";
+import { IURLService } from "vscode/vscode/vs/platform/url/common/url.service";
+export declare abstract class AbstractURLService extends Disposable implements IURLService {
+    readonly _serviceBrand: undefined;
+    private handlers;
+    abstract create(options?: Partial<UriComponents>): URI;
+    open(uri: URI, options?: IOpenURLOptions): Promise<boolean>;
+    registerHandler(handler: IURLHandler): IDisposable;
+}
+export declare class NativeURLService extends AbstractURLService {
+    protected readonly productService: IProductService;
+    constructor(productService: IProductService);
+    create(options?: Partial<UriComponents>): URI;
+}

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

@@ -1,5 +1,8 @@
+
 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/contrib/codeEditor/browser/workbenchEditorWorkerService.d.ts

@@ -0,0 +1,9 @@
+import { EditorWorkerService } from "vscode/vscode/vs/editor/browser/services/editorWorkerService";
+import { ILanguageConfigurationService } from "vscode/vscode/vs/editor/common/languages/languageConfigurationRegistry";
+import { ILanguageFeaturesService } from "vscode/vscode/vs/editor/common/services/languageFeatures";
+import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
+import { ITextResourceConfigurationService } from "vscode/vscode/vs/editor/common/services/textResourceConfiguration";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+export declare class WorkbenchEditorWorkerService extends EditorWorkerService {
+    constructor(modelService: IModelService, configurationService: ITextResourceConfigurationService, logService: ILogService, languageConfigurationService: ILanguageConfigurationService, languageFeaturesService: ILanguageFeaturesService);
+}

package/vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { WorkerDescriptor } from 'vscode/vscode/vs/base/browser/defaultWorkerFactory';
 import { EditorWorkerService } from 'vscode/vscode/vs/editor/browser/services/editorWorkerService';
 import { ILanguageConfigurationService } from 'vscode/vscode/vs/editor/common/languages/languageConfigurationRegistry';

package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.d.ts

@@ -0,0 +1,24 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+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 { IJSONValue } from "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common/vscode/vs/workbench/services/configuration/common/jsonEditing";
+import { IJSONEditingService } from "vscode/vscode/vs/workbench/services/configuration/common/jsonEditing.service";
+export declare class JSONEditingService implements IJSONEditingService {
+    private readonly fileService;
+    private readonly textModelResolverService;
+    private readonly textFileService;
+    _serviceBrand: undefined;
+    private queue;
+    constructor(fileService: IFileService, textModelResolverService: ITextModelService, textFileService: ITextFileService);
+    write(resource: URI, values: IJSONValue[]): Promise<void>;
+    private doWriteConfiguration;
+    private writeToBuffer;
+    private applyEditsToBuffer;
+    private getEdits;
+    private resolveModelReference;
+    private hasParseErrors;
+    private resolveAndValidate;
+    private reject;
+    private toErrorMessage;
+}

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

@@ -1,7 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } from 'vscode/vscode/vs/nls';
 import { parse } from 'vscode/vscode/vs/base/common/json';
-import { setProperty } from 'vscode/vscode/vs/base/common/jsonEdit';
+import { setProperty } from '@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/base/common/jsonEdit';
 import { Queue } from 'vscode/vscode/vs/base/common/async';
 import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
@@ -9,15 +10,16 @@ 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 '@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common/vscode/vs/workbench/services/configuration/common/jsonEditing';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 let JSONEditingService = class JSONEditingService {
     constructor(fileService, textModelResolverService, textFileService) {
         this.fileService = fileService;
         this.textModelResolverService = textModelResolverService;
         this.textFileService = textFileService;
-        this.queue = ( (new Queue()));
+        this.queue = ( new Queue());
     }
     write(resource, values) {
         return Promise.resolve(this.queue.queue(() => this.doWriteConfiguration(resource, values)));
@@ -44,21 +46,21 @@ let JSONEditingService = class JSONEditingService {
     applyEditsToBuffer(edit, model) {
         const startPosition = model.getPositionAt(edit.offset);
         const endPosition = model.getPositionAt(edit.offset + edit.length);
-        const range = ( (new Range(
+        const range = ( new Range(
             startPosition.lineNumber,
             startPosition.column,
             endPosition.lineNumber,
             endPosition.column
-        )));
+        ));
         const currentText = model.getValueInRange(range);
         if (edit.content !== currentText) {
             const editOperation = currentText ? EditOperation.replace(range, edit.content) : EditOperation.insert(startPosition, edit.content);
-            model.pushEditOperations([( (new Selection(
+            model.pushEditOperations([( new Selection(
                 startPosition.lineNumber,
                 startPosition.column,
                 startPosition.lineNumber,
                 startPosition.column
-            )))], [editOperation], () => []);
+            ))], [editOperation], () => []);
             return true;
         }
         return false;
@@ -94,29 +96,29 @@ 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;
     }
     reject(code) {
         const message = this.toErrorMessage(code);
-        return Promise.reject(( (new JSONEditingError(message, code))));
+        return Promise.reject(( new JSONEditingError(message, code)));
     }
     toErrorMessage(error) {
         switch (error) {
-            case 0 : {
-                return ( localize(
-                    1396,
+            case JSONEditingErrorCode.ERROR_INVALID_FILE: {
+                return localize(
+                    11304,
                     "Unable to write into the file. Please open the file to correct errors/warnings in the file and try again."
-                ));
+                );
             }
         }
     }
 };
-JSONEditingService = ( (__decorate([
-    ( (__param(0, IFileService))),
-    ( (__param(1, ITextModelService))),
-    ( (__param(2, ITextFileService)))
-], JSONEditingService)));
+JSONEditingService = ( __decorate([
+    ( __param(0, IFileService)),
+    ( __param(1, ITextModelService)),
+    ( __param(2, ITextFileService))
+], JSONEditingService));
 
 export { JSONEditingService };

package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.d.ts

@@ -0,0 +1,24 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IDecoration, IResourceDecorationChangeEvent, IDecorationsProvider } from "vscode/vscode/vs/workbench/services/decorations/common/decorations";
+import { IDecorationsService } from "vscode/vscode/vs/workbench/services/decorations/common/decorations.service";
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+export declare class DecorationsService implements IDecorationsService {
+    _serviceBrand: undefined;
+    private readonly _store;
+    private readonly _onDidChangeDecorationsDelayed;
+    private readonly _onDidChangeDecorations;
+    onDidChangeDecorations: Event<IResourceDecorationChangeEvent>;
+    private readonly _provider;
+    private readonly _decorationStyles;
+    private readonly _data;
+    constructor(uriIdentityService: IUriIdentityService, themeService: IThemeService);
+    dispose(): void;
+    registerDecorationsProvider(provider: IDecorationsProvider): IDisposable;
+    private _ensureEntry;
+    getDecoration(uri: URI, includeChildren: boolean): IDecoration | undefined;
+    private _fetchData;
+    private _keepItem;
+}

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

@@ -1,18 +1,20 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { DebounceEmitter, Emitter } from 'vscode/vscode/vs/base/common/event';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { TernarySearchTree } from 'vscode/vscode/vs/base/common/ternarySearchTree';
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isThenable } from 'vscode/vscode/vs/base/common/async';
 import { LinkedList } from 'vscode/vscode/vs/base/common/linkedList';
-import { createCSSRule, removeCSSRulesContainingSelector, createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
-import { asCSSPropertyValue } from 'vscode/vscode/vs/base/browser/cssValue';
+import { createCSSRule, removeCSSRulesContainingSelector, createStyleSheet } from 'vscode/vscode/vs/base/browser/domStylesheets';
+import { stringValue } from 'vscode/vscode/vs/base/browser/cssValue';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { isFalsyOrWhitespace } from 'vscode/vscode/vs/base/common/strings';
 import { localize } 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';
@@ -32,7 +34,7 @@ import { getIconRegistry } from 'vscode/vscode/vs/platform/theme/common/iconRegi
 class DecorationRule {
     static keyOf(data) {
         if (Array.isArray(data)) {
-            return ( (data.map(DecorationRule.keyOf))).join(',');
+            return ( data.map(DecorationRule.keyOf)).join(',');
         }
         else {
             const { color, letter } = data;
@@ -49,7 +51,7 @@ class DecorationRule {
         this.themeService = themeService;
         this._refCounter = 0;
         this.data = data;
-        const suffix = ( (hash(key).toString(36)));
+        const suffix = ( hash(key).toString(36));
         this.itemColorClassName = `${DecorationRule._classNamesPrefix}-itemColor-${suffix}`;
         this.itemBadgeClassName = `${DecorationRule._classNamesPrefix}-itemBadge-${suffix}`;
         this.bubbleBadgeClassName = `${DecorationRule._classNamesPrefix}-bubbleBadge-${suffix}`;
@@ -118,7 +120,7 @@ class DecorationRule {
         }
         createCSSRule(`.${this.iconBadgeClassName}::after`, `content: '${definition.fontCharacter}';
 			color: ${icon.color ? getColor(icon.color.id) : getColor(color)};
-			font-family: ${asCSSPropertyValue(definition.font?.id ?? 'codicon')};
+			font-family: ${stringValue(definition.font?.id ?? 'codicon')};
 			font-size: 16px;
 			margin-right: 14px;
 			font-weight: normal;
@@ -135,9 +137,9 @@ class DecorationRule {
 class DecorationStyles {
     constructor(_themeService) {
         this._themeService = _themeService;
-        this._dispoables = ( (new DisposableStore()));
+        this._dispoables = ( new DisposableStore());
         this._styleElement = createStyleSheet(undefined, undefined, this._dispoables);
-        this._decorationRules = ( (new Map()));
+        this._decorationRules = ( new Map());
     }
     dispose() {
         this._dispoables.dispose();
@@ -147,7 +149,7 @@ class DecorationStyles {
         const key = DecorationRule.keyOf(data);
         let rule = this._decorationRules.get(key);
         if (!rule) {
-            rule = ( (new DecorationRule(this._themeService, data, key)));
+            rule = ( new DecorationRule(this._themeService, data, key));
             this._decorationRules.set(key, rule);
             rule.appendCSSRules(this._styleElement);
         }
@@ -155,11 +157,11 @@ class DecorationStyles {
         const labelClassName = rule.itemColorClassName;
         let badgeClassName = rule.itemBadgeClassName;
         const iconClassName = rule.iconBadgeClassName;
-        let tooltip = distinct(( (data.filter(d => !isFalsyOrWhitespace(d.tooltip)).map(d => d.tooltip)))).join(' • ');
-        const strikethrough = ( (data.some(d => d.strikethrough)));
+        let tooltip = distinct(( data.filter(d => !isFalsyOrWhitespace(d.tooltip)).map(d => d.tooltip))).join(' • ');
+        const strikethrough = ( data.some(d => d.strikethrough));
         if (onlyChildren) {
             badgeClassName = rule.bubbleBadgeClassName;
-            tooltip = ( localize(1397, "Contains emphasized items"));
+            tooltip = ( localize(11342, "Contains emphasized items"));
         }
         return {
             labelClassName,
@@ -197,14 +199,14 @@ function getColor(color) {
 }
 let DecorationsService = class DecorationsService {
     constructor(uriIdentityService, themeService) {
-        this._store = ( (new DisposableStore()));
-        this._onDidChangeDecorationsDelayed = this._store.add(( (new DebounceEmitter({ merge: all => all.flat() }))));
-        this._onDidChangeDecorations = this._store.add(( (new Emitter())));
+        this._store = ( new DisposableStore());
+        this._onDidChangeDecorationsDelayed = this._store.add(( new DebounceEmitter({ merge: all => all.flat() })));
+        this._onDidChangeDecorations = this._store.add(( new Emitter()));
         this.onDidChangeDecorations = this._onDidChangeDecorations.event;
-        this._provider = ( (new LinkedList()));
-        this._decorationStyles = ( (new DecorationStyles(themeService)));
+        this._provider = ( new LinkedList());
+        this._decorationStyles = ( new DecorationStyles(themeService));
         this._data = TernarySearchTree.forUris(key => uriIdentityService.extUri.ignorePathCasing(key));
-        this._store.add(this._onDidChangeDecorationsDelayed.event(event => { this._onDidChangeDecorations.fire(( (new FileDecorationChangeEvent(event)))); }));
+        this._store.add(this._onDidChangeDecorationsDelayed.event(event => { this._onDidChangeDecorations.fire(( new FileDecorationChangeEvent(event))); }));
     }
     dispose() {
         this._store.dispose();
@@ -246,7 +248,7 @@ let DecorationsService = class DecorationsService {
     _ensureEntry(uri) {
         let map = this._data.get(uri);
         if (!map) {
-            map = ( (new Map()));
+            map = ( new Map());
             this._data.set(uri, map);
         }
         return map;
@@ -268,7 +270,7 @@ let DecorationsService = class DecorationsService {
             const iter = this._data.findSuperstr(uri);
             if (iter) {
                 for (const tuple of iter) {
-                    for (const data of ( (tuple[1].values()))) {
+                    for (const data of ( tuple[1].values())) {
                         if (data && !(data instanceof DecorationDataRequest)) {
                             if (data.bubble) {
                                 all.push(data);
@@ -289,14 +291,14 @@ let DecorationsService = class DecorationsService {
             pendingRequest.source.cancel();
             map.delete(provider);
         }
-        const cts = ( (new CancellationTokenSource()));
+        const cts = ( new CancellationTokenSource());
         const dataOrThenable = provider.provideDecorations(uri, cts.token);
         if (!isThenable(dataOrThenable)) {
             cts.dispose();
             return this._keepItem(map, provider, uri, dataOrThenable);
         }
         else {
-            const request = ( (new DecorationDataRequest(cts, Promise.resolve(dataOrThenable).then(data => {
+            const request = ( new DecorationDataRequest(cts, Promise.resolve(dataOrThenable).then(data => {
                 if (map.get(provider) === request) {
                     this._keepItem(map, provider, uri, data);
                 }
@@ -306,7 +308,7 @@ let DecorationsService = class DecorationsService {
                 }
             }).finally(() => {
                 cts.dispose();
-            }))));
+            })));
             map.set(provider, request);
             return null;
         }
@@ -321,9 +323,9 @@ let DecorationsService = class DecorationsService {
         return deco;
     }
 };
-DecorationsService = ( (__decorate([
-    ( (__param(0, IUriIdentityService))),
-    ( (__param(1, IThemeService)))
-], DecorationsService)));
+DecorationsService = ( __decorate([
+    ( __param(0, IUriIdentityService)),
+    ( __param(1, IThemeService))
+], DecorationsService));
 
 export { DecorationsService };