Allow to specify params in context.${languageID} exp setting (#1768)

Author: dbaeumer

src/extension/completions-core/vscode-node/lib/src/experiments/features.ts

@@ -27,6 +27,7 @@ export type ContextProviderExpSettings = {
 	includeNeighboringFiles: boolean;
 	excludeRelatedFiles: boolean;
 	timeBudget: number;
+	params?: Record<string, string | boolean | number>;
 }
 
 type InternalContextProviderExpSettings = {
@@ -35,7 +36,8 @@ type InternalContextProviderExpSettings = {
 	includeNeighboringFiles?: boolean;
 	excludeRelatedFiles?: boolean;
 	timeBudget?: number;
-}
+	params?: Record<string, string | boolean | number>;
+};
 
 /** General-purpose API for accessing ExP variable values. */
 export class Features {
@@ -260,9 +262,6 @@ export class Features {
 			try {
 				const parsed: Partial<InternalContextProviderExpSettings> = JSON.parse(value);
 				const ids = this.getProviderIDs(parsed);
-				if (ids.length === 0) {
-					return undefined;
-				}
 				delete parsed.id;
 				delete parsed.ids;
 				return Object.assign({ ids }, { includeNeighboringFiles: false, excludeRelatedFiles: false, timeBudget: 150 }, parsed as Omit<InternalContextProviderExpSettings, 'id' | 'ids'>);

src/extension/completions-core/vscode-node/lib/src/prompt/contextProviderRegistryCSharp.ts

@@ -21,10 +21,16 @@ export function fillInCSharpActiveExperiments(
 ): boolean {
 	const ctx = accessor.get(ICompletionsContextService);
 	try {
-		const csharpContextProviderParams = ctx.get(Features).csharpContextProviderParams(telemetryData);
+		const features = ctx.get(Features);
+		const csharpContextProviderParams = features.csharpContextProviderParams(telemetryData);
 		if (csharpContextProviderParams) {
 			const params = JSON.parse(csharpContextProviderParams) as ContextProviderParams;
 			for (const [key, value] of Object.entries(params)) { activeExperiments.set(key, value); }
+		} else {
+			const params = features.getContextProviderExpSettings('csharp')?.params;
+			if (params) {
+				for (const [key, value] of Object.entries(params)) { activeExperiments.set(key, value); }
+			}
 		}
 	} catch (e) {
 		logger.debug(ctx.get(LogTarget), `Failed to get the active C# experiments for the Context Provider API`, e);

src/extension/completions-core/vscode-node/lib/src/prompt/contextProviderRegistryCpp.ts

@@ -41,15 +41,21 @@ export function fillInCppVSCodeActiveExperiments(
 function addActiveExperiments(accessor: ServicesAccessor, activeExperiments: ActiveExperiments, telemetryData: TelemetryWithExp) {
 	try {
 		const ctx = accessor.get(ICompletionsContextService);
+		const features = ctx.get(Features);
 		const logTarget = ctx.get(LogTarget);
 		let params = cppContextProviderParamsDefault;
-		const cppContextProviderParams = ctx.get(Features).cppContextProviderParams(telemetryData);
+		const cppContextProviderParams = features.cppContextProviderParams(telemetryData);
 		if (cppContextProviderParams) {
 			try {
 				params = JSON.parse(cppContextProviderParams) as CppContextProviderParams;
 			} catch (e) {
 				logger.error(logTarget, 'Failed to parse cppContextProviderParams', e);
 			}
+		} else {
+			const params = features.getContextProviderExpSettings('cpp')?.params;
+			if (params) {
+				for (const [key, value] of Object.entries(params)) { activeExperiments.set(key, value); }
+			}
 		}
 		for (const [key, value] of Object.entries(params)) { activeExperiments.set(key, value); }
 	} catch (e) {

src/extension/completions-core/vscode-node/lib/src/prompt/contextProviderRegistryTs.ts

@@ -32,14 +32,20 @@ export function fillInTsActiveExperiments(
 	}
 	const ctx = accessor.get(ICompletionsContextService);
 	try {
-		const tsContextProviderParams = ctx.get(Features).tsContextProviderParams(telemetryData);
+		const features = ctx.get(Features);
+		const tsContextProviderParams = features.tsContextProviderParams(telemetryData);
 		if (tsContextProviderParams) {
 			const params = JSON.parse(tsContextProviderParams) as ContextProviderParams;
 			for (const [key, value] of Object.entries(params)) { activeExperiments.set(key, value); }
+		} else {
+			const params = features.getContextProviderExpSettings('typescript')?.params;
+			if (params) {
+				for (const [key, value] of Object.entries(params)) { activeExperiments.set(key, value); }
+			}
 		}
 	} catch (e) {
 		logger.debug(ctx.get(LogTarget), `Failed to get the active TypeScript experiments for the Context Provider API`, e);
 		return false;
 	}
 	return true;
-}
+}