diff --git a/src/vs/workbench/contrib/url/common/trustedDomains.ts b/src/vs/workbench/contrib/url/common/trustedDomains.ts index d33495abf8f792ce7796c0f66d13a0b9fdc32f06..2b2190822ecfe6c0e0a143fddfe6fd9e07808a88 100644 --- a/src/vs/workbench/contrib/url/common/trustedDomains.ts +++ b/src/vs/workbench/contrib/url/common/trustedDomains.ts @@ -3,15 +3,14 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { URI } from 'vs/base/common/uri'; import { localize } from 'vs/nls'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; +import { INotificationService } from 'vs/platform/notification/common/notification'; +import { IProductService } from 'vs/platform/product/common/product'; import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { URI } from 'vs/base/common/uri'; -import { readTrustedDomains } from 'vs/workbench/contrib/url/common/trustedDomainsValidator'; -import { IProductService } from 'vs/platform/product/common/product'; -import { INotificationService } from 'vs/platform/notification/common/notification'; const TRUSTED_DOMAINS_URI = URI.parse('trustedDomains:/Trusted Domains'); @@ -113,3 +112,18 @@ export async function configureOpenerTrustedDomainsHandler( return []; } + +export function readTrustedDomains(storageService: IStorageService, productService: IProductService) { + let trustedDomains: string[] = productService.linkProtectionTrustedDomains + ? [...productService.linkProtectionTrustedDomains] + : []; + + try { + const trustedDomainsSrc = storageService.get('http.linkProtectionTrustedDomains', StorageScope.GLOBAL); + if (trustedDomainsSrc) { + trustedDomains = JSON.parse(trustedDomainsSrc); + } + } catch (err) { } + + return trustedDomains; +} diff --git a/src/vs/workbench/contrib/url/common/trustedDomainsValidator.ts b/src/vs/workbench/contrib/url/common/trustedDomainsValidator.ts index b4a3c81ed5b0402d4e390970a7c536a86414b86c..83b47cb35888b87e8c0587299d8253cfeda2f303 100644 --- a/src/vs/workbench/contrib/url/common/trustedDomainsValidator.ts +++ b/src/vs/workbench/contrib/url/common/trustedDomainsValidator.ts @@ -12,9 +12,9 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { IProductService } from 'vs/platform/product/common/product'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; -import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; +import { IStorageService } from 'vs/platform/storage/common/storage'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; -import { configureOpenerTrustedDomainsHandler } from 'vs/workbench/contrib/url/common/trustedDomains'; +import { configureOpenerTrustedDomainsHandler, readTrustedDomains } from 'vs/workbench/contrib/url/common/trustedDomains'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export class OpenerValidatorContributions implements IWorkbenchContribution { @@ -89,21 +89,6 @@ export class OpenerValidatorContributions implements IWorkbenchContribution { } } -export function readTrustedDomains(storageService: IStorageService, productService: IProductService) { - let trustedDomains: string[] = productService.linkProtectionTrustedDomains - ? [...productService.linkProtectionTrustedDomains] - : []; - - try { - const trustedDomainsSrc = storageService.get('http.linkProtectionTrustedDomains', StorageScope.GLOBAL); - if (trustedDomainsSrc) { - trustedDomains = JSON.parse(trustedDomainsSrc); - } - } catch (err) { } - - return trustedDomains; -} - const rLocalhost = /^localhost(:\d+)?$/i; const r127 = /^127.0.0.1(:\d+)?$/;