Skip to content

Commit e0e33a1

Browse files
authored
Merge pull request #2415 from comintern/next
Add capitalize extension method, use on inspection results.
2 parents d837b17 + a4eb06a commit e0e33a1

33 files changed

+83
-31
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Globalization;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
8+
namespace Rubberduck.Common
9+
{
10+
public static class StringExtensions
11+
{
12+
public static string Captialize(this string input)
13+
{
14+
var tokens = input.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
15+
if (tokens.Length == 0)
16+
{
17+
return input;
18+
}
19+
tokens[0] = CultureInfo.CurrentUICulture.TextInfo.ToTitleCase(tokens[0]);
20+
return string.Join(" ", tokens);
21+
}
22+
}
23+
}

RetailCoder.VBE/Inspections/AssignedByValParameterInspectionResult.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using Antlr4.Runtime;
3+
using Rubberduck.Common;
34
using Rubberduck.Parsing.Grammar;
45
using Rubberduck.Parsing.Symbols;
56
using Rubberduck.VBEditor;
@@ -24,7 +25,7 @@ public override string Description
2425
{
2526
get
2627
{
27-
return string.Format(InspectionsUI.AssignedByValParameterInspectionResultFormat, Target.IdentifierName);
28+
return string.Format(InspectionsUI.AssignedByValParameterInspectionResultFormat, Target.IdentifierName).Captialize();
2829
}
2930
}
3031

RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Generic;
22
using System.Windows.Forms;
33
using Antlr4.Runtime;
4+
using Rubberduck.Common;
45
using Rubberduck.Parsing.Symbols;
56
using Rubberduck.Parsing.VBA;
67
using Rubberduck.Refactorings.Rename;
@@ -28,7 +29,7 @@ public DefaultProjectNameInspectionResult(IInspection inspection, Declaration ta
2829

2930
public override string Description
3031
{
31-
get { return Inspection.Description; }
32+
get { return Inspection.Description.Captialize(); }
3233
}
3334
}
3435

RetailCoder.VBE/Inspections/EmptyStringLiteralInspectionResult.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using Antlr4.Runtime;
3+
using Rubberduck.Common;
34
using Rubberduck.Parsing;
45
using Rubberduck.Parsing.Grammar;
56
using Rubberduck.VBEditor;
@@ -24,7 +25,7 @@ public EmptyStringLiteralInspectionResult(IInspection inspection, QualifiedConte
2425

2526
public override string Description
2627
{
27-
get { return InspectionsUI.EmptyStringLiteralInspectionResultFormat; }
28+
get { return InspectionsUI.EmptyStringLiteralInspectionResultFormat.Captialize(); }
2829
}
2930
}
3031

RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Generic;
22
using System.Windows.Forms;
33
using Antlr4.Runtime;
4+
using Rubberduck.Common;
45
using Rubberduck.Parsing.Symbols;
56
using Rubberduck.Parsing.VBA;
67
using Rubberduck.Refactorings.EncapsulateField;
@@ -29,7 +30,7 @@ public EncapsulatePublicFieldInspectionResult(IInspection inspection, Declaratio
2930

3031
public override string Description
3132
{
32-
get { return string.Format(InspectionsUI.EncapsulatePublicFieldInspectionResultFormat, Target.IdentifierName); }
33+
get { return string.Format(InspectionsUI.EncapsulatePublicFieldInspectionResultFormat, Target.IdentifierName).Captialize(); }
3334
}
3435
}
3536

RetailCoder.VBE/Inspections/FunctionReturnValueNotUsedInspectionResult.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Antlr4.Runtime;
2+
using Rubberduck.Common;
23
using Rubberduck.VBEditor;
34
using System;
45
using System.Collections.Generic;
@@ -45,7 +46,7 @@ public override string Description
4546
{
4647
get
4748
{
48-
return string.Format(InspectionsUI.FunctionReturnValueNotUsedInspectionResultFormat, Target.IdentifierName);
49+
return string.Format(InspectionsUI.FunctionReturnValueNotUsedInspectionResultFormat, Target.IdentifierName).Captialize();
4950
}
5051
}
5152

RetailCoder.VBE/Inspections/IdentifierNotAssignedInspectionResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public IdentifierNotAssignedInspectionResult(IInspection inspection, Declaration
2727

2828
public override string Description
2929
{
30-
get { return string.Format(InspectionsUI.VariableNotAssignedInspectionResultFormat, Target.IdentifierName); }
30+
get { return string.Format(InspectionsUI.VariableNotAssignedInspectionResultFormat, Target.IdentifierName).Captialize(); }
3131
}
3232

3333
public override IEnumerable<CodeInspectionQuickFix> QuickFixes { get { return _quickFixes; } }

RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public override string Description
3131
{
3232
get
3333
{
34-
return string.Format(InspectionsUI.IdentifierNotUsedInspectionResultFormat, Target.DeclarationType.ToLocalizedString(), Target.IdentifierName);
34+
return string.Format(InspectionsUI.IdentifierNotUsedInspectionResultFormat, Target.DeclarationType.ToLocalizedString(), Target.IdentifierName).Captialize();
3535
}
3636
}
3737

RetailCoder.VBE/Inspections/ImplicitActiveSheetReferenceInspectionResult.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using Rubberduck.Common;
23
using Rubberduck.Parsing.Symbols;
34

45
namespace Rubberduck.Inspections
@@ -22,7 +23,7 @@ public ImplicitActiveSheetReferenceInspectionResult(IInspection inspection, Iden
2223

2324
public override string Description
2425
{
25-
get { return string.Format(Inspection.Description, _reference.Declaration.IdentifierName); }
26+
get { return string.Format(Inspection.Description, _reference.Declaration.IdentifierName).Captialize(); }
2627
}
2728
}
2829
}

RetailCoder.VBE/Inspections/ImplicitByRefParameterInspectionResult.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using Rubberduck.Common;
23
using Rubberduck.Parsing;
34
using Rubberduck.Parsing.Grammar;
45

@@ -24,7 +25,7 @@ public ImplicitByRefParameterInspectionResult(IInspection inspection, string ide
2425

2526
public override string Description
2627
{
27-
get { return string.Format(InspectionsUI.ImplicitByRefParameterInspectionResultFormat, _identifierName); }
28+
get { return string.Format(InspectionsUI.ImplicitByRefParameterInspectionResultFormat, _identifierName).Captialize(); }
2829
}
2930
}
3031
}

0 commit comments

Comments
 (0)