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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-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/quickaccess.js

@@ -46,6 +46,7 @@ let DelegateQuickInputService = class DelegateQuickInputService {
         this.standaloneQuickInputService ?? (this.standaloneQuickInputService = this.instantiationService.createInstance(StandaloneQuickInputService));
         return this.standaloneQuickInputService;
     }
+    get currentQuickInput() { return this.activeService.currentQuickInput; }
     get quickAccess() { return this.activeService.quickAccess; }
     get backButton() { return this.activeService.backButton; }
     get onShow() { return this.activeService.onShow; }

package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.js

@@ -14,7 +14,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { WillSaveStateReason } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { WillSaveStateReason, StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 
@@ -257,7 +257,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         }
     }
     load() {
-        const raw = this.storageService.get(CommandsHistory_1.PREF_KEY_CACHE, 0 );
+        const raw = this.storageService.get(CommandsHistory_1.PREF_KEY_CACHE, StorageScope.PROFILE);
         let serializedCache;
         if (raw) {
             try {
@@ -278,7 +278,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
             }
             entries.forEach(entry => cache.set(entry.key, entry.value));
         }
-        CommandsHistory_1.counter = this.storageService.getNumber(CommandsHistory_1.PREF_KEY_COUNTER, 0 , CommandsHistory_1.counter);
+        CommandsHistory_1.counter = this.storageService.getNumber(CommandsHistory_1.PREF_KEY_COUNTER, StorageScope.PROFILE, CommandsHistory_1.counter);
     }
     push(commandId) {
         if (!CommandsHistory_1.cache) {
@@ -299,8 +299,8 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         }
         const serializedCache = { usesLRU: true, entries: [] };
         CommandsHistory_1.cache.forEach((value, key) => serializedCache.entries.push({ key, value }));
-        this.storageService.store(CommandsHistory_1.PREF_KEY_CACHE, JSON.stringify(serializedCache), 0 , 0 );
-        this.storageService.store(CommandsHistory_1.PREF_KEY_COUNTER, CommandsHistory_1.counter, 0 , 0 );
+        this.storageService.store(CommandsHistory_1.PREF_KEY_CACHE, JSON.stringify(serializedCache), StorageScope.PROFILE, StorageTarget.USER);
+        this.storageService.store(CommandsHistory_1.PREF_KEY_COUNTER, CommandsHistory_1.counter, StorageScope.PROFILE, StorageTarget.USER);
         CommandsHistory_1.hasChanges = false;
     }
     static getConfiguredCommandHistoryLength(configurationService) {

package/vscode/src/vs/workbench/browser/actions/quickAccessActions.js

@@ -1,6 +1,7 @@
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ItemActivation } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
@@ -10,15 +11,15 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 
 const _moduleId = "vs/workbench/browser/actions/quickAccessActions";
 const globalQuickAccessKeybinding = {
-    primary: 2048  | 46 ,
-    secondary: [2048  | 35 ],
-    mac: { primary: 2048  | 46 , secondary: undefined }
+    primary: KeyMod.CtrlCmd | KeyCode.KeyP,
+    secondary: [KeyMod.CtrlCmd | KeyCode.KeyE],
+    mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyP, secondary: undefined }
 };
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.closeQuickOpen',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: inQuickPickContext,
-    primary: 9 , secondary: [1024  | 9 ],
+    primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape],
     handler: accessor => {
         const quickInputService = accessor.get(IQuickInputService);
         return quickInputService.cancel();
@@ -26,7 +27,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.acceptSelectedQuickOpenItem',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: inQuickPickContext,
     primary: 0,
     handler: accessor => {
@@ -36,7 +37,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.alternativeAcceptSelectedQuickOpenItem',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: inQuickPickContext,
     primary: 0,
     handler: accessor => {
@@ -46,7 +47,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.focusQuickOpen',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: inQuickPickContext,
     primary: 0,
     handler: accessor => {
@@ -57,7 +58,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickAccessNavigateNextInFilePickerId = 'workbench.action.quickOpenNavigateNextInFilePicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: quickAccessNavigateNextInFilePickerId,
-    weight: 200  + 50,
+    weight: KeybindingWeight.WorkbenchContrib + 50,
     handler: getQuickNavigateHandler(quickAccessNavigateNextInFilePickerId, true),
     when: defaultQuickAccessContext,
     primary: globalQuickAccessKeybinding.primary,
@@ -67,19 +68,19 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickAccessNavigatePreviousInFilePickerId = 'workbench.action.quickOpenNavigatePreviousInFilePicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: quickAccessNavigatePreviousInFilePickerId,
-    weight: 200  + 50,
+    weight: KeybindingWeight.WorkbenchContrib + 50,
     handler: getQuickNavigateHandler(quickAccessNavigatePreviousInFilePickerId, false),
     when: defaultQuickAccessContext,
-    primary: globalQuickAccessKeybinding.primary | 1024 ,
-    secondary: [globalQuickAccessKeybinding.secondary[0] | 1024 ],
+    primary: globalQuickAccessKeybinding.primary | KeyMod.Shift,
+    secondary: [globalQuickAccessKeybinding.secondary[0] | KeyMod.Shift],
     mac: {
-        primary: globalQuickAccessKeybinding.mac.primary | 1024 ,
+        primary: globalQuickAccessKeybinding.mac.primary | KeyMod.Shift,
         secondary: undefined
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.quickPickManyToggle',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: inQuickPickContext,
     primary: 0,
     handler: accessor => {
@@ -89,12 +90,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.quickInputBack',
-    weight: 200  + 50,
+    weight: KeybindingWeight.WorkbenchContrib + 50,
     when: inQuickPickContext,
     primary: 0,
-    win: { primary: 512  | 15  },
-    mac: { primary: 256  | 88  },
-    linux: { primary: 2048  | 512  | 88  },
+    win: { primary: KeyMod.Alt | KeyCode.LeftArrow },
+    mac: { primary: KeyMod.WinCtrl | KeyCode.Minus },
+    linux: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Minus },
     handler: accessor => {
         const quickInputService = accessor.get(IQuickInputService);
         quickInputService.back();
@@ -115,7 +116,7 @@ registerAction2(class QuickAccessAction extends Action2 {
                     }]
             },
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 primary: globalQuickAccessKeybinding.primary,
                 secondary: globalQuickAccessKeybinding.secondary,
                 mac: globalQuickAccessKeybinding.mac
@@ -183,20 +184,20 @@ class QuickAccessNavigatePreviousAction extends BaseQuickAccessNavigateAction {
 class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
         super('workbench.action.quickOpenSelectNext', ( localize2WithPath(_moduleId, 4, 'Select Next in Quick Open')), true, false, {
-            weight: 200  + 50,
+            weight: KeybindingWeight.WorkbenchContrib + 50,
             when: inQuickPickContext,
             primary: 0,
-            mac: { primary: 256  | 44  }
+            mac: { primary: KeyMod.WinCtrl | KeyCode.KeyN }
         });
     }
 }
 class QuickAccessSelectPreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
         super('workbench.action.quickOpenSelectPrevious', ( localize2WithPath(_moduleId, 5, 'Select Previous in Quick Open')), false, false, {
-            weight: 200  + 50,
+            weight: KeybindingWeight.WorkbenchContrib + 50,
             when: inQuickPickContext,
             primary: 0,
-            mac: { primary: 256  | 46  }
+            mac: { primary: KeyMod.WinCtrl | KeyCode.KeyP }
         });
     }
 }

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js

@@ -7,6 +7,8 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Action2, registerAction2 } 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 { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 
 const _moduleId = "vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess";
@@ -55,10 +57,10 @@ class GotoLineAction extends Action2 {
             title: ( localize2WithPath(_moduleId, 0, 'Go to Line/Column...')),
             f1: true,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: null,
-                primary: 2048  | 37 ,
-                mac: { primary: 256  | 37  }
+                primary: KeyMod.CtrlCmd | KeyCode.KeyG,
+                mac: { primary: KeyMod.WinCtrl | KeyCode.KeyG }
             }
         });
     }

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

@@ -3,6 +3,7 @@ import { isFirefox } from 'vscode/vscode/vs/base/browser/browser';
 import { raceTimeout, timeout } from 'vscode/vscode/vs/base/common/async';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Language } from 'vscode/vscode/vs/base/common/platform';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { AbstractEditorCommandsQuickAccessProvider } from '../../../../editor/contrib/quickAccess/browser/commandsQuickAccess.js';
@@ -15,6 +16,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { CommandsHistory } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
 import { TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
@@ -139,7 +141,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         const defaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
         if (defaultAgent) {
             additionalPicks.push({
-                label: ( localizeWithPath(_moduleId, 2, "Ask {0}: {1}", defaultAgent.metadata.fullName, filter)),
+                label: ( localizeWithPath(_moduleId, 2, "Ask {0}: {1}", defaultAgent.fullName, filter)),
                 commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
                 args: [filter]
             });
@@ -219,10 +221,10 @@ class ShowAllCommandsAction extends Action2 {
             id: ShowAllCommandsAction.ID,
             title: ( localize2WithPath(_moduleId, 4, 'Show All Commands')),
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: undefined,
-                primary: !isFirefox ? ((2048  | 1024  | 46) ) : undefined,
-                secondary: [59 ]
+                primary: !isFirefox ? (KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyP) : undefined,
+                secondary: [KeyCode.F1]
             },
             f1: true
         });

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

@@ -5,9 +5,10 @@ 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 { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 
 const _moduleId = "vs/workbench/contrib/quickaccess/browser/quickAccess.contribution";
@@ -107,7 +108,7 @@ 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,
@@ -117,12 +118,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.js

@@ -3,6 +3,7 @@ import { localizeWithPath, localize2WithPath } 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 { 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 +13,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';
@@ -113,9 +116,9 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
                 }
             }
         };
-        addPaneComposites(0 , ( localizeWithPath(_moduleId, 1, "Side Bar")));
-        addPaneComposites(1 , ( localizeWithPath(_moduleId, 2, "Panel")));
-        addPaneComposites(2 , ( localizeWithPath(_moduleId, 3, "Secondary Side Bar")));
+        addPaneComposites(ViewContainerLocation.Sidebar, ( localizeWithPath(_moduleId, 1, "Side Bar")));
+        addPaneComposites(ViewContainerLocation.Panel, ( localizeWithPath(_moduleId, 2, "Panel")));
+        addPaneComposites(ViewContainerLocation.AuxiliaryBar, ( localizeWithPath(_moduleId, 3, "Secondary Side Bar")));
         const addPaneCompositeViews = (location) => {
             const paneComposites = this.paneCompositeService.getPaneComposites(location);
             for (const paneComposite of paneComposites) {
@@ -125,9 +128,9 @@ 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 = ( localizeWithPath(
@@ -205,8 +208,8 @@ 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() {
@@ -216,7 +219,7 @@ class QuickAccessViewPickerAction extends Action2 {
             category: Categories.View,
             f1: false,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: undefined,
                 ...QuickAccessViewPickerAction.KEYBINDING
             }

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

@@ -1,11 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 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 './trustedDomains.js';
+import { TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, readTrustedDomains, TRUSTED_DOMAINS_STORAGE_KEY } from 'vscode/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';
 
@@ -38,7 +39,7 @@ const CONFIG_HELP_TEXT_AFTER = `//
 const CONFIG_PLACEHOLDER_TEXT = `[
 	// "https://microsoft.com"
 ]`;
-function computeTrustedDomainContent(defaultTrustedDomains, trustedDomains, userTrustedDomains, workspaceTrustedDomains, configuring) {
+function computeTrustedDomainContent(defaultTrustedDomains, trustedDomains, configuring) {
     let content = CONFIG_HELP_TEXT_PRE;
     if (defaultTrustedDomains.length > 0) {
         content += `// By default, VS Code trusts "localhost" as well as the following domains:\n`;
@@ -49,18 +50,6 @@ function computeTrustedDomainContent(defaultTrustedDomains, trustedDomains, user
     else {
         content += `// By default, VS Code trusts "localhost".\n`;
     }
-    if (userTrustedDomains.length) {
-        content += `//\n// Additionally, the following domains are trusted based on your logged-in Accounts:\n`;
-        userTrustedDomains.forEach(d => {
-            content += `// - "${d}"\n`;
-        });
-    }
-    if (workspaceTrustedDomains.length) {
-        content += `//\n// Further, the following domains are trusted based on your workspace configuration:\n`;
-        workspaceTrustedDomains.forEach(d => {
-            content += `// - "${d}"\n`;
-        });
-    }
     content += CONFIG_HELP_TEXT_AFTER;
     content += configuring ? `\n// Currently configuring trust for ${configuring}\n` : '';
     if (trustedDomains.length === 0) {
@@ -77,7 +66,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);
@@ -86,15 +75,15 @@ 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, userDomains, workspaceDomains } = await this.instantiationService.invokeFunction(readTrustedDomains);
+        const { defaultTrustedDomains, trustedDomains } = await this.instantiationService.invokeFunction(readTrustedDomains);
         if (!trustedDomainsContent ||
             trustedDomainsContent.indexOf(CONFIG_HELP_TEXT_PRE) === -1 ||
             trustedDomainsContent.indexOf(CONFIG_HELP_TEXT_AFTER) === -1 ||
             trustedDomainsContent.indexOf(configuring ?? '') === -1 ||
-            ( [...defaultTrustedDomains, ...trustedDomains, ...userDomains, ...workspaceDomains].some(d => !assertIsDefined(trustedDomainsContent).includes(d)))) {
-            trustedDomainsContent = computeTrustedDomainContent(defaultTrustedDomains, trustedDomains, userDomains, workspaceDomains, configuring);
+            ( [...defaultTrustedDomains, ...trustedDomains].some(d => !assertIsDefined(trustedDomainsContent).includes(d)))) {
+            trustedDomainsContent = computeTrustedDomainContent(defaultTrustedDomains, trustedDomains, configuring);
         }
         const buffer = VSBuffer.fromString(trustedDomainsContent).buffer;
         return buffer;
@@ -103,8 +92,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.js

@@ -1,6 +1,4 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { WindowIdleValue } from 'vscode/vscode/vs/base/browser/dom';
-import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { matchesScheme, Schemas } from 'vscode/vscode/vs/base/common/network';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -14,16 +12,15 @@ import { IProductService } from 'vscode/vscode/vs/platform/product/common/produc
 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 { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { readAuthenticationTrustedDomains, readWorkspaceTrustedDomains, readStaticTrustedDomains, configureOpenerTrustedDomainsHandler } from './trustedDomains.js';
-import { testUrlMatchesGlob } from 'vscode/vscode/vs/workbench/contrib/url/common/urlGlob';
-import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
+import { isURLDomainTrusted } from 'vscode/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 { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const _moduleId = "vs/workbench/contrib/url/browser/trustedDomainsValidator";
 let OpenerValidatorContributions = class OpenerValidatorContributions {
-    constructor(_openerService, _storageService, _dialogService, _productService, _quickInputService, _editorService, _clipboardService, _telemetryService, _instantiationService, _authenticationService, _workspaceContextService, _configurationService, _workspaceTrustService) {
+    constructor(_openerService, _storageService, _dialogService, _productService, _quickInputService, _editorService, _clipboardService, _telemetryService, _instantiationService, _configurationService, _workspaceTrustService, _trustedDomainService) {
         this._openerService = _openerService;
         this._storageService = _storageService;
         this._dialogService = _dialogService;
@@ -33,33 +30,10 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
         this._clipboardService = _clipboardService;
         this._telemetryService = _telemetryService;
         this._instantiationService = _instantiationService;
-        this._authenticationService = _authenticationService;
-        this._workspaceContextService = _workspaceContextService;
         this._configurationService = _configurationService;
         this._workspaceTrustService = _workspaceTrustService;
+        this._trustedDomainService = _trustedDomainService;
         this._openerService.registerValidator({ shouldOpen: (uri, options) => this.validateLink(uri, options) });
-        this._readAuthenticationTrustedDomainsResult = ( (new WindowIdleValue(
-            mainWindow,
-            () => this._instantiationService.invokeFunction(readAuthenticationTrustedDomains)
-        )));
-        this._authenticationService.onDidRegisterAuthenticationProvider(() => {
-            this._readAuthenticationTrustedDomainsResult?.dispose();
-            this._readAuthenticationTrustedDomainsResult = ( (new WindowIdleValue(
-                mainWindow,
-                () => this._instantiationService.invokeFunction(readAuthenticationTrustedDomains)
-            )));
-        });
-        this._readWorkspaceTrustedDomainsResult = ( (new WindowIdleValue(
-            mainWindow,
-            () => this._instantiationService.invokeFunction(readWorkspaceTrustedDomains)
-        )));
-        this._workspaceContextService.onDidChangeWorkspaceFolders(() => {
-            this._readWorkspaceTrustedDomainsResult?.dispose();
-            this._readWorkspaceTrustedDomainsResult = ( (new WindowIdleValue(
-                mainWindow,
-                () => this._instantiationService.invokeFunction(readWorkspaceTrustedDomains)
-            )));
-        });
     }
     async validateLink(resource, openOptions) {
         if (!matchesScheme(resource, Schemas.http) && !matchesScheme(resource, Schemas.https)) {
@@ -76,15 +50,11 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
         else {
             resourceUri = resource;
         }
-        const { scheme, authority, path, query, fragment } = resourceUri;
-        const domainToOpen = `${scheme}://${authority}`;
-        const [workspaceDomains, userDomains] = await Promise.all([this._readWorkspaceTrustedDomainsResult.value, this._readAuthenticationTrustedDomainsResult.value]);
-        const { defaultTrustedDomains, trustedDomains, } = this._instantiationService.invokeFunction(readStaticTrustedDomains);
-        const allTrustedDomains = [...defaultTrustedDomains, ...trustedDomains, ...userDomains, ...workspaceDomains];
-        if (isURLDomainTrusted(resourceUri, allTrustedDomains)) {
+        if (await this._trustedDomainService.isValid(resourceUri)) {
             return true;
         }
         else {
+            const { scheme, authority, path, query, fragment } = resourceUri;
             let formattedLink = `${scheme}://${authority}${path}`;
             const linkTail = `${query ? '?' + query : ''}${fragment ? '#' + fragment : ''}`;
             const remainingLength = Math.max(0, 60 - formattedLink.length);
@@ -119,6 +89,8 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
                     {
                         label: ( localizeWithPath(_moduleId, 3, 'Configure &&Trusted Domains')),
                         run: async () => {
+                            const { trustedDomains, } = this._instantiationService.invokeFunction(readStaticTrustedDomains);
+                            const domainToOpen = `${scheme}://${authority}`;
                             const pickedDomains = await configureOpenerTrustedDomainsHandler(trustedDomains, domainToOpen, resourceUri, this._quickInputService, this._storageService, this._editorService);
                             if (pickedDomains.indexOf('*') !== -1) {
                                 return true;
@@ -148,52 +120,9 @@ OpenerValidatorContributions = ( (__decorate([
     ( (__param(6, IClipboardService))),
     ( (__param(7, ITelemetryService))),
     ( (__param(8, IInstantiationService))),
-    ( (__param(9, IAuthenticationService))),
-    ( (__param(10, IWorkspaceContextService))),
-    ( (__param(11, IConfigurationService))),
-    ( (__param(12, IWorkspaceTrustManagementService)))
+    ( (__param(9, IConfigurationService))),
+    ( (__param(10, IWorkspaceTrustManagementService))),
+    ( (__param(11, ITrustedDomainService)))
 ], OpenerValidatorContributions)));
-const rLocalhost = /^localhost(:\d+)?$/i;
-const r127 = /^127.0.0.1(:\d+)?$/;
-function isLocalhostAuthority(authority) {
-    return rLocalhost.test(authority) || r127.test(authority);
-}
-function normalizeURL(url) {
-    const caseInsensitiveAuthorities = ['github.com'];
-    try {
-        const parsed = typeof url === 'string' ? ( (URI.parse(url, true))) : url;
-        if (caseInsensitiveAuthorities.includes(parsed.authority)) {
-            return (
-                 (parsed.with({ path: parsed.path.toLowerCase() }).toString(true))
-            );
-        }
-        else {
-            return (
-                 (parsed.toString(true))
-            );
-        }
-    }
-    catch {
-        return (
-             (url.toString())
-        );
-    }
-}
-function isURLDomainTrusted(url, trustedDomains) {
-    url = ( (URI.parse(normalizeURL(url))));
-    trustedDomains = ( (trustedDomains.map(normalizeURL)));
-    if (isLocalhostAuthority(url.authority)) {
-        return true;
-    }
-    for (let i = 0; i < trustedDomains.length; i++) {
-        if (trustedDomains[i] === '*') {
-            return true;
-        }
-        if (testUrlMatchesGlob(url, trustedDomains[i])) {
-            return true;
-        }
-    }
-    return false;
-}
 
-export { OpenerValidatorContributions, isURLDomainTrusted };
+export { OpenerValidatorContributions };

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

@@ -2,17 +2,21 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2, MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IURLService } from 'vscode/vscode/vs/platform/url/common/url.service';
-import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { ExternalUriResolverContribution } from './externalUriResolver.js';
-import { manageTrustedDomainSettingsCommand } from './trustedDomains.js';
+import { manageTrustedDomainSettingsCommand } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomains';
 import { TrustedDomainsFileSystemProvider } from './trustedDomainsFileSystemProvider.js';
 import { OpenerValidatorContributions } from './trustedDomainsValidator.js';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$1, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
+import 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 const _moduleId = "vs/workbench/contrib/url/browser/url.contribution";
 class OpenUrlAction extends Action2 {
@@ -43,15 +47,17 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         title: manageTrustedDomainSettingsCommand.description.description
     }
 });
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(OpenerValidatorContributions, 3 );
-registerWorkbenchContribution2(TrustedDomainsFileSystemProvider.ID, TrustedDomainsFileSystemProvider, 2 );
-registerWorkbenchContribution2(ExternalUriResolverContribution.ID, ExternalUriResolverContribution, 2 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(OpenerValidatorContributions, LifecyclePhase.Restored);
+registerWorkbenchContribution2(TrustedDomainsFileSystemProvider.ID, TrustedDomainsFileSystemProvider, WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(ExternalUriResolverContribution.ID, ExternalUriResolverContribution, WorkbenchPhase.BlockRestore
+);
 const configurationRegistry = ( (Registry.as(Extensions$1.Configuration)));
 configurationRegistry.registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {
         'workbench.trustedDomains.promptInTrustedWorkspace': {
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             type: 'boolean',
             default: false,
             description: ( localizeWithPath(

package/vscode/src/vs/workbench/services/quickinput/browser/quickInputService.js

@@ -6,6 +6,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { QuickInputService as QuickInputService$1 } from 'vscode/vscode/vs/platform/quickinput/browser/quickInputService';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { InQuickPickContextKey } from 'vscode/vscode/vs/workbench/browser/quickaccess';
 
 let QuickInputService = class QuickInputService extends QuickInputService$1 {

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

@@ -1,174 +0,0 @@
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
-import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
-
-const _moduleId = "vs/workbench/contrib/url/browser/trustedDomains";
-const TRUSTED_DOMAINS_URI = ( (URI.parse('trustedDomains:/Trusted Domains')));
-const TRUSTED_DOMAINS_STORAGE_KEY = 'http.linkProtectionTrustedDomains';
-const TRUSTED_DOMAINS_CONTENT_STORAGE_KEY = 'http.linkProtectionTrustedDomainsContent';
-const manageTrustedDomainSettingsCommand = {
-    id: 'workbench.action.manageTrustedDomain',
-    description: {
-        description: ( localize2WithPath(_moduleId, 0, 'Manage Trusted Domains')),
-        args: []
-    },
-    handler: async (accessor) => {
-        const editorService = accessor.get(IEditorService);
-        editorService.openEditor({ resource: TRUSTED_DOMAINS_URI, languageId: 'jsonc', options: { pinned: true } });
-        return;
-    }
-};
-async function configureOpenerTrustedDomainsHandler(trustedDomains, domainToConfigure, resource, quickInputService, storageService, editorService, telemetryService) {
-    const parsedDomainToConfigure = ( (URI.parse(domainToConfigure)));
-    const toplevelDomainSegements = parsedDomainToConfigure.authority.split('.');
-    const domainEnd = toplevelDomainSegements.slice(toplevelDomainSegements.length - 2).join('.');
-    const topLevelDomain = '*.' + domainEnd;
-    const options = [];
-    options.push({
-        type: 'item',
-        label: ( localizeWithPath(_moduleId, 1, 'Trust {0}', domainToConfigure)),
-        id: 'trust',
-        toTrust: domainToConfigure,
-        picked: true
-    });
-    const isIP = toplevelDomainSegements.length === 4 &&
-        toplevelDomainSegements.every(segment => Number.isInteger(+segment) || Number.isInteger(+segment.split(':')[0]));
-    if (isIP) {
-        if (parsedDomainToConfigure.authority.includes(':')) {
-            const base = parsedDomainToConfigure.authority.split(':')[0];
-            options.push({
-                type: 'item',
-                label: ( localizeWithPath(_moduleId, 2, 'Trust {0} on all ports', base)),
-                toTrust: base + ':*',
-                id: 'trust'
-            });
-        }
-    }
-    else {
-        options.push({
-            type: 'item',
-            label: ( localizeWithPath(_moduleId, 3, 'Trust {0} and all its subdomains', domainEnd)),
-            toTrust: topLevelDomain,
-            id: 'trust'
-        });
-    }
-    options.push({
-        type: 'item',
-        label: ( localizeWithPath(_moduleId, 4, 'Trust all domains (disables link protection)')),
-        toTrust: '*',
-        id: 'trust'
-    });
-    options.push({
-        type: 'item',
-        label: ( localizeWithPath(_moduleId, 5, 'Manage Trusted Domains')),
-        id: 'manage'
-    });
-    const pickedResult = await quickInputService.pick(options, { activeItem: options[0] });
-    if (pickedResult && pickedResult.id) {
-        switch (pickedResult.id) {
-            case 'manage':
-                await editorService.openEditor({
-                    resource: TRUSTED_DOMAINS_URI.with({ fragment: ( (resource.toString())) }),
-                    languageId: 'jsonc',
-                    options: { pinned: true }
-                });
-                return trustedDomains;
-            case 'trust': {
-                const itemToTrust = pickedResult.toTrust;
-                if (trustedDomains.indexOf(itemToTrust) === -1) {
-                    storageService.remove(TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, -1 );
-                    storageService.store(TRUSTED_DOMAINS_STORAGE_KEY, JSON.stringify([...trustedDomains, itemToTrust]), -1 , 0 );
-                    return [...trustedDomains, itemToTrust];
-                }
-            }
-        }
-    }
-    return [];
-}
-function extractGitHubRemotesFromGitConfig(gitConfig) {
-    const domains = ( (new Set()));
-    let match;
-    const RemoteMatcher = /^\s*url\s*=\s*(?:git@|https:\/\/)github\.com(?::|\/)(\S*)\s*$/mg;
-    while (match = RemoteMatcher.exec(gitConfig)) {
-        const repo = match[1].replace(/\.git$/, '');
-        if (repo) {
-            domains.add(`https://github.com/${repo}/`);
-        }
-    }
-    return [...domains];
-}
-async function getRemotes(fileService, textFileService, contextService) {
-    const workspaceUris = ( (contextService.getWorkspace().folders.map(folder => folder.uri)));
-    const domains = await Promise.race([
-        ( (new Promise(resolve => setTimeout(() => resolve([]), 2000)))),
-        Promise.all(( (workspaceUris.map(async (workspaceUri) => {
-            try {
-                const path = workspaceUri.path;
-                const uri = workspaceUri.with({ path: `${path !== '/' ? path : ''}/.git/config` });
-                const exists = await fileService.exists(uri);
-                if (!exists) {
-                    return [];
-                }
-                const gitConfig = (await (textFileService.read(uri, { acceptTextOnly: true }).catch(() => ({ value: '' })))).value;
-                return extractGitHubRemotesFromGitConfig(gitConfig);
-            }
-            catch {
-                return [];
-            }
-        }))))
-    ]);
-    const set = domains.reduce((set, list) => list.reduce((set, item) => set.add(item), set), ( (new Set())));
-    return [...set];
-}
-async function readTrustedDomains(accessor) {
-    const { defaultTrustedDomains, trustedDomains } = readStaticTrustedDomains(accessor);
-    const [workspaceDomains, userDomains] = await Promise.all([readWorkspaceTrustedDomains(accessor), readAuthenticationTrustedDomains(accessor)]);
-    return {
-        workspaceDomains,
-        userDomains,
-        defaultTrustedDomains,
-        trustedDomains,
-    };
-}
-async function readWorkspaceTrustedDomains(accessor) {
-    const fileService = accessor.get(IFileService);
-    const textFileService = accessor.get(ITextFileService);
-    const workspaceContextService = accessor.get(IWorkspaceContextService);
-    return getRemotes(fileService, textFileService, workspaceContextService);
-}
-async function readAuthenticationTrustedDomains(accessor) {
-    const authenticationService = accessor.get(IAuthenticationService);
-    return authenticationService.isAuthenticationProviderRegistered('github') && ((await authenticationService.getSessions('github')) ?? []).length > 0
-        ? [`https://github.com`]
-        : [];
-}
-function readStaticTrustedDomains(accessor) {
-    const storageService = accessor.get(IStorageService);
-    const productService = accessor.get(IProductService);
-    const environmentService = accessor.get(IBrowserWorkbenchEnvironmentService);
-    const defaultTrustedDomains = [
-        ...(productService.linkProtectionTrustedDomains ?? []),
-        ...(environmentService.options?.additionalTrustedDomains ?? [])
-    ];
-    let trustedDomains = [];
-    try {
-        const trustedDomainsSrc = storageService.get(TRUSTED_DOMAINS_STORAGE_KEY, -1 );
-        if (trustedDomainsSrc) {
-            trustedDomains = JSON.parse(trustedDomainsSrc);
-        }
-    }
-    catch (err) { }
-    return {
-        defaultTrustedDomains,
-        trustedDomains,
-    };
-}
-
-export { TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, TRUSTED_DOMAINS_STORAGE_KEY, configureOpenerTrustedDomainsHandler, extractGitHubRemotesFromGitConfig, manageTrustedDomainSettingsCommand, readAuthenticationTrustedDomains, readStaticTrustedDomains, readTrustedDomains, readWorkspaceTrustedDomains };