Skip to content

Update SettingsHelper to not throw exception if the settings file can not be read #3935

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update SettingsHelper to not throw exception if the settings file can not be read #3935

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions StyleCop.Analyzers/StyleCop.Analyzers/Settings/SettingsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,18 @@ private static SettingsFile GetSettingsFile(AnalyzerOptions options, Func<Source
if (IsStyleCopSettingsFile(additionalFile.Path))
{
SourceText additionalTextContent = additionalFile.GetText(cancellationToken);
var content = getJsonValue(additionalTextContent);
return new SettingsFile(additionalFile.Path, content);
if (additionalTextContent != null)
{
var content = getJsonValue(additionalTextContent);
return new SettingsFile(additionalFile.Path, content);
}
else
{
// Failed to read the file! Probably because of a broken link.
var content = new Lazy<JsonValue>(() => throw new InvalidSettingsException(
$"Settings file at '{additionalFile.Path}' could not be read"));
return new SettingsFile(additionalFile.Path, content);
}
}
}

Expand Down