Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Commit ca6ee8a

Browse files
author
MikhailArkhipov
committed
PR feedback
1 parent b84d9a5 commit ca6ee8a

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

src/Analysis/Engine/Impl/Infrastructure/Extensions/StringBuilderExtensions.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,15 @@ public static StringBuilder EnsureEndsWithWhiteSpace(this StringBuilder sb, int
3737
if (whiteSpaceCount > 0) {
3838
sb.Append(' ', whiteSpaceCount);
3939
}
40-
40+
41+
return sb;
42+
}
43+
44+
public static StringBuilder AppendIf(this StringBuilder sb, bool condition, string value) {
45+
if (condition) {
46+
sb.Append(value);
47+
}
48+
4149
return sb;
4250
}
4351
}

src/Analysis/Engine/Impl/Values/Protocols.cs

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -397,34 +397,30 @@ private string GetNameFromValues() {
397397
// Enumerate manually since SelectMany drops empty/unknown values
398398
var sb = new StringBuilder("tuple[");
399399
for (var i = 0; i < _values.Length; i++) {
400-
if (i > 0) {
401-
sb.Append(", ");
402-
}
403-
sb.Append(GetParameterString(_values[i].ToArray()));
400+
sb.AppendIf(i > 0, ", ");
401+
AppendParameterString(sb, _values[i].ToArray());
404402
}
405403
sb.Append(']');
406404
return sb.ToString();
407405
}
408406

409-
private string GetParameterString(AnalysisValue[] sets) {
407+
private void AppendParameterString(StringBuilder sb, AnalysisValue[] sets) {
410408
if (sets.Length == 0) {
411-
return "?";
409+
sb.Append('?');
410+
return;
412411
}
413-
var sb = new StringBuilder();
414-
if (sets.Length > 1) {
415-
sb.Append('[');
412+
413+
if (sets.Length == 1) {
414+
sb.Append(sets[0] is IHasQualifiedName qn ? qn.FullyQualifiedName : sets[0].ShortDescription);
415+
return;
416416
}
417+
418+
sb.Append('[');
417419
for (var i = 0; i < sets.Length; i++) {
418-
if (i > 0) {
419-
sb.Append(", ");
420-
}
421-
var desc = sets[i] is IHasQualifiedName qn ? qn.FullyQualifiedName : sets[i].ShortDescription;
422-
sb.Append(desc);
420+
sb.AppendIf(i > 0, ", ");
421+
sb.Append(sets[i] is IHasQualifiedName qn ? qn.FullyQualifiedName : sets[i].ShortDescription);
423422
}
424-
if (sets.Length > 1) {
425-
sb.Append(']');
426-
}
427-
return sb.ToString();
423+
sb.Append(']');
428424
}
429425

430426
protected override void EnsureMembers(IDictionary<string, IAnalysisSet> members) {

0 commit comments

Comments
 (0)