Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ben/file2watcher

Browse Source
This commit is contained in:
Benjamin Pasero
2019-04-02 14:31:40 +02:00
parent e9f90a6abe 27af9d1260
commit 0a7ad1aebf
7 changed files with 109 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
View File

@@ -40,6 +40,7 @@ import { NullLogService } from 'vs/platform/log/common/log';
import { Schemas } from 'vs/base/common/network';
import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
import { IFileService } from 'vs/platform/files/common/files';
import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
class SettingsTestEnvironmentService extends EnvironmentService {
@@ -60,6 +61,7 @@ suite('ConfigurationEditingService', () => {
let workspaceSettingsDir;
suiteSetup(() => {
setUnexpectedErrorHandler(() => null);
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
configurationRegistry.registerConfiguration({
'id': '_test',