web - enable feedback contribution

Benjamin Pasero · Benjamin Pasero · commit 2147b8a9d93a · 2019-08-15T11:36:43.000+02:00
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -25,6 +25,7 @@ import { nullRange } from 'vs/workbench/services/preferences/common/preferencesM
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { IProductService } from 'vs/platform/product/common/product';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export interface IEndpointDetails {
 	urlBase?: string;
@@ -564,3 +565,5 @@ export class SettingMatches {
 		};
 	}
 }
+
+registerSingleton(IPreferencesSearchService, PreferencesSearchService, true);
diff --git a/src/vs/workbench/services/integrity/browser/integrityService.ts b/src/vs/workbench/services/integrity/browser/integrityService.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IIntegrityService, IntegrityTestResult } from 'vs/workbench/services/integrity/common/integrity';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
+
+export class BrowserIntegrityServiceImpl implements IIntegrityService {
+
+	_serviceBrand!: ServiceIdentifier<any>;
+
+	async isPure(): Promise<IntegrityTestResult> {
+		return { isPure: true, proof: [] };
+	}
+}
+
+registerSingleton(IIntegrityService, BrowserIntegrityServiceImpl, true);
diff --git a/src/vs/workbench/services/integrity/node/integrityService.ts b/src/vs/workbench/services/integrity/node/integrityService.ts
@@ -14,6 +14,7 @@ import product from 'vs/platform/product/node/product';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 
 interface IStorageData {
 	dontShowPrompt: boolean;
@@ -55,7 +56,7 @@ class IntegrityStorage {
 
 export class IntegrityServiceImpl implements IIntegrityService {
 
-	_serviceBrand: any;
+	_serviceBrand!: ServiceIdentifier<any>;
 
 	private _storage: IntegrityStorage;
 	private _isPurePromise: Promise<IntegrityTestResult>;
@@ -159,4 +160,4 @@ export class IntegrityServiceImpl implements IIntegrityService {
 	}
 }
 
-registerSingleton(IIntegrityService, IntegrityServiceImpl, true);
+registerSingleton(IIntegrityService, IntegrityServiceImpl, true);
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
@@ -123,9 +123,7 @@ import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';
 // Preferences
 import 'vs/workbench/contrib/preferences/browser/preferences.contribution';
 import 'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution';
-import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences';
-import { PreferencesSearchService } from 'vs/workbench/contrib/preferences/browser/preferencesSearch';
-registerSingleton(IPreferencesSearchService, PreferencesSearchService, true);
+import 'vs/workbench/contrib/preferences/browser/preferencesSearch';
 
 // Logs
 import 'vs/workbench/contrib/logs/common/logs.contribution';
@@ -231,4 +229,7 @@ import 'vs/workbench/contrib/outline/browser/outline.contribution';
 // Experiments
 import 'vs/workbench/contrib/experiments/browser/experiments.contribution';
 
+// Send a Smile
+import 'vs/workbench/contrib/feedback/browser/feedback.contribution';
+
 //#endregion
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
@@ -131,9 +131,6 @@ import 'vs/workbench/contrib/codeEditor/electron-browser/codeEditor.contribution
 // Execution
 import 'vs/workbench/contrib/externalTerminal/node/externalTerminalService';
 
-// Send a Smile
-import 'vs/workbench/contrib/feedback/browser/feedback.contribution';
-
 // Update
 import 'vs/workbench/contrib/update/electron-browser/update.contribution';
 
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
@@ -26,6 +26,7 @@ import 'vs/workbench/browser/web.main';
 
 
 //#region --- workbench services
+import 'vs/workbench/services/integrity/browser/integrityService';
 import 'vs/workbench/services/textMate/browser/textMateService';
 import 'vs/workbench/services/search/common/searchService';
 import 'vs/workbench/services/output/common/outputChannelModelService';

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import { nullRange } from 'vs/workbench/services/preferences/common/preferencesM`
`25`	`25`	`import { IConfigurationService } from 'vs/platform/configuration/common/configuration';`
`26`	`26`	`import { IStringDictionary } from 'vs/base/common/collections';`
`27`	`27`	`import { IProductService } from 'vs/platform/product/common/product';`
	`28`	`+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';`
`28`	`29`
`29`	`30`	`export interface IEndpointDetails {`
`30`	`31`	`urlBase?: string;`
`@@ -564,3 +565,5 @@ export class SettingMatches {`
`564`	`565`	`};`
`565`	`566`	`}`
`566`	`567`	`}`
	`568`	`+`
	`569`	`+registerSingleton(IPreferencesSearchService, PreferencesSearchService, true);`