experiments: rename to action2 for new experiments

connor4312 · connor4312 · commit b76d3f019730 · 2020-03-04T08:48:43.000-08:00
diff --git a/src/vs/workbench/contrib/experiments/common/experimentService.ts b/src/vs/workbench/contrib/experiments/common/experimentService.ts
@@ -93,7 +93,7 @@ interface IExperimentStorageState {
  * be incremented when adding a condition, otherwise experiments might activate
  * on older versions of VS Code where not intended.
  */
-export const currentSchemaVersion = 2;
+export const currentSchemaVersion = 3;
 
 interface IRawExperiment {
 	id: string;
@@ -128,6 +128,7 @@ interface IRawExperiment {
 		userProbability?: number;
 	};
 	action?: IExperimentAction;
+	action2?: IExperimentAction;
 }
 
 interface IActivationEventRecord {
@@ -310,10 +311,11 @@ export class ExperimentService extends Disposable implements IExperimentService
 			state: !!experiment.enabled ? ExperimentState.Evaluating : ExperimentState.NoRun
 		};
 
-		if (experiment.action) {
+		const action = experiment.action2 || experiment.action;
+		if (action) {
 			processedExperiment.action = {
-				type: ExperimentActionType[experiment.action.type] || ExperimentActionType.Custom,
-				properties: experiment.action.properties
+				type: ExperimentActionType[action.type] || ExperimentActionType.Custom,
+				properties: action.properties
 			};
 			if (processedExperiment.action.type === ExperimentActionType.Prompt) {
 				((<IExperimentActionPromptProperties>processedExperiment.action.properties).commands || []).forEach(x => {
@@ -557,7 +559,7 @@ export class ExperimentService extends Disposable implements IExperimentService
 				if (typeof latestExperimentState.editCount === 'number' && latestExperimentState.editCount >= fileEdits.minEditCount) {
 					processedExperiment.state = latestExperimentState.state = (typeof condition.userProbability === 'number' && Math.random() < condition.userProbability && this.checkExperimentDependencies(experiment)) ? ExperimentState.Run : ExperimentState.NoRun;
 					this.storageService.store(storageKey, JSON.stringify(latestExperimentState), StorageScope.GLOBAL);
-					if (latestExperimentState.state === ExperimentState.Run && experiment.action && ExperimentActionType[experiment.action.type] === ExperimentActionType.Prompt) {
+					if (latestExperimentState.state === ExperimentState.Run && processedExperiment.action && ExperimentActionType[processedExperiment.action.type] === ExperimentActionType.Prompt) {
 						this.fireRunExperiment(processedExperiment);
 					}
 				}
diff --git a/src/vs/workbench/contrib/experiments/test/electron-browser/experimentService.test.ts b/src/vs/workbench/contrib/experiments/test/electron-browser/experimentService.test.ts
@@ -768,13 +768,37 @@ suite('Experiment Service', () => {
 		testObject = instantiationService.createInstance(TestExperimentService);
 		return testObject.getExperimentById('experiment1').then(result => {
 			assert.equal(result.enabled, false);
+			assert.equal(result.action?.type, 'Prompt');
 			assert.equal(result.state, ExperimentState.NoRun);
 			return testObject.getCuratedExtensionsList(curatedExtensionsKey).then(curatedList => {
 				assert.equal(curatedList.length, 0);
 			});
 		});
 	});
 
+	test('Maps action2 to action.', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: false,
+					action2: {
+						type: 'Prompt',
+						properties: {
+							promptText: 'Hello world',
+							commands: []
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.action?.type, 'Prompt');
+		});
+	});
+
 	test('Experiment that is disabled or deleted should be removed from storage', () => {
 		experimentData = {
 			experiments: [
