Simpler code (same as in String.Manipulation.cs). (#15223)

cincuranet · stephentoub · commit b3957a3128c8 · 2017-11-26T09:44:54.000-05:00
diff --git a/src/mscorlib/src/System/String.Comparison.cs b/src/mscorlib/src/System/String.Comparison.cs
@@ -798,12 +798,7 @@ public Boolean EndsWith(String value, Boolean ignoreCase, CultureInfo culture)
                 return true;
             }
 
-            CultureInfo referenceCulture;
-            if (culture == null)
-                referenceCulture = CultureInfo.CurrentCulture;
-            else
-                referenceCulture = culture;
-
+            CultureInfo referenceCulture = culture ?? CultureInfo.CurrentCulture;
             return referenceCulture.CompareInfo.IsSuffix(this, value, ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None);
         }
 
@@ -1134,12 +1129,7 @@ public Boolean StartsWith(String value, Boolean ignoreCase, CultureInfo culture)
                 return true;
             }
 
-            CultureInfo referenceCulture;
-            if (culture == null)
-                referenceCulture = CultureInfo.CurrentCulture;
-            else
-                referenceCulture = culture;
-
+            CultureInfo referenceCulture = culture ?? CultureInfo.CurrentCulture;
             return referenceCulture.CompareInfo.IsPrefix(this, value, ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -798,12 +798,7 @@ public Boolean EndsWith(String value, Boolean ignoreCase, CultureInfo culture)`
`798`	`798`	`return true;`
`799`	`799`	`}`
`800`	`800`
`801`		`- CultureInfo referenceCulture;`
`802`		`- if (culture == null)`
`803`		`- referenceCulture = CultureInfo.CurrentCulture;`
`804`		`- else`
`805`		`- referenceCulture = culture;`
`806`		`-`
	`801`	`+ CultureInfo referenceCulture = culture ?? CultureInfo.CurrentCulture;`
`807`	`802`	`return referenceCulture.CompareInfo.IsSuffix(this, value, ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None);`
`808`	`803`	`}`
`809`	`804`
`@@ -1134,12 +1129,7 @@ public Boolean StartsWith(String value, Boolean ignoreCase, CultureInfo culture)`
`1134`	`1129`	`return true;`
`1135`	`1130`	`}`
`1136`	`1131`
`1137`		`- CultureInfo referenceCulture;`
`1138`		`- if (culture == null)`
`1139`		`- referenceCulture = CultureInfo.CurrentCulture;`
`1140`		`- else`
`1141`		`- referenceCulture = culture;`
`1142`		`-`
	`1132`	`+ CultureInfo referenceCulture = culture ?? CultureInfo.CurrentCulture;`
`1143`	`1133`	`return referenceCulture.CompareInfo.IsPrefix(this, value, ignoreCase ? CompareOptions.IgnoreCase : CompareOptions.None);`
`1144`	`1134`	`}`
`1145`	`1135`