Skip to content

Commit

Permalink
Get rid of some more nullable warnings
Browse files Browse the repository at this point in the history
Not all nullable warnings will be able to be removed as long as this
code still targets net461; for example, string.IsNullOrEmpty guarantees
that the string isn't null, but the annotations required for the
compiler to know that weren't added until the .NET Core era. So until
the projects targets a modern version of .NET, the only way to get rid
of nullable references like these is to use the ! operator every time,
which will quickly get tedious.
rmunn committed Jun 21, 2024
1 parent 8bd43d4 commit 47c6e73
Showing 3 changed files with 13 additions and 12 deletions.
8 changes: 4 additions & 4 deletions src/SolidGui/DataShapesDialog.cs
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ namespace SolidGui
{
public partial class DataShapesDialog : Form
{
private FindReplaceDialog _searchDialog;
private FindReplaceDialog? _searchDialog;

public DataShapesDialog(FindReplaceDialog searchDialog, MainWindowPM mwp)
{
@@ -34,9 +34,9 @@ public DataShapesDialog(FindReplaceDialog searchDialog, MainWindowPM mwp)
_mainWindowPm = mwp;
}

private MainWindowPM _mainWindowPm;
private MainWindowPM? _mainWindowPm;

private IEnumerable<SfmDictionary.DataShape> _shapes;
private IEnumerable<SfmDictionary.DataShape>? _shapes;

private void _closeButton_Click(object sender, EventArgs e)
{
@@ -166,7 +166,7 @@ except that dollars ($1$2) would need to be backslashes (\1\2).
if any of the fields have hard-wrapped data.";

RegexItem r = RegexItem.GetCustomRegex(sbFind.ToString(), sbReplace.ToString(), help, true);
_searchDialog.LaunchSearch(r);
_searchDialog?.LaunchSearch(r);

}

3 changes: 2 additions & 1 deletion src/SolidGui/DataValuesDialog.cs
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ public DataValuesDialog(MainWindowPM mwp)
_mainWindowPm = mwp;
}

private MainWindowPM _mainWindowPm;
private MainWindowPM? _mainWindowPm;

private void _runButton_Click(object sender, EventArgs e)
{
@@ -30,6 +30,7 @@ private void _runButton_Click(object sender, EventArgs e)
private void Run()
{
if (String.IsNullOrEmpty(_markersTextBox.Text.Trim())) return;
if (_mainWindowPm == null) return;

int max = (int)maxNumericUpDown.Value;

14 changes: 7 additions & 7 deletions src/SolidGui/QuickFixer.cs
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@ private void PropagateField(string markerOfFieldToPropagate, string markerOfFiel
{
foreach (Record record in _dictionary.Records)
{
SfmFieldModel fieldToCopy = null;
SfmFieldModel? fieldToCopy = null;
for (int i = 0; i < record.Fields.Count; i++)
{
SfmFieldModel field = record.Fields[i];
@@ -244,13 +244,13 @@ private void AddNewEntries(List<RecordAddition> additions, StringBuilder log)
SolidSettings nullSettings = new SolidSettings(); // JMC: why a new bunch?
foreach (RecordAddition addition in additions)
{
string switchToCitationForm;
Record targetRecord = FindRecordByCitationFormOrLexemeForm(addition.targetHeadWord, out switchToCitationForm);
if (targetRecord == null)
string? switchToCitationForm;
Record? targetRecord = FindRecordByCitationFormOrLexemeForm(addition.targetHeadWord, out switchToCitationForm);
if (targetRecord is null)
{
targetRecord = FindRecordContainingVariantOrSubEntry(addition.targetHeadWord);
}
if (null == targetRecord)
if (targetRecord is null)
{
Record r = new Record();
var b = new StringBuilder();
@@ -309,7 +309,7 @@ private void SplitFieldsWithMultipleItems(List<string> markers, StringBuilder lo
}


private Record FindRecordByCitationFormOrLexemeForm(string form, out string switchToCitationForm)
private Record? FindRecordByCitationFormOrLexemeForm(string form, out string? switchToCitationForm)
{
switchToCitationForm = null;
form = form.Trim();
@@ -348,7 +348,7 @@ private Record FindRecordByCitationFormOrLexemeForm(string form, out string swit

return null;
}
private Record FindRecordContainingVariantOrSubEntry(string form)
private Record? FindRecordContainingVariantOrSubEntry(string form)
{

foreach (Record record in _dictionary.Records)

0 comments on commit 47c6e73

Please sign in to comment.