Names -> Keywords (#6933)

Replacing full type names with keywords when appropriate

Files affected: Race2.cs, arrayasreadonly.cs, exists1.cs, exists2.cs, trueforall1.cs, trueforall2.cs, example1.cs, arraysegment.cs, stringlib.cs, example1.cs, bitstodbl.cs, toint32.cs, binary1.cs, format3.cs.

See #6920

Author: WhiteBlackGoose

samples/snippets/csharp/VS_Snippets_CLR_System/System.ArgumentOutOfRangeException/cs/Race2.cs

@@ -1,11 +1,11 @@
-// <Snippet12>
+// <Snippet12>
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
 
 public class Continent
 {
-   public String Name { get; set; }
+   public string Name { get; set; }
    public int Population { get; set; }
    public Decimal Area { get; set; }
 }
@@ -14,7 +14,7 @@ public class Example
 {
    static ConcurrentBag<Continent> continents = new ConcurrentBag<Continent>();
    static CountdownEvent gate;
-   static String msg = String.Empty;
+   static string msg = string.Empty;
 
    public static void Main()
    {
@@ -45,9 +45,9 @@ public static void Main()
 
    private static void PopulateContinents(Object obj)
    {
-      String name = obj.ToString();
+      string name = obj.ToString();
       lock(msg) {
-         msg += String.Format("Adding '{0}' to the list.\n", name);
+         msg += string.Format("Adding '{0}' to the list.\n", name);
       }
       var continent = new Continent();
       continent.Name = name;

samples/snippets/csharp/VS_Snippets_CLR_System/system.Array.AsReadOnly/CS/arrayasreadonly.cs

@@ -1,4 +1,4 @@
-// The following example wraps an array in a read-only IList.
+// The following example wraps an array in a read-only IList.
 
 // <Snippet1>
 using System;
@@ -16,7 +16,7 @@ public static void Main()  {
       PrintIndexAndValues( myArr );
 
       // Create a read-only IList wrapper around the array.
-      IList<String> myList = Array.AsReadOnly( myArr );
+      IList<string> myList = Array.AsReadOnly( myArr );
 
       // Display the values of the read-only IList.
       Console.WriteLine( "The read-only IList contains the following values:" );
@@ -50,7 +50,7 @@ public static void PrintIndexAndValues( String[] myArr )  {
       Console.WriteLine();
    }
 
-   public static void PrintIndexAndValues( IList<String> myList )  {
+   public static void PrintIndexAndValues( IList<string> myList )  {
       for ( int i = 0; i < myList.Count; i++ )  {
          Console.WriteLine( "   [{0}] : {1}", i, myList[i] );
       }

samples/snippets/csharp/VS_Snippets_CLR_System/system.ArraySegment/CS/arraysegment.cs

@@ -1,4 +1,4 @@
-// The following code example passes an ArraySegment to a method.
+// The following code example passes an ArraySegment to a method.
 
 // <Snippet1>
 using System;
@@ -15,14 +15,14 @@ public static void Main()  {
       PrintIndexAndValues( myArr );
 
       // Define an array segment that contains the entire array.
-      ArraySegment<String> myArrSegAll = new ArraySegment<String>( myArr );
+      ArraySegment<string> myArrSegAll = new ArraySegment<string>( myArr );
 
       // Display the contents of the ArraySegment.
       Console.WriteLine( "The first array segment (with all the array's elements) contains:" );
       PrintIndexAndValues( myArrSegAll );
 
       // Define an array segment that contains the middle five values of the array.
-      ArraySegment<String> myArrSegMid = new ArraySegment<String>( myArr, 2, 5 );
+      ArraySegment<string> myArrSegMid = new ArraySegment<string>( myArr, 2, 5 );
 
       // Display the contents of the ArraySegment.
       Console.WriteLine( "The second array segment (with the middle five elements) contains:" );
@@ -37,7 +37,7 @@ public static void Main()  {
       PrintIndexAndValues( myArrSegMid );
    }
 
-   public static void PrintIndexAndValues( ArraySegment<String> arrSeg )  {
+   public static void PrintIndexAndValues( ArraySegment<string> arrSeg )  {
       for ( int i = arrSeg.Offset; i < (arrSeg.Offset + arrSeg.Count); i++ )  {
          Console.WriteLine( "   [{0}] : {1}", i, arrSeg.Array[i] );
       }

samples/snippets/csharp/VS_Snippets_CLR_System/system.BitConverter.Class/CS/example1.cs

@@ -1,4 +1,4 @@
-// <Snippet3>
+// <Snippet3>
 using System;
 
 public class Example
@@ -8,7 +8,7 @@ public static void Main()
       int value = -16;
       Byte[] bytes = BitConverter.GetBytes(value);
 
-      // Convert bytes back to Int32.
+      // Convert bytes back to int.
       int intValue = BitConverter.ToInt32(bytes, 0);
       Console.WriteLine("{0} = {1}: {2}",
                         value, intValue,

samples/snippets/csharp/VS_Snippets_CLR_System/system.BitConverter.DoubleInt64/CS/bitstodbl.cs

@@ -1,4 +1,4 @@
-//<Snippet1>
+//<Snippet1>
 // Example of the BitConverter.Int64BitsToDouble method.
 using System;
 
@@ -14,7 +14,7 @@ public static void LongBitsToDouble( long argument )
 
         // Display the argument in hexadecimal.
         Console.WriteLine( formatter,
-            String.Format( "0x{0:X16}", argument ), doubleValue );
+            string.Format( "0x{0:X16}", argument ), doubleValue );
     }
 
     public static void Main( )

samples/snippets/csharp/VS_Snippets_CLR_System/system.array.exists/cs/exists1.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 
 public class Example
@@ -23,16 +23,16 @@ public static void Main()
 
 public class StringSearcher
 {
-   Char firstChar;
+   char firstChar;
 
-   public StringSearcher(Char firstChar)
+   public StringSearcher(char firstChar)
    {
-      this.firstChar = Char.ToUpper(firstChar);
+      this.firstChar = char.ToUpper(firstChar);
    }
 
-   public bool StartsWith(String s)
+   public bool StartsWith(string s)
    {
-      if (String.IsNullOrEmpty(s)) return false;
+      if (string.IsNullOrEmpty(s)) return false;
 
       if(s.Substring(0, 1).ToUpper() == firstChar.ToString())
          return true;

samples/snippets/csharp/VS_Snippets_CLR_System/system.array.exists/cs/exists2.cs

@@ -1,4 +1,4 @@
-// <Snippet2>
+// <Snippet2>
 using System;
 
 public class Example
@@ -18,7 +18,7 @@ public static void Main()
          Console.WriteLine("One or more names begin with '{0}': {1}",
                            charToFind,
                            Array.Exists(names,
-                                        s => { if (String.IsNullOrEmpty(s))
+                                        s => { if (string.IsNullOrEmpty(s))
                                                   return false;
 
                                                if (s.Substring(0, 1).ToUpper() == charToFind.ToString())

samples/snippets/csharp/VS_Snippets_CLR_System/system.array.trueforall/cs/trueforall1.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 
 public class Example
@@ -8,7 +8,7 @@ public static void Main()
       String[] values = { "Y2K", "A2000", "DC2A6", "MMXIV", "0C3" };
       if (Array.TrueForAll(values, value => {
                                       int s;
-                                      return Int32.TryParse(value.Substring(value.Length - 1), out s); }
+                                      return int.TryParse(value.Substring(value.Length - 1), out s); }
                                    ))
          Console.WriteLine("All elements end with an integer.");
       else

samples/snippets/csharp/VS_Snippets_CLR_System/system.array.trueforall/cs/trueforall2.cs

@@ -1,4 +1,4 @@
-// <Snippet2>
+// <Snippet2>
 using System;
 
 public class Example
@@ -19,10 +19,10 @@ public static void Main()
          Console.WriteLine("Not all elements end with an integer.");
    }
 
-   private static bool EndsWithANumber(String value)
+   private static bool EndsWithANumber(string value)
    {
       int s;
-      return Int32.TryParse(value.Substring(value.Length - 1), out s);
+      return int.TryParse(value.Substring(value.Length - 1), out s);
    }
 }
 // The example displays the following output:

samples/snippets/csharp/VS_Snippets_CLR_System/system.arraysegment.class/cs/example1.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 using System.Collections.Generic;
 
@@ -10,10 +10,10 @@ public static void Main()
                          "Ebenezer", "Francis", "Gilbert",
                          "Henry", "Irving", "John", "Karl",
                          "Lucian", "Michael" };
-      var partNames = new ArraySegment<String>(names, 2, 5);
+      var partNames = new ArraySegment<string>(names, 2, 5);
 
-      // Cast the ArraySegment object to an IList<String> and enumerate it.
-      var list = (IList<String>) partNames;
+      // Cast the ArraySegment object to an IList<string> and enumerate it.
+      var list = (IList<string>) partNames;
       for (int ctr = 0; ctr <= list.Count - 1; ctr++)
          Console.WriteLine(list[ctr]);
    }

samples/snippets/csharp/VS_Snippets_CLR_System/system.badimageformatexception.class/cs/stringlib.cs

@@ -1,4 +1,4 @@
-// <Snippet2>
+// <Snippet2>
 using System;
 
 public class StringLib
@@ -31,7 +31,7 @@ public string ToProperCase(string title)
          else
             newWords[ctr] = words[ctr];	
       }	
-      return String.Join(" ", newWords); 			
+      return string.Join(" ", newWords); 			
    }
 }
 // Attempting to load the StringLib.dll assembly produces the following output:

samples/snippets/csharp/VS_Snippets_CLR_System/system.bitconverter.toint32/cs/toint32.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 
 public class Example
@@ -26,7 +26,7 @@ private static string FormatBytes(Byte[] bytes)
    {
        string value = "";
        foreach (var byt in bytes)
-          value += String.Format("{0:X2} ", byt);
+          value += string.Format("{0:X2} ", byt);
 
        return value;
    }

samples/snippets/csharp/VS_Snippets_CLR_System/system.boolean.structure/cs/binary1.cs

@@ -1,4 +1,4 @@
-// <Snippet1>
+// <Snippet1>
 using System;
 
 public class Example
@@ -20,8 +20,8 @@ public static void Main()
 
    private static string GetBinaryString(Byte value)
    {
-      String retVal = Convert.ToString(value, 2);
-      return new String('0', 8 - retVal.Length) + retVal;
+      string retVal = Convert.ToString(value, 2);
+      return new string('0', 8 - retVal.Length) + retVal;
    }
 }
 // The example displays the following output:

samples/snippets/csharp/VS_Snippets_CLR_System/system.boolean.structure/cs/format3.cs

@@ -1,4 +1,4 @@
-// <Snippet5>
+// <Snippet5>
 using System;
 using System.Globalization;
 
@@ -12,7 +12,7 @@ public static void Main()
          CultureInfo culture = CultureInfo.CreateSpecificCulture(cultureName);
          BooleanFormatter formatter = new BooleanFormatter(culture);
 
-         String result = String.Format(formatter, "Value for '{0}': {1}", culture.Name, value);
+         string result = string.Format(formatter, "Value for '{0}': {1}", culture.Name, value);
          Console.WriteLine(result);
       }
    }
@@ -38,7 +38,7 @@ public Object GetFormat(Type formatType)
          return null;
    }
 
-   public String Format(String fmt, Object arg, IFormatProvider formatProvider)
+   public string Format(string fmt, Object arg, IFormatProvider formatProvider)
    {
       // Exit if another format provider is used.
       if (! formatProvider.Equals(this)) return null;