Skip to content

Commit c5daa42

Browse files
committed
Fix how we check extension mode
Well, this was dumb, and was the reason for red-herring logs in user reports that their extension was in development mode, and why our telemetry had stopped coming through.
1 parent bcd7076 commit c5daa42

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main.ts

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ export function activate(context: vscode.ExtensionContext): IPowerShellExtension
127127

128128
sessionManager =
129129
new SessionManager(
130+
context,
130131
logger,
131132
documentSelector,
132133
PackageJSON.displayName,

src/session.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ export class SessionManager implements Middleware {
6262
// Initialized by the start() method, since this requires settings
6363
private powershellExeFinder: PowerShellExeFinder;
6464

65-
public readonly InDevelopmentMode = vscode.ExtensionMode.Development;
66-
6765
constructor(
66+
private extensionContext: vscode.ExtensionContext,
6867
private log: Logger,
6968
private documentSelector: DocumentSelector,
7069
hostName: string,
@@ -167,7 +166,7 @@ export class SessionManager implements Middleware {
167166

168167
this.bundledModulesPath = path.resolve(__dirname, this.sessionSettings.bundledModulesPath);
169168

170-
if (this.InDevelopmentMode) {
169+
if (this.extensionContext.extensionMode === vscode.ExtensionMode.Development) {
171170
const devBundledModulesPath =
172171
path.resolve(
173172
__dirname,
@@ -571,7 +570,7 @@ export class SessionManager implements Middleware {
571570
// This enables handling Semantic Highlighting messages in PowerShell Editor Services
572571
this.languageServerClient.registerProposedFeatures();
573572

574-
if (!this.InDevelopmentMode) {
573+
if (this.extensionContext.extensionMode === vscode.ExtensionMode.Production) {
575574
this.languageServerClient.onTelemetry((event) => {
576575
const eventName: string = event.eventName ? event.eventName : "PSESEvent";
577576
const data: any = event.data ? event.data : event
@@ -588,7 +587,7 @@ export class SessionManager implements Middleware {
588587
this.versionDetails = versionDetails;
589588
this.started = true;
590589

591-
if (!this.InDevelopmentMode) {
590+
if (this.extensionContext.extensionMode === vscode.ExtensionMode.Production) {
592591
this.telemetryReporter.sendTelemetryEvent("powershellVersionCheck",
593592
{ powershellVersion: versionDetails.version });
594593
}

0 commit comments

Comments
 (0)