Skip to content

Commit 526bae2

Browse files
author
Andrew Hall
authored
Add call to setupTelemetryEnvironmentAsync (#5922)
* Add call to setupTelemetryEnvironmentAsync * Make optional
1 parent 58a7151 commit 526bae2

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

src/csharpDevKitExports.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ export interface CSharpDevKitExports {
1313
components: Readonly<{ [key: string]: string }>;
1414
hasServerProcessLoaded: () => boolean;
1515
serverProcessLoaded: vscode.Event<void>;
16-
writeCommonPropsAsync: (context: vscode.ExtensionContext) => Promise<string | undefined>;
16+
setupTelemetryEnvironmentAsync: (env: NodeJS.ProcessEnv) => Promise<string | undefined>;
1717
}

src/lsptoolshost/roslynLanguageServer.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,8 @@ export class RoslynLanguageServer {
409409

410410
const csharpDevkitArgs = await this.getCSharpDevkitExportArgs(csharpDevkitExtension, options);
411411
args = args.concat(csharpDevkitArgs);
412+
413+
await this.setupDevKitEnvironment(env, csharpDevkitExtension);
412414
} else {
413415
// C# Dev Kit is not installed - continue C#-only activation.
414416
_channel.appendLine('Activating C# standalone...');
@@ -528,6 +530,21 @@ export class RoslynLanguageServer {
528530
return csharpIntelliCodeArgs;
529531
}
530532

533+
private async setupDevKitEnvironment(
534+
env: NodeJS.ProcessEnv,
535+
csharpDevkitExtension: vscode.Extension<CSharpDevKitExports>
536+
): Promise<void> {
537+
const exports: CSharpDevKitExports = await csharpDevkitExtension.activate();
538+
539+
// setupTelemetryEnvironmentAsync was a later addition to devkit (not in preview 1)
540+
// so it may not exist in whatever version of devkit the user has installed
541+
if (!exports.setupTelemetryEnvironmentAsync) {
542+
return;
543+
}
544+
545+
await exports.setupTelemetryEnvironmentAsync(env);
546+
}
547+
531548
private getLanguageServicesDevKitComponentPath(csharpDevKitExports: CSharpDevKitExports): string {
532549
return path.join(
533550
csharpDevKitExports.components['@microsoft/visualstudio-languageservices-devkit'],

0 commit comments

Comments
 (0)