Skip to content

Commit 030bafb

Browse files
committed
Clean up handling of empty argument description
1 parent 1b81904 commit 030bafb

File tree

2 files changed

+20
-31
lines changed

2 files changed

+20
-31
lines changed

Source/ExcelDna.IntelliSense/FormattedText.cs

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,19 @@ public FormattedText()
1818
_lines = new List<TextLine>();
1919
}
2020

21-
public void Add(TextLine line) { _lines.Add(line); }
21+
public void Add(TextLine line) => _lines.Add(line);
2222

23-
public void Add(IEnumerable<TextLine> lines) { if (lines != null) _lines.AddRange(lines); }
24-
25-
public IEnumerator<TextLine> GetEnumerator()
23+
public void Add(IEnumerable<TextLine> lines)
2624
{
27-
return _lines.GetEnumerator();
25+
if (lines != null)
26+
_lines.AddRange(lines);
2827
}
2928

30-
IEnumerator IEnumerable.GetEnumerator()
31-
{
32-
return GetEnumerator();
33-
}
29+
public IEnumerator<TextLine> GetEnumerator() => _lines.GetEnumerator();
3430

35-
public override string ToString()
36-
{
37-
return string.Join("\r\n", _lines.Select(l => l.ToString()));
38-
}
31+
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
32+
33+
public override string ToString() => string.Join("\r\n", _lines.Select(l => l.ToString()));
3934
}
4035

4136
class TextLine : IEnumerable<TextRun>
@@ -47,31 +42,21 @@ public TextLine()
4742
_runs = new List<TextRun>();
4843
}
4944

50-
public void Add(TextRun run) { _runs.Add(run); }
45+
public void Add(TextRun run) => _runs.Add(run);
5146

47+
public IEnumerator<TextRun> GetEnumerator() => _runs.GetEnumerator();
5248

53-
public IEnumerator<TextRun> GetEnumerator()
54-
{
55-
return _runs.GetEnumerator();
56-
}
57-
58-
IEnumerator IEnumerable.GetEnumerator()
59-
{
60-
return GetEnumerator();
61-
}
49+
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
6250

63-
public override string ToString()
64-
{
65-
return string.Concat(_runs.Select(r => r.Text));
66-
}
51+
public override string ToString() => string.Concat(_runs.Select(r => r.Text));
6752
}
6853

6954
class TextRun
7055
{
7156
public string Text { get; set; }
7257
public FontStyle Style { get; set; }
7358
public string LinkAddress { get; set; }
74-
public bool IsLink { get { return !string.IsNullOrEmpty(LinkAddress); } }
59+
public bool IsLink => !string.IsNullOrEmpty(LinkAddress);
7560
}
7661

7762
}

Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,15 +466,19 @@ FormattedText GetFunctionIntelliSense(FunctionInfo functionInfo, int currentArgI
466466
var formattedText = new FormattedText { nameLine, descriptionLines };
467467
if (functionInfo.ArgumentList.Count > currentArgIndex)
468468
{
469-
var description = GetArgumentDescription(functionInfo.ArgumentList[currentArgIndex]);
470-
formattedText.Add(description);
469+
var description = GetArgumentDescriptionOrNull(functionInfo.ArgumentList[currentArgIndex]);
470+
if (description != null)
471+
formattedText.Add(description);
471472
}
472473

473474
return formattedText;
474475
}
475476

476-
TextLine GetArgumentDescription(FunctionInfo.ArgumentInfo argumentInfo)
477+
TextLine GetArgumentDescriptionOrNull(FunctionInfo.ArgumentInfo argumentInfo)
477478
{
479+
if (string.IsNullOrEmpty(argumentInfo.Description))
480+
return null;
481+
478482
return new TextLine {
479483
new TextRun
480484
{

0 commit comments

Comments
 (0)