Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle incomingSettings and profileObject being null #1504

Merged
merged 3 commits into from
Jun 19, 2021
Merged

Handle incomingSettings and profileObject being null #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3ef986
Added null check for incomingSettings.Powershell to prevent SendFeatu…
dkattan Jun 18, 2021
49dcfef
Added null check in GetProfilePathFromProfileObject to prevent NullRe…
dkattan Jun 18, 2021
8f76f4f
Update src/PowerShellEditorServices.Hosting/Commands/StartEditorServi…
andyleejordan Jun 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,10 @@ private EditorServicesConfig CreateConfigObject()
private string GetProfilePathFromProfileObject(PSObject profileObject, ProfileUserKind userKind, ProfileHostKind hostKind)
{
string profilePathName = $"{userKind}{hostKind}";

if (profileObject is null)
{
return null;
}
string pwshProfilePath = (string)profileObject.Properties[profilePathName].Value;

if (hostKind == ProfileHostKind.AllHosts)
Expand Down
2 changes: 1 addition & 1 deletion src/PowerShellEditorServices/Services/Workspace/Handlers/ConfigurationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public override async Task<Unit> Handle(DidChangeConfigurationParams request, Ca
{
LanguageServerSettingsWrapper incomingSettings = request.Settings.ToObject<LanguageServerSettingsWrapper>();
this._logger.LogTrace("Handling DidChangeConfiguration");
if (incomingSettings == null)
if (incomingSettings is null || incomingSettings.Powershell is null)
{
this._logger.LogTrace("Incoming settings were null");
return await Unit.Task.ConfigureAwait(false);
Expand Down