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

package/vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js

@@ -1,3 +1,4 @@
+
 import { localize } from 'vscode/vscode/vs/nls';
 import { Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -5,45 +6,46 @@ import { HelpQuickAccessProvider } from '../../../../platform/quickinput/browser
 import { ViewQuickAccessProvider, OpenViewPickerAction, QuickAccessViewPickerAction } from './viewQuickAccess.js';
 import { CommandsQuickAccessProvider, ShowAllCommandsAction, ClearCommandHistoryAction } from './commandsQuickAccess.js';
 import { MenuRegistry, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { inQuickPickContext, getQuickNavigateHandler } from 'vscode/vscode/vs/workbench/browser/quickaccess';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { inQuickPickContext, getQuickNavigateHandler } from '@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/workbench/browser/quickaccess';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 
-const quickAccessRegistry = ( (Registry.as(Extensions.Quickaccess)));
+const quickAccessRegistry = ( Registry.as(Extensions.Quickaccess));
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: HelpQuickAccessProvider,
     prefix: HelpQuickAccessProvider.PREFIX,
     placeholder: ( localize(
-        1435,
+        8197,
         "Type '{0}' to get help on the actions you can take from here.",
         HelpQuickAccessProvider.PREFIX
     )),
     helpEntries: [{
-            description: ( localize(1436, "Show all Quick Access Providers")),
+            description: ( localize(8198, "Show all Quick Access Providers")),
             commandCenterOrder: 70,
-            commandCenterLabel: ( localize(1437, 'More'))
+            commandCenterLabel: ( localize(8199, 'More'))
         }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: ViewQuickAccessProvider,
     prefix: ViewQuickAccessProvider.PREFIX,
     contextKey: 'inViewsPicker',
-    placeholder: ( localize(1438, "Type the name of a view, output channel or terminal to open.")),
-    helpEntries: [{ description: ( localize(1439, "Open View")), commandId: OpenViewPickerAction.ID }]
+    placeholder: ( localize(8200, "Type the name of a view, output channel or terminal to open.")),
+    helpEntries: [{ description: ( localize(8201, "Open View")), commandId: OpenViewPickerAction.ID }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: CommandsQuickAccessProvider,
     prefix: CommandsQuickAccessProvider.PREFIX,
     contextKey: 'inCommandsPicker',
-    placeholder: ( localize(1440, "Type the name of a command to run.")),
-    helpEntries: [{ description: ( localize(1441, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
+    placeholder: ( localize(8202, "Type the name of a command to run.")),
+    helpEntries: [{ description: ( localize(8203, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(1442, "&&Command Palette..."))
+        title: ( localize(8204, "&&Command Palette..."))
     },
     order: 1
 });
@@ -51,7 +53,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
     group: '1_welcome',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(1443, "Show All Commands"))
+        title: ( localize(8205, "Show All Commands"))
     },
     order: 2
 });
@@ -59,7 +61,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: OpenViewPickerAction.ID,
-        title: ( localize(1444, "&&Open View..."))
+        title: ( localize(8206, "&&Open View..."))
     },
     order: 2
 });
@@ -67,7 +69,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '5_infile_nav',
     command: {
         id: 'workbench.action.gotoLine',
-        title: ( localize(1445, "Go to &&Line/Column..."))
+        title: ( localize(8207, "Go to &&Line/Column..."))
     },
     order: 1
 });
@@ -75,16 +77,16 @@ MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
     group: '1_command',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(1446, "Command Palette..."))
+        title: ( localize(8208, "Command Palette..."))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     group: 'z_commands',
-    when: ( (EditorContextKeys.editorSimpleInput.toNegated())),
+    when: ( EditorContextKeys.editorSimpleInput.toNegated()),
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(1446, "Command Palette...")),
+        title: ( localize(8208, "Command Palette...")),
     },
     order: 1
 });
@@ -93,15 +95,12 @@ registerAction2(ShowAllCommandsAction);
 registerAction2(OpenViewPickerAction);
 registerAction2(QuickAccessViewPickerAction);
 const inViewsPickerContextKey = 'inViewsPicker';
-const inViewsPickerContext = ( (ContextKeyExpr.and(
-    inQuickPickContext,
-     (ContextKeyExpr.has(inViewsPickerContextKey))
-)));
+const inViewsPickerContext = ( ContextKeyExpr.and(inQuickPickContext, ( ContextKeyExpr.has(inViewsPickerContextKey))));
 const viewPickerKeybinding = QuickAccessViewPickerAction.KEYBINDING;
 const quickAccessNavigateNextInViewPickerId = 'workbench.action.quickOpenNavigateNextInViewPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: quickAccessNavigateNextInViewPickerId,
-    weight: 200  + 50,
+    weight: KeybindingWeight.WorkbenchContrib + 50,
     handler: getQuickNavigateHandler(quickAccessNavigateNextInViewPickerId, true),
     when: inViewsPickerContext,
     primary: viewPickerKeybinding.primary,
@@ -111,12 +110,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickAccessNavigatePreviousInViewPickerId = 'workbench.action.quickOpenNavigatePreviousInViewPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: quickAccessNavigatePreviousInViewPickerId,
-    weight: 200  + 50,
+    weight: KeybindingWeight.WorkbenchContrib + 50,
     handler: getQuickNavigateHandler(quickAccessNavigatePreviousInViewPickerId, false),
     when: inViewsPickerContext,
-    primary: viewPickerKeybinding.primary | 1024 ,
+    primary: viewPickerKeybinding.primary | KeyMod.Shift,
     linux: viewPickerKeybinding.linux,
     mac: {
-        primary: viewPickerKeybinding.mac.primary | 1024
+        primary: viewPickerKeybinding.mac.primary | KeyMod.Shift
     }
 });

package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.d.ts

@@ -0,0 +1,50 @@
+import { IQuickPickSeparator } from "vscode/vscode/vs/platform/quickinput/common/quickInput";
+import { IPickerQuickAccessItem, PickerQuickAccessProvider } from "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { IViewsService } from "vscode/vscode/vs/workbench/services/views/common/viewsService.service";
+import { IOutputService } from "vscode/vscode/vs/workbench/services/output/common/output.service";
+import { ITerminalGroupService } from "vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { ITerminalService } from "vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { Action2 } from "vscode/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IPaneCompositePartService } from "vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+interface IViewQuickPickItem extends IPickerQuickAccessItem {
+    containerLabel: string;
+}
+export declare class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuickPickItem> {
+    private readonly viewDescriptorService;
+    private readonly viewsService;
+    private readonly outputService;
+    private readonly terminalService;
+    private readonly terminalGroupService;
+    private readonly debugService;
+    private readonly paneCompositeService;
+    private readonly contextKeyService;
+    static PREFIX: string;
+    constructor(viewDescriptorService: IViewDescriptorService, viewsService: IViewsService, outputService: IOutputService, terminalService: ITerminalService, terminalGroupService: ITerminalGroupService, debugService: IDebugService, paneCompositeService: IPaneCompositePartService, contextKeyService: IContextKeyService);
+    protected _getPicks(filter: string): Array<IViewQuickPickItem | IQuickPickSeparator>;
+    private doGetViewPickItems;
+    private includeViewContainer;
+}
+export declare class OpenViewPickerAction extends Action2 {
+    static readonly ID = "workbench.action.openView";
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}
+export declare class QuickAccessViewPickerAction extends Action2 {
+    static readonly ID = "workbench.action.quickOpenView";
+    static readonly KEYBINDING: {
+        primary: number;
+        mac: {
+            primary: number;
+        };
+        linux: {
+            primary: number;
+        };
+    };
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}
+export {};

package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js

@@ -1,8 +1,10 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { ItemActivation } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
-import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output.service';
@@ -12,6 +14,8 @@ import { matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
 import { fuzzyContains } from 'vscode/vscode/vs/base/common/strings';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { REPL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
@@ -24,7 +28,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
     constructor(viewDescriptorService, viewsService, outputService, terminalService, terminalGroupService, debugService, paneCompositeService, contextKeyService) {
         super(ViewQuickAccessProvider_1.PREFIX, {
             noResultsPick: {
-                label: ( localize(4975, "No matching views")),
+                label: ( localize(8209, "No matching views")),
                 containerLabel: ''
             }
         });
@@ -45,9 +49,9 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
             entry.highlights = { label: matchesFuzzy(filter, entry.label, true) ?? undefined };
             return entry.highlights.label || fuzzyContains(entry.containerLabel, filter);
         });
-        const mapEntryToContainer = ( (new Map()));
+        const mapEntryToContainer = ( new Map());
         for (const entry of filteredViewEntries) {
-            if (!( (mapEntryToContainer.has(entry.label)))) {
+            if (!( mapEntryToContainer.has(entry.label))) {
                 mapEntryToContainer.set(entry.label, entry.containerLabel);
             }
         }
@@ -57,7 +61,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
             if (lastContainer !== entry.containerLabel) {
                 lastContainer = entry.containerLabel;
                 let separatorLabel;
-                if (( (mapEntryToContainer.has(lastContainer)))) {
+                if (( mapEntryToContainer.has(lastContainer))) {
                     separatorLabel = `${mapEntryToContainer.get(lastContainer)} / ${lastContainer}`;
                 }
                 else {
@@ -112,9 +116,9 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
                 }
             }
         };
-        addPaneComposites(0 , ( localize(4976, "Side Bar")));
-        addPaneComposites(1 , ( localize(4977, "Panel")));
-        addPaneComposites(2 , ( localize(4978, "Secondary Side Bar")));
+        addPaneComposites(ViewContainerLocation.Sidebar, ( localize(8210, "Side Bar")));
+        addPaneComposites(ViewContainerLocation.Panel, ( localize(8211, "Panel")));
+        addPaneComposites(ViewContainerLocation.AuxiliaryBar, ( localize(8212, "Secondary Side Bar")));
         const addPaneCompositeViews = (location) => {
             const paneComposites = this.paneCompositeService.getPaneComposites(location);
             for (const paneComposite of paneComposites) {
@@ -124,15 +128,15 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
                 }
             }
         };
-        addPaneCompositeViews(0 );
-        addPaneCompositeViews(1 );
-        addPaneCompositeViews(2 );
+        addPaneCompositeViews(ViewContainerLocation.Sidebar);
+        addPaneCompositeViews(ViewContainerLocation.Panel);
+        addPaneCompositeViews(ViewContainerLocation.AuxiliaryBar);
         this.terminalGroupService.groups.forEach((group, groupIndex) => {
             group.terminalInstances.forEach((terminal, terminalIndex) => {
-                const label = ( localize(4979, "{0}: {1}", `${groupIndex + 1}.${terminalIndex + 1}`, terminal.title));
+                const label = ( localize(8213, "{0}: {1}", `${groupIndex + 1}.${terminalIndex + 1}`, terminal.title));
                 viewEntries.push({
                     label,
-                    containerLabel: ( localize(4980, "Terminal")),
+                    containerLabel: ( localize(8214, "Terminal")),
                     accept: async () => {
                         await this.terminalGroupService.showPanel(true);
                         this.terminalService.setActiveInstance(terminal);
@@ -144,7 +148,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
             const label = session.name;
             viewEntries.push({
                 label,
-                containerLabel: ( localize(4981, "Debug Console")),
+                containerLabel: ( localize(8215, "Debug Console")),
                 accept: async () => {
                     await this.debugService.focusStackFrame(undefined, undefined, session, { explicit: true });
                     if (!this.viewsService.isViewVisible(REPL_VIEW_ID)) {
@@ -157,7 +161,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         for (const channel of channels) {
             viewEntries.push({
                 label: channel.label,
-                containerLabel: ( localize(4982, "Output")),
+                containerLabel: ( localize(8216, "Output")),
                 accept: () => this.outputService.showChannel(channel.id)
             });
         }
@@ -171,22 +175,22 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         return true;
     }
 };
-ViewQuickAccessProvider = ViewQuickAccessProvider_1 = ( (__decorate([
-    ( (__param(0, IViewDescriptorService))),
-    ( (__param(1, IViewsService))),
-    ( (__param(2, IOutputService))),
-    ( (__param(3, ITerminalService))),
-    ( (__param(4, ITerminalGroupService))),
-    ( (__param(5, IDebugService))),
-    ( (__param(6, IPaneCompositePartService))),
-    ( (__param(7, IContextKeyService)))
-], ViewQuickAccessProvider)));
+ViewQuickAccessProvider = ViewQuickAccessProvider_1 = ( __decorate([
+    ( __param(0, IViewDescriptorService)),
+    ( __param(1, IViewsService)),
+    ( __param(2, IOutputService)),
+    ( __param(3, ITerminalService)),
+    ( __param(4, ITerminalGroupService)),
+    ( __param(5, IDebugService)),
+    ( __param(6, IPaneCompositePartService)),
+    ( __param(7, IContextKeyService))
+], ViewQuickAccessProvider));
 class OpenViewPickerAction extends Action2 {
     static { this.ID = 'workbench.action.openView'; }
     constructor() {
         super({
             id: OpenViewPickerAction.ID,
-            title: ( localize2(4983, 'Open View')),
+            title: ( localize2(8217, 'Open View')),
             category: Categories.View,
             f1: true
         });
@@ -198,18 +202,18 @@ class OpenViewPickerAction extends Action2 {
 class QuickAccessViewPickerAction extends Action2 {
     static { this.ID = 'workbench.action.quickOpenView'; }
     static { this.KEYBINDING = {
-        primary: 2048  | 47 ,
-        mac: { primary: 256  | 47  },
+        primary: KeyMod.CtrlCmd | KeyCode.KeyQ,
+        mac: { primary: KeyMod.WinCtrl | KeyCode.KeyQ },
         linux: { primary: 0 }
     }; }
     constructor() {
         super({
             id: QuickAccessViewPickerAction.ID,
-            title: ( localize2(4984, 'Quick Open View')),
+            title: ( localize2(8218, 'Quick Open View')),
             category: Categories.View,
             f1: false,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: undefined,
                 ...QuickAccessViewPickerAction.KEYBINDING
             }

package/vscode/src/vs/workbench/contrib/url/browser/externalUriResolver.d.ts

@@ -0,0 +1,8 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IOpenerService } from "vscode/vscode/vs/platform/opener/common/opener.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IBrowserWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/browser/environmentService.service";
+export declare class ExternalUriResolverContribution extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "workbench.contrib.externalUriResolver";
+    constructor(_openerService: IOpenerService, _workbenchEnvironmentService: IBrowserWorkbenchEnvironmentService);
+}

package/vscode/src/vs/workbench/contrib/url/browser/externalUriResolver.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 { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.d.ts

@@ -0,0 +1,29 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileType, IFileWriteOptions, IStat, IWatchOptions, IFileSystemProviderWithFileReadWriteCapability } from "vscode/vscode/vs/platform/files/common/files";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+export declare class TrustedDomainsFileSystemProvider implements IFileSystemProviderWithFileReadWriteCapability, IWorkbenchContribution {
+    private readonly fileService;
+    private readonly storageService;
+    private readonly instantiationService;
+    static readonly ID = "workbench.contrib.trustedDomainsFileSystemProvider";
+    readonly capabilities = FileSystemProviderCapabilities.FileReadWrite;
+    readonly onDidChangeCapabilities: Event<any>;
+    readonly onDidChangeFile: Event<any>;
+    constructor(fileService: IFileService, storageService: IStorageService, instantiationService: IInstantiationService);
+    stat(resource: URI): Promise<IStat>;
+    readFile(resource: URI): Promise<Uint8Array>;
+    writeFile(resource: URI, content: Uint8Array, opts: IFileWriteOptions): Promise<void>;
+    watch(resource: URI, opts: IWatchOptions): IDisposable;
+    mkdir(resource: URI): Promise<void>;
+    readdir(resource: URI): Promise<[
+        string,
+        FileType
+    ][]>;
+    delete(resource: URI, opts: IFileDeleteOptions): Promise<void>;
+    rename(from: URI, to: URI, opts: IFileOverwriteOptions): Promise<void>;
+}

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.js

@@ -1,11 +1,13 @@
-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 { parse } from 'vscode/vscode/vs/base/common/json';
-import { FileType } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileType, FileSystemProviderCapabilities } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
-import { TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, readTrustedDomains, TRUSTED_DOMAINS_STORAGE_KEY } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomains';
+import { TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, readTrustedDomains, TRUSTED_DOMAINS_STORAGE_KEY } from '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomains';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
@@ -65,7 +67,7 @@ let TrustedDomainsFileSystemProvider = class TrustedDomainsFileSystemProvider {
         this.fileService = fileService;
         this.storageService = storageService;
         this.instantiationService = instantiationService;
-        this.capabilities = 2 ;
+        this.capabilities = FileSystemProviderCapabilities.FileReadWrite;
         this.onDidChangeCapabilities = Event.None;
         this.onDidChangeFile = Event.None;
         this.fileService.registerProvider(TRUSTED_DOMAINS_SCHEMA, this);
@@ -74,7 +76,7 @@ let TrustedDomainsFileSystemProvider = class TrustedDomainsFileSystemProvider {
         return Promise.resolve(TRUSTED_DOMAINS_STAT);
     }
     async readFile(resource) {
-        let trustedDomainsContent = this.storageService.get(TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, -1 );
+        let trustedDomainsContent = this.storageService.get(TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, StorageScope.APPLICATION);
         const configuring = resource.fragment;
         const { defaultTrustedDomains, trustedDomains } = await this.instantiationService.invokeFunction(readTrustedDomains);
         if (!trustedDomainsContent ||
@@ -91,8 +93,8 @@ let TrustedDomainsFileSystemProvider = class TrustedDomainsFileSystemProvider {
         try {
             const trustedDomainsContent = ( VSBuffer.wrap(content).toString());
             const trustedDomains = parse(trustedDomainsContent);
-            this.storageService.store(TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, trustedDomainsContent, -1 , 0 );
-            this.storageService.store(TRUSTED_DOMAINS_STORAGE_KEY, JSON.stringify(trustedDomains) || '', -1 , 0 );
+            this.storageService.store(TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, trustedDomainsContent, StorageScope.APPLICATION, StorageTarget.USER);
+            this.storageService.store(TRUSTED_DOMAINS_STORAGE_KEY, JSON.stringify(trustedDomains) || '', StorageScope.APPLICATION, StorageTarget.USER);
         }
         catch (err) { }
         return Promise.resolve();

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.d.ts

@@ -0,0 +1,31 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IClipboardService } from "vscode/vscode/vs/platform/clipboard/common/clipboardService.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IDialogService } from "vscode/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { OpenOptions } from "vscode/vscode/vs/platform/opener/common/opener";
+import { IOpenerService } from "vscode/vscode/vs/platform/opener/common/opener.service";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+import { IQuickInputService } from "vscode/vscode/vs/platform/quickinput/common/quickInput.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IWorkspaceTrustManagementService } from "vscode/vscode/vs/platform/workspace/common/workspaceTrust.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { ITrustedDomainService } from "vscode/vscode/vs/workbench/contrib/url/browser/trustedDomainService.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class OpenerValidatorContributions implements IWorkbenchContribution {
+    private readonly _openerService;
+    private readonly _storageService;
+    private readonly _dialogService;
+    private readonly _productService;
+    private readonly _quickInputService;
+    private readonly _editorService;
+    private readonly _clipboardService;
+    private readonly _telemetryService;
+    private readonly _instantiationService;
+    private readonly _configurationService;
+    private readonly _workspaceTrustService;
+    private readonly _trustedDomainService;
+    constructor(_openerService: IOpenerService, _storageService: IStorageService, _dialogService: IDialogService, _productService: IProductService, _quickInputService: IQuickInputService, _editorService: IEditorService, _clipboardService: IClipboardService, _telemetryService: ITelemetryService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _workspaceTrustService: IWorkspaceTrustManagementService, _trustedDomainService: ITrustedDomainService);
+    validateLink(resource: URI | string, openOptions?: OpenOptions): Promise<boolean>;
+}

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.js

@@ -1,6 +1,7 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { matchesScheme, Schemas } from 'vscode/vscode/vs/base/common/network';
-import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
@@ -13,9 +14,9 @@ import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { isURLDomainTrusted } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
+import { isURLDomainTrusted } from '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
 import { ITrustedDomainService } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomainService.service';
-import { readStaticTrustedDomains, configureOpenerTrustedDomainsHandler } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomains';
+import { readStaticTrustedDomains, configureOpenerTrustedDomainsHandler } from '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomains';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 let OpenerValidatorContributions = class OpenerValidatorContributions {
@@ -44,7 +45,7 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
         const originalResource = resource;
         let resourceUri;
         if (typeof resource === 'string') {
-            resourceUri = ( (URI.parse(resource)));
+            resourceUri = ( URI.parse(resource));
         }
         else {
             resourceUri = resource;
@@ -65,27 +66,27 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
                 formattedLink += linkTail.charAt(0) + '...' + linkTail.substring(linkTail.length - linkTailLengthToKeep + 1);
             }
             const { result } = await this._dialogService.prompt({
-                type: Severity$1.Info,
+                type: Severity.Info,
                 message: ( localize(
-                    4985,
+                    10470,
                     'Do you want {0} to open the external website?',
                     this._productService.nameShort
                 )),
                 detail: typeof originalResource === 'string' ? originalResource : formattedLink,
                 buttons: [
                     {
-                        label: ( localize(4986, '&&Open')),
+                        label: ( localize(10471, '&&Open')),
                         run: () => true
                     },
                     {
-                        label: ( localize(4987, '&&Copy')),
+                        label: ( localize(10472, '&&Copy')),
                         run: () => {
-                            this._clipboardService.writeText(typeof originalResource === 'string' ? originalResource : ( (resourceUri.toString(true))));
+                            this._clipboardService.writeText(typeof originalResource === 'string' ? originalResource : ( resourceUri.toString(true)));
                             return false;
                         }
                     },
                     {
-                        label: ( localize(4988, 'Configure &&Trusted Domains')),
+                        label: ( localize(10473, 'Configure &&Trusted Domains')),
                         run: async () => {
                             const { trustedDomains, } = this._instantiationService.invokeFunction(readStaticTrustedDomains);
                             const domainToOpen = `${scheme}://${authority}`;
@@ -108,19 +109,19 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
         }
     }
 };
-OpenerValidatorContributions = ( (__decorate([
-    ( (__param(0, IOpenerService))),
-    ( (__param(1, IStorageService))),
-    ( (__param(2, IDialogService))),
-    ( (__param(3, IProductService))),
-    ( (__param(4, IQuickInputService))),
-    ( (__param(5, IEditorService))),
-    ( (__param(6, IClipboardService))),
-    ( (__param(7, ITelemetryService))),
-    ( (__param(8, IInstantiationService))),
-    ( (__param(9, IConfigurationService))),
-    ( (__param(10, IWorkspaceTrustManagementService))),
-    ( (__param(11, ITrustedDomainService)))
-], OpenerValidatorContributions)));
+OpenerValidatorContributions = ( __decorate([
+    ( __param(0, IOpenerService)),
+    ( __param(1, IStorageService)),
+    ( __param(2, IDialogService)),
+    ( __param(3, IProductService)),
+    ( __param(4, IQuickInputService)),
+    ( __param(5, IEditorService)),
+    ( __param(6, IClipboardService)),
+    ( __param(7, ITelemetryService)),
+    ( __param(8, IInstantiationService)),
+    ( __param(9, IConfigurationService)),
+    ( __param(10, IWorkspaceTrustManagementService)),
+    ( __param(11, ITrustedDomainService))
+], OpenerValidatorContributions));
 
 export { OpenerValidatorContributions };

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

@@ -0,0 +1 @@
+export {};