Code style changes to improve readability

sharwell · sharwell · commit a93570e6f534 · 2018-06-06T15:47:36.000-05:00
diff --git a/src/EditorFeatures/TestUtilities/Diagnostics/NamingStyles/NamingStylesTestOptionSets.cs b/src/EditorFeatures/TestUtilities/Diagnostics/NamingStyles/NamingStylesTestOptionSets.cs
@@ -109,12 +109,14 @@ private NamingStylePreferences FieldNamesAreCamelCaseOption()
                 prefix: "",
                 suffix: "",
                 wordSeparator: "");
+
             var namingRule = new SerializableNamingRule()
             {
                 SymbolSpecificationID = symbolSpecification.ID,
                 NamingStyleID = namingStyle.ID,
                 EnforcementLevel = DiagnosticSeverity.Error
             };
+
             var info = new NamingStylePreferences(
                 ImmutableArray.Create(symbolSpecification),
                 ImmutableArray.Create(namingStyle),
@@ -139,12 +141,14 @@ private NamingStylePreferences FieldNamesAreCamelCaseWithUnderscoreOption()
                 prefix: "_",
                 suffix: "",
                 wordSeparator: "");
+
             var namingRule = new SerializableNamingRule()
             {
                 SymbolSpecificationID = symbolSpecification.ID,
                 NamingStyleID = namingStyle.ID,
                 EnforcementLevel = DiagnosticSeverity.Error
             };
+
             var info = new NamingStylePreferences(
                 ImmutableArray.Create(symbolSpecification),
                 ImmutableArray.Create(namingStyle),
diff --git a/src/Workspaces/Core/Portable/NamingStyles/NamingStyle.cs b/src/Workspaces/Core/Portable/NamingStyles/NamingStyle.cs
@@ -328,14 +328,14 @@ private string CreateCompliantNameReusingPartialPrefixesAndSuffixes(string name)
         private static string StripCommonPrefixes(string name)
         {
             var index = 0;
-            while (name.Length > index + 1)
+            while (index + 1 < name.Length)
             {
                 switch (char.ToLowerInvariant(name[index]))
                 {
                 case 'm':
                 case 's':
                 case 't':
-                    if (name.Length > index + 2 && name[index + 1] == '_')
+                    if (index + 2 < name.Length && name[index + 1] == '_')
                     {
                         index += 2;
                         continue;

Original file line number	Diff line number	Diff line change
`@@ -328,14 +328,14 @@ private string CreateCompliantNameReusingPartialPrefixesAndSuffixes(string name)`
`328`	`328`	`private static string StripCommonPrefixes(string name)`
`329`	`329`	`{`
`330`	`330`	`var index = 0;`
`331`		`- while (name.Length > index + 1)`
	`331`	`+ while (index + 1 < name.Length)`
`332`	`332`	`{`
`333`	`333`	`switch (char.ToLowerInvariant(name[index]))`
`334`	`334`	`{`
`335`	`335`	`case 'm':`
`336`	`336`	`case 's':`
`337`	`337`	`case 't':`
`338`		`- if (name.Length > index + 2 && name[index + 1] == '_')`
	`338`	`+ if (index + 2 < name.Length && name[index + 1] == '_')`
`339`	`339`	`{`
`340`	`340`	`index += 2;`
`341`	`341`	`continue;`