Skip to content

Commit d3228bb

Browse files
committed
Merge with conflicts
2 parents 06bb967 + de375de commit d3228bb

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Rubberduck.Parsing/Inspections/Resources/InspectionsUI.Designer.cs

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Rubberduck.Parsing/Inspections/Resources/InspectionsUI.resx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,31 +232,31 @@
232232
<value>The 'Call' statement is no longer required to call procedures, and only exists in the language to support legacy code that required it; it can be safely rewritten to an implicit call.</value>
233233
</data>
234234
<data name="ObsoleteCallStatementInspectionName" xml:space="preserve">
235-
<value>Use of 'Call' statement</value>
235+
<value>Use of obsolete 'Call' statement</value>
236236
</data>
237237
<data name="ObsoleteCommentSyntaxInspectionMeta" xml:space="preserve">
238238
<value>The 'Rem' statement only exists in the language to support legacy code that required it; it can be safely replaced with an apostrophe / single-quote comment.</value>
239239
</data>
240240
<data name="ObsoleteCommentSyntaxInspectionName" xml:space="preserve">
241-
<value>Use of 'Rem' statement</value>
241+
<value>Use of obsolete 'Rem' statement</value>
242242
</data>
243243
<data name="ObsoleteGlobalInspectionMeta" xml:space="preserve">
244244
<value>The 'Global' keyword only exists in the language to support legacy code that required it; it can be safely replaced with the 'Public' modifier.</value>
245245
</data>
246246
<data name="ObsoleteGlobalInspectionName" xml:space="preserve">
247-
<value>Use of 'Global' access modifier</value>
247+
<value>Use of obsolete 'Global' access modifier</value>
248248
</data>
249249
<data name="ObsoleteLetStatementInspectionMeta" xml:space="preserve">
250250
<value>The 'Let' statement only exists in the language to support legacy code that required it; it can be safely removed, since modern VBA does not require that keyword for value assignments.</value>
251251
</data>
252252
<data name="ObsoleteLetStatementInspectionName" xml:space="preserve">
253-
<value>Use of explicit 'Let' statement</value>
253+
<value>Use of obsolete explicit 'Let' statement</value>
254254
</data>
255255
<data name="ObsoleteTypeHintInspectionMeta" xml:space="preserve">
256256
<value>Type hint characters only exist in the language to support legacy code that required it; they can be safely replaced in declarations with an "As" type clause that specifies the type explicitly, and they can be omitted in other identifier references.</value>
257257
</data>
258258
<data name="ObsoleteTypeHintInspectionName" xml:space="preserve">
259-
<value>Type hint usage</value>
259+
<value>Obsolete Type hint usage</value>
260260
</data>
261261
<data name="OptionBaseInspectionMeta" xml:space="preserve">
262262
<value>Arrays are typically zero-based. This option changes the default lower boundary for implicitly-sized arrays, which can introduce off-by-one errors if one isn't cautious.</value>

RubberduckTests/Inspections/GeneralInspectionTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void InspectionMetaStringsExist()
5757
{
5858
var inspections = typeof(InspectionBase).Assembly.GetTypes()
5959
.Where(type => GetAllBaseTypes(type).Contains(typeof(InspectionBase)) && !type.IsAbstract)
60-
.Where(i => string.IsNullOrEmpty(InspectionsUI.ResourceManager.GetString(i.Name + "Meta")))
60+
.Where(i => string.IsNullOrWhiteSpace(InspectionsUI.ResourceManager.GetString(i.Name + "Meta")))
6161
.Select(i => i.Name)
6262
.ToList();
6363

@@ -83,7 +83,7 @@ public void InspectionResultFormatStringsExist()
8383
var inspections = typeof(InspectionBase).Assembly.GetTypes()
8484
.Where(type => GetAllBaseTypes(type).Contains(typeof(InspectionBase)) && !type.IsAbstract)
8585
.Where(i => !inspectionsWithSharedResultFormat.Contains(i.Name) &&
86-
string.IsNullOrEmpty(InspectionsUI.ResourceManager.GetString(i.Name + "ResultFormat")))
86+
string.IsNullOrWhiteSpace(InspectionsUI.ResourceManager.GetString(i.Name + "ResultFormat")))
8787
.Select(i => i.Name)
8888
.ToList();
8989

@@ -99,7 +99,7 @@ public void InspectionNameStrings_AreNotFormatted()
9999
.Where(i =>
100100
{
101101
var value = InspectionsUI.ResourceManager.GetString(i.Name + "Name");
102-
return !string.IsNullOrEmpty(value) && value.Contains("{0}");
102+
return !string.IsNullOrWhiteSpace(value) && value.Contains("{0}");
103103
})
104104
.Select(i => i.Name)
105105
.ToList();

0 commit comments

Comments
 (0)