goSurvey: update language in Go Developer survey prompt

Also fix a small bug.

Change-Id: I7d745e0cec00cbb17b7878fb82579620b60d9a61
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/355975
Trust: Rebecca Stambler <[email protected]>
Trust: Hyang-Ah Hana Kim <[email protected]>
Run-TryBot: Rebecca Stambler <[email protected]>
TryBot-Result: kokoro <[email protected]>
Reviewed-by: Hyang-Ah Hana Kim <[email protected]>

Author: stamblerre

src/goDeveloperSurvey.ts

@@ -43,7 +43,7 @@ export function maybePromptForDeveloperSurvey() {
 		return;
 	}
 	const now = new Date();
-	let cfg = shouldPromptForSurvey(now, getSurveyConfig());
+	let cfg = shouldPromptForSurvey(now, getDeveloperSurveyConfig());
 	if (!cfg) {
 		return;
 	}
@@ -121,12 +121,13 @@ export function shouldPromptForSurvey(now: Date, cfg: DeveloperSurveyConfig): De
 	return cfg;
 }
 
-async function promptForDeveloperSurvey(cfg: DeveloperSurveyConfig, now: Date): Promise<DeveloperSurveyConfig> {
+export async function promptForDeveloperSurvey(cfg: DeveloperSurveyConfig, now: Date): Promise<DeveloperSurveyConfig> {
 	let selected = await vscode.window.showInformationMessage(
 		// TODO(rstambler): Figure out how to phrase this.
-		'Looks like you are coding in Go! We are currently running a Go developer survey...',
+		`Looks like you are coding in Go! Help ensure Go is meeting your needs
+by participating in this 10-minute survey by ${endDate.toDateString()}?`,
 		'Yes',
-		'Not now',
+		'Remind me later',
 		'Never'
 	);
 
@@ -176,7 +177,7 @@ To opt-out of all survey prompts, please set 'go.survey.prompt' to false.`,
 
 export const developerSurveyConfig = 'developerSurveyConfig';
 
-function getSurveyConfig(): DeveloperSurveyConfig {
+export function getDeveloperSurveyConfig(): DeveloperSurveyConfig {
 	return getStateConfig(developerSurveyConfig) as DeveloperSurveyConfig;
 }
 

src/goSurvey.ts

@@ -11,7 +11,12 @@ import { getLocalGoplsVersion, lastUserAction, latestConfig } from './goLanguage
 import { outputChannel } from './goStatus';
 import { extensionId } from './const';
 import { getFromGlobalState, getFromWorkspaceState, updateGlobalState } from './stateUtils';
-import { developerSurveyConfig } from './goDeveloperSurvey';
+import {
+	developerSurveyConfig,
+	getDeveloperSurveyConfig,
+	maybePromptForDeveloperSurvey,
+	promptForDeveloperSurvey
+} from './goDeveloperSurvey';
 import { getGoConfig } from './config';
 
 // GoplsSurveyConfig is the set of global properties used to determine if
@@ -50,7 +55,7 @@ export function maybePromptForGoplsSurvey() {
 		return;
 	}
 	const now = new Date();
-	let cfg = shouldPromptForSurvey(now, getSurveyConfig());
+	let cfg = shouldPromptForSurvey(now, getGoplsSurveyConfig());
 	if (!cfg) {
 		return;
 	}
@@ -200,7 +205,7 @@ To opt-out of all survey prompts, please disable the 'Go > Survey: Prompt' setti
 
 export const goplsSurveyConfig = 'goplsSurveyConfig';
 
-function getSurveyConfig(): GoplsSurveyConfig {
+function getGoplsSurveyConfig(): GoplsSurveyConfig {
 	return getStateConfig(goplsSurveyConfig) as GoplsSurveyConfig;
 }
 
@@ -244,21 +249,36 @@ export function getStateConfig(globalStateKey: string, workspace?: boolean): any
 
 export async function showSurveyConfig() {
 	// TODO(rstambler): Add developer survey config.
-	outputChannel.appendLine('Survey Configuration');
-	outputChannel.appendLine(JSON.stringify(getSurveyConfig(), null, 2));
+	outputChannel.appendLine('HaTs Survey Configuration');
+	outputChannel.appendLine(JSON.stringify(getGoplsSurveyConfig(), null, 2));
 	outputChannel.show();
 
-	const selected = await vscode.window.showInformationMessage('Prompt for survey?', 'Yes', 'Maybe', 'No');
+	outputChannel.appendLine('Developer Survey Configuration');
+	outputChannel.appendLine(JSON.stringify(getDeveloperSurveyConfig(), null, 2));
+	outputChannel.show();
+
+	let selected = await vscode.window.showInformationMessage('Prompt for HaTS survey?', 'Yes', 'Maybe', 'No');
 	switch (selected) {
 		case 'Yes':
-			promptForGoplsSurvey(getSurveyConfig(), new Date());
+			promptForGoplsSurvey(getGoplsSurveyConfig(), new Date());
 			break;
 		case 'Maybe':
 			maybePromptForGoplsSurvey();
 			break;
 		default:
 			break;
 	}
+	selected = await vscode.window.showInformationMessage('Prompt for Developer survey?', 'Yes', 'Maybe', 'No');
+	switch (selected) {
+		case 'Yes':
+			promptForDeveloperSurvey(getDeveloperSurveyConfig(), new Date());
+			break;
+		case 'Maybe':
+			maybePromptForDeveloperSurvey();
+			break;
+		default:
+			break;
+	}
 }
 
 export const timeMinute = 1000 * 60;