CHANGE: @W-17970149@: The beginnings of refactorings to start removin global state ... #188
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…g global state and make the code more testable
stephen-carter-at-sf
force-pushed
the
sc/Refactor
branch
from
31652f2 to
e453af1
Compare
Comment on lines
62
to
-63
| let diagnosticCollection: vscode.DiagnosticCollection = null; | ||
|
|
||
| let telemetryService: TelemetryServiceImpl = null; | ||
|
|
||
| let customCancellationToken: vscode.CancellationTokenSource | null = null; | ||
|
|
||
| let outputChannel: vscode.LogOutputChannel; | ||
|
|
||
| let sfgeCachePath: string = null; | ||
|
|
||
| let settingsManager: SettingsManager = null; | ||
|
|
There was a problem hiding this comment.
The goal over time will be to remove all this global state slowly but surely.
| this.coreTelemetryService.sendExtensionActivationEvent(hrStart); | ||
| } | ||
|
|
||
| sendCommandEvent(commandName: string, properties: Record<string, string>): void { |
There was a problem hiding this comment.
Tomorrow I'll create a PR separately to fix the tabs vs spaces inconsistencies.
jfeingold35
reviewed
Mar 5, 2025
src/apexguru/apex-guru-service.ts
Outdated
| @@ -56,7 +56,7 @@ export async function runApexGuruOnFile(selection: vscode.Uri, runInfo: RunInfo) | |||
| // TODO: For testability, the diagnostic manager should probably be passed in, not instantiated here. | |||
| new DiagnosticManagerImpl(diagnosticCollection).displayAsDiagnostics([selection.fsPath], convertibles); | |||
| // TODO: For testability, the telemetry service should probably be passed in, not instantiated here. | |||
There was a problem hiding this comment.
Fixed.
src/extension.ts
Outdated
| @@ -117,9 +134,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<vscode | |||
| throw new Error(messages.targeting.error.noFileSelected); | |||
| } | |||
| return _runAndDisplayScanner(Constants.COMMAND_RUN_ON_ACTIVE_FILE, [vscode.window.activeTextEditor.document.fileName], { | |||
| telemetryService: telemetryService, | |||
| telemetryService: await externalServiceProvider.getTelemetryService(), | |||
There was a problem hiding this comment.
Is there a reason not to use the telemetryService you instantiate at line 99?
There was a problem hiding this comment.
Good catch. I was cleaning up my calls and missed this one.
There was a problem hiding this comment.
Fixed.
jfeingold35
previously approved these changes
Mar 5, 2025
stephen-carter-at-sf
force-pushed
the
sc/Refactor
branch
from
1b5a59c to
e76f62d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… and make the code more testable
I'll have a part 2 refactoring in my next PR. But I don't want to overwhelm you both.