Skip to content

Commit 2468245

Browse files
committed
Corrected some bugs in the way Descriptions were displayed
1 parent 127833d commit 2468245

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Rubberduck.RegexAssistant/IRegularExpression.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public string Description
2727
{
2828
get
2929
{
30-
return string.Join(", ", Subexpressions.Select(exp => exp.Description)) + " " + Quantifier.HumanReadable();
30+
return string.Join(Environment.NewLine, Subexpressions.Select(exp => exp.Description));
3131
}
3232
}
3333

@@ -55,7 +55,7 @@ public string Description
5555
{
5656
get
5757
{
58-
return string.Format(AssistantResources.ExpressionDescription_AlternativesExpression, Quantifier.HumanReadable()) + string.Join(Environment.NewLine, Subexpressions);
58+
return AssistantResources.ExpressionDescription_AlternativesExpression + Environment.NewLine + string.Join(Environment.NewLine, Subexpressions.Select(exp => exp.Description));
5959
}
6060
}
6161

Rubberduck.RegexAssistant/Rubberduck.RegexAssistant.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Rubberduck.RegexAssistant</RootNamespace>
1111
<AssemblyName>Rubberduck.RegexAssistant</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>

Rubberduck.RegexAssistant/i18n/AssistantResources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Rubberduck.RegexAssistant/i18n/AssistantResources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
<value>Matches any "word character". Equivalent to "[a-zA-Z_0-9]"</value>
188188
</data>
189189
<data name="ExpressionDescription_AlternativesExpression" xml:space="preserve">
190-
<value>Matches one of the following alternatives {0}.</value>
190+
<value>Matches one of the following alternatives:</value>
191191
</data>
192192
<data name="PatternDescription_AnchorEnd" xml:space="preserve">
193193
<value>$ ensures all characters of the string are consumed</value>

0 commit comments

Comments
 (0)