Reformat and contract improvments.

Author: Oren (electricessence)

CsvReader.cs

@@ -1,8 +1,8 @@
 using Open.Disposable;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.IO;
-using System.Text;
 
 namespace Open.Text.CSV
 {
@@ -38,7 +38,8 @@ public string[][] ReadRows()
 		public static bool TryGetRow(StreamReader source, out string[] row, ref int maxColumns)
 		{
 			if (source == null)
-				throw new ArgumentNullException("source");
+				throw new ArgumentNullException(nameof(source));
+			Contract.EndContractBlock();
 
 			if (!source.EndOfStream)
 			{
@@ -59,22 +60,24 @@ public static string[] GetRow(StreamReader source, ref int maxColumns)
 		public static string[][] GetRows(StreamReader source, out int maxColumns)
 		{
 			if (source == null)
-				throw new ArgumentNullException("source");
+				throw new ArgumentNullException(nameof(source));
+			Contract.EndContractBlock();
 
 			maxColumns = 0;
 			var lines = new List<string[]>();
 			while (TryGetRow(source, out string[] row, ref maxColumns))
-					lines.Add(row);
+				lines.Add(row);
 
 			return lines.ToArray();
 		}
 
 		public static string[][] GetRowsFromFile(string filepath, out int maxColumns)
 		{
 			if (filepath == null)
-				throw new ArgumentNullException("filepath");
+				throw new ArgumentNullException(nameof(filepath));
 			if (String.IsNullOrWhiteSpace(filepath))
-				throw new ArgumentException("Cannot be empty or only whitespace.", "filepath");
+				throw new ArgumentException("Cannot be empty or only whitespace.", nameof(filepath));
+			Contract.EndContractBlock();
 
 			if (File.Exists(filepath))
 				using (var s = new StreamReader((new FileInfo(filepath)).OpenRead()))

CsvRow.cs

@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.Linq;
-using System.Text;
 
 namespace Open.Text.CSV
 {
 	public class CsvRow
 	{
 		public CsvRow(string[] headerRow)
 		{
-			_headerRow = headerRow ?? throw new ArgumentNullException("headerRow");
+			_headerRow = headerRow ?? throw new ArgumentNullException(nameof(headerRow));
 		}
 
 		string[] _headerRow;
@@ -18,10 +18,12 @@ public CsvRow(string[] headerRow)
 
 		public string[] GetRow(IDictionary<string, object> values)
 		{
-			if(values==null) throw new ArgumentNullException("values");
+			if (values == null) throw new ArgumentNullException(nameof(values));
+			Contract.EndContractBlock();
+
 			return _headerRow
 				.Select(key => values.TryGetValue(key, out object value) ? CsvUtility.ExportValue(value) : null)
 				.ToArray();
 		}
-    }
+	}
 }

CsvWriter.cs

@@ -1,6 +1,7 @@
 using Open.Disposable;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.IO;
 using System.Text;
 
@@ -37,7 +38,8 @@ public static void WriteValue(TextWriter writer, object value = null, bool force
 
 		public static void WriteRow(TextWriter writer, object[] row, bool forceQuotes = false)
 		{
-			if (row == null) throw new ArgumentNullException("row");
+			if (row == null) throw new ArgumentNullException(nameof(row));
+			Contract.EndContractBlock();
 
 			foreach (var o in row)
 				WriteValue(writer, o, forceQuotes);
@@ -47,7 +49,8 @@ public static void WriteRow(TextWriter writer, object[] row, bool forceQuotes =
 
 		public static void WriteRows(TextWriter writer, object[][] rows, bool forceQuotes = false)
 		{
-			if (rows == null) throw new ArgumentNullException("rows");
+			if (rows == null) throw new ArgumentNullException(nameof(rows));
+			Contract.EndContractBlock();
 
 			foreach (var row in rows)
 				WriteRow(writer, row, forceQuotes);

ExcelCsvExtensions.cs

@@ -12,7 +12,7 @@ public static void WriteCsvExcelValue(this TextWriter writer, string value)
 
 		public static void WriteCsvExcelHyperlink(this TextWriter writer, Uri link, string text = null)
 		{
-			if (link == null) throw new ArgumentNullException("link");
+			if (link == null) throw new ArgumentNullException(nameof(link));
 
 			writer.WriteCsvExcelHyperlink(link.ToString(), text);
 		}
@@ -29,7 +29,7 @@ public static void WriteExcelValue(this CsvWriter writer, string value)
 
 		public static void WriteExcelHyperlink(this CsvWriter writer, Uri link, string text = null)
 		{
-			if (link == null) throw new ArgumentNullException("link");
+			if (link == null) throw new ArgumentNullException(nameof(link));
 
 			WriteExcelHyperlink(writer, link.ToString(), text);
 		}