Fix strings with s uppercase (#426)

* remove of condition unecessary

* fix strings with s uppercase

* put again condition with discard

Author: lucasnobredev

snippets/csharp/VS_Snippets_CLR_System/system.object.tostring/cs/customize1.cs

@@ -10,14 +10,14 @@ public CList(IEnumerable<T> collection) : base(collection)
    public CList() : base()
    {}
 
-   public override String ToString()
+   public override string ToString()
    {
-      String retVal = String.Empty;
+      string retVal = string.Empty;
       foreach (T item in this) {
-         if (String.IsNullOrEmpty(retVal))
+         if (string.IsNullOrEmpty(retVal))
             retVal += item.ToString();
          else
-            retVal += String.Format(", {0}", item);
+            retVal += string.Format(", {0}", item);
       }
       return retVal;
    }

snippets/csharp/VS_Snippets_CLR_System/system.object.tostring/cs/customize2.cs

@@ -4,29 +4,29 @@
 
 public static class StringExtensions
 {
-   public static String ToString2<T>(this List<T> l)
+   public static string ToString2<T>(this List<T> l)
    {
-      String retVal = String.Empty;
+      string retVal = string.Empty;
       foreach (T item in l)
-         retVal += String.Format("{0}{1}", String.IsNullOrEmpty(retVal) ?
+         retVal += string.Format("{0}{1}", string.IsNullOrEmpty(retVal) ?
                                                      "" : ", ",
                                   item);
-      return String.IsNullOrEmpty(retVal) ? "{}" : "{ " + retVal + " }";
+      return string.IsNullOrEmpty(retVal) ? "{}" : "{ " + retVal + " }";
    }
 
-   public static String ToString<T>(this List<T> l, String fmt)
+   public static string ToString<T>(this List<T> l, string fmt)
    {
-      String retVal = String.Empty;
+      string retVal = string.Empty;
       foreach (T item in l) {
          IFormattable ifmt = item as IFormattable;
          if (ifmt != null)
-            retVal += String.Format("{0}{1}",
-                                    String.IsNullOrEmpty(retVal) ?
+            retVal += string.Format("{0}{1}",
+                                    string.IsNullOrEmpty(retVal) ?
                                        "" : ", ", ifmt.ToString(fmt, null));
          else
             retVal += ToString2(l);
       }
-      return String.IsNullOrEmpty(retVal) ? "{}" : "{ " + retVal + " }";
+      return string.IsNullOrEmpty(retVal) ? "{}" : "{ " + retVal + " }";
    }
 }
 

snippets/csharp/VS_Snippets_CLR_System/system.object.tostring/cs/tostringoverload1.cs

@@ -4,12 +4,12 @@
 public class Automobile
 {
    private int _doors;
-   private String _cylinders;
+   private string _cylinders;
    private int _year;
-   private String _model;
+   private string _model;
 
-   public Automobile(String model, int year , int doors,
-                     String cylinders)
+   public Automobile(string model, int year , int doors,
+                     string cylinders)
    {
       _model = model;
       _year = year;
@@ -20,40 +20,40 @@ public Automobile(String model, int year , int doors,
    public int Doors
    { get { return _doors; } }
 
-   public String Model
+   public string Model
    { get { return _model; } }
 
    public int Year
    { get { return _year; } }
 
-   public String Cylinders
+   public string Cylinders
    { get { return _cylinders; } }
 
-   public override String ToString()
+   public override string ToString()
    {
       return ToString("G");
    }
 
-   public String ToString(String fmt)
+   public string ToString(string fmt)
    {
-      if (String.IsNullOrEmpty(fmt))
+      if (string.IsNullOrEmpty(fmt))
          fmt = "G";
 
       switch (fmt.ToUpperInvariant())
       {
          case "G":
-            return String.Format("{0} {1}", _year, _model);
+            return string.Format("{0} {1}", _year, _model);
          case "D":
-            return String.Format("{0} {1}, {2} dr.",
+            return string.Format("{0} {1}, {2} dr.",
                                  _year, _model, _doors);
          case "C":
-            return String.Format("{0} {1}, {2}",
+            return string.Format("{0} {1}, {2}",
                                  _year, _model, _cylinders);
          case "A":
-            return String.Format("{0} {1}, {2} dr. {3}",
+            return string.Format("{0} {1}, {2} dr. {3}",
                                  _year, _model, _doors, _cylinders);
          default:
-            String msg = String.Format("'{0}' is an invalid format string",
+            string msg = string.Format("'{0}' is an invalid format string",
                                        fmt);
             throw new ArgumentException(msg);
       }

snippets/csharp/VS_Snippets_CLR_System/system.object.tostring/cs/tostringoverload2.cs

@@ -6,7 +6,7 @@ public class Example
 {
    public static void Main()
    {
-      String[] cultureNames = { "en-US", "en-GB", "fr-FR",
+      string[] cultureNames = { "en-US", "en-GB", "fr-FR",
                                 "hr-HR", "ja-JP" };
       Decimal value = 1603.49m;
       foreach (var cultureName in cultureNames) {