Skip to content

Commit c4202e7

Browse files
committed
Set EnableProfileLoading default to true
So it can be turned off if needed, but otherwise has a sane default. We need to turn it off during E2E testing for CI.
1 parent d198694 commit c4202e7

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/PowerShellEditorServices/Server/PsesLanguageServer.cs

+9-2
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,17 @@ public async Task StartAsync()
141141
JObject initializationOptions = initializeParams.InitializationOptions as JObject;
142142
HostStartOptions hostStartOptions = new()
143143
{
144-
LoadProfiles = initializationOptions?.GetValue("EnableProfileLoading")?.Value<bool>() ?? false,
144+
// TODO: We need to synchronize our "default" settings as specified
145+
// in the VS Code extension's package.json with the actual default
146+
// values in this project. For now, this is going to be the most
147+
// annoying setting, so we're defaulting this to true.
148+
//
149+
// NOTE: The keys start with a lowercase because OmniSharp's client
150+
// (used for testing) forces it to be that way.
151+
LoadProfiles = initializationOptions?.GetValue("enableProfileLoading")?.Value<bool>() ?? true,
145152
// TODO: Consider deprecating the setting which sets this and
146153
// instead use WorkspacePath exclusively.
147-
InitialWorkingDirectory = initializationOptions?.GetValue("InitialWorkingDirectory")?.Value<string>() ?? workspaceService.WorkspacePath
154+
InitialWorkingDirectory = initializationOptions?.GetValue("initialWorkingDirectory")?.Value<string>() ?? workspaceService.WorkspacePath
148155
};
149156

150157
_psesHost = languageServer.Services.GetService<PsesInternalHost>();

test/PowerShellEditorServices.Test.E2E/LSPTestsFixures.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ public async Task InitializeAsync()
5656
options
5757
.WithInput(_psesProcess.OutputStream)
5858
.WithOutput(_psesProcess.InputStream)
59-
.WithRootUri(DocumentUri.FromFileSystemPath(testdir.FullName))
59+
.WithWorkspaceFolder(DocumentUri.FromFileSystemPath(testdir.FullName), "testdir")
60+
.WithInitializationOptions(new { EnableProfileLoading = false })
6061
.OnPublishDiagnostics(diagnosticParams => Diagnostics.AddRange(diagnosticParams.Diagnostics.Where(d => d != null)))
6162
.OnLogMessage(logMessageParams => Output?.WriteLine($"{logMessageParams.Type}: {logMessageParams.Message}"))
6263
.OnTelemetryEvent(telemetryEventParams => TelemetryEvents.Add(

0 commit comments

Comments
 (0)