Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-20 15:19:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

add vscode-policy-watcher dependency, support registerPolicyDefinitions

Browse Source
This commit is contained in:
Joao Moreno
2022-05-18 14:13:58 +02:00
parent e2029b6cbe
commit 56eca91b26
6 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/code/electron-main/main.ts
+2 -2
View File
@@ -63,7 +63,7 @@ import { StateMainService } from 'vs/platform/state/electron-main/stateMainServi
import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
import { IThemeMainService, ThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
import { WindowsPolicyService } from 'vs/platform/policy/node/windowsPolicyService';
import { NativePolicyService } from 'vs/platform/policy/node/nativePolicyService';
import { FilePolicyService } from 'vs/platform/policy/common/filePolicyService';
/**
@@ -170,7 +170,7 @@ class CodeMain {
services.set(ILoggerService, new LoggerService(logService, fileService));
// Policy
const policyService = isWindows && productService.win32RegValueName ? new WindowsPolicyService(productService.win32RegValueName)
const policyService = isWindows && productService.win32RegValueName ? new NativePolicyService(productService.win32RegValueName)
: environmentMainService.policyFile ? new FilePolicyService(environmentMainService.policyFile, fileService, logService)
: new NullPolicyService();
services.set(IPolicyService, policyService);
src/vs/code/node/cliProcessMain.ts
+4 -2
View File
@@ -42,7 +42,7 @@ import { ConsoleLogger, getLogLevel, ILogger, ILogService, LogLevel, MultiplexLo
import { SpdLogLogger } from 'vs/platform/log/node/spdlogLog';
import { FilePolicyService } from 'vs/platform/policy/common/filePolicyService';
import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
import { WindowsPolicyService } from 'vs/platform/policy/node/windowsPolicyService';
import { NativePolicyService } from 'vs/platform/policy/node/nativePolicyService';
import product from 'vs/platform/product/common/product';
import { IProductService } from 'vs/platform/product/common/productService';
import { IRequestService } from 'vs/platform/request/common/request';
@@ -133,7 +133,9 @@ class CliMain extends Disposable {
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
// Policy
const policyService = isWindows && productService.win32RegValueName ? new WindowsPolicyService(productService.win32RegValueName) : environmentService.policyFile ? new FilePolicyService(environmentService.policyFile, fileService, logService) : new NullPolicyService();
const policyService = isWindows && productService.win32RegValueName ? new NativePolicyService(productService.win32RegValueName)
: environmentService.policyFile ? new FilePolicyService(environmentService.policyFile, fileService, logService)
: new NullPolicyService();
services.set(IPolicyService, policyService);
// Configuration