Fix #69108

microsoft · Aug 14, 2019 · 6f55bec · 6f55bec
1 parent 73772a4
commit 6f55bec
Show file tree

Hide file tree

Showing 10 changed files with 411 additions and 450 deletions.
diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts
@@ -31,8 +31,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 import { toStoreData, restoreRecentlyOpened } from 'vs/platform/history/common/historyStorage';
-// tslint:disable-next-line: import-patterns
-import { IExperimentService, IExperiment, ExperimentActionType, ExperimentState } from 'vs/workbench/contrib/experiments/common/experimentService';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IProductService } from 'vs/platform/product/common/product';
@@ -847,7 +845,7 @@ registerSingleton(ITunnelService, SimpleTunnelService);
 
 //#endregion
 
-//#region experiments
+//#region workspace stats
 
 class WorkspaceStatsService implements IWorkspaceStatsService {
 
@@ -865,31 +863,4 @@ class WorkspaceStatsService implements IWorkspaceStatsService {
 
 registerSingleton(IWorkspaceStatsService, WorkspaceStatsService);
 
-class ExperimentService implements IExperimentService {
-	_serviceBrand: any;
-
-	async getExperimentById(id: string): Promise<IExperiment> {
-		return {
-			enabled: false,
-			id: '',
-			state: ExperimentState.NoRun
-		};
-	}
-
-	async getExperimentsByType(type: ExperimentActionType): Promise<IExperiment[]> {
-		return [];
-	}
-
-	async getCuratedExtensionsList(curatedExtensionsKey: string): Promise<string[]> {
-		return [];
-	}
-
-	markAsCompleted(experimentId: string): void { }
-
-	onExperimentEnabled: Event<IExperiment> = Event.None;
-
-}
-
-registerSingleton(IExperimentService, ExperimentService);
-
 //#endregion
diff --git a/...ts/electron-browser/experimentalPrompt.ts → ...experiments/browser/experimentalPrompt.ts b/...ts/electron-browser/experimentalPrompt.ts → ...experiments/browser/experimentalPrompt.ts
diff --git a/...ctron-browser/experiments.contribution.ts → ...ments/browser/experiments.contribution.ts b/...ctron-browser/experiments.contribution.ts → ...ments/browser/experiments.contribution.ts
@@ -4,12 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IExperimentService } from 'vs/workbench/contrib/experiments/common/experimentService';
-import { ExperimentService } from 'vs/workbench/contrib/experiments/electron-browser/experimentService';
+import { IExperimentService, ExperimentService } from 'vs/workbench/contrib/experiments/common/experimentService';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { ExperimentalPrompts } from 'vs/workbench/contrib/experiments/electron-browser/experimentalPrompt';
+import { ExperimentalPrompts } from 'vs/workbench/contrib/experiments/browser/experimentalPrompt';
 
 registerSingleton(IExperimentService, ExperimentService, true);