Reformatted to include braces

18 files changed, 141 insertions, 65 deletions

diff --git a/src/ProtoGen/EnumFieldGenerator.cs b/src/ProtoGen/EnumFieldGenerator.cs
index 1dc2db20..8b56b9e9 100644
--- a/src/ProtoGen/EnumFieldGenerator.cs
+++ b/src/ProtoGen/EnumFieldGenerator.cs
@@ -112,7 +112,8 @@ namespace Google.ProtocolBuffers.ProtoGen
         public void GenerateSerializationCode(TextGenerator writer)

         {

             writer.WriteLine("if (has{0}) {{", PropertyName);

-            writer.WriteLine("  output.WriteEnum({0}, field_names[{2}], (int) {1}, {1});", Number, PropertyName, FieldOrdinal);

+            writer.WriteLine("  output.WriteEnum({0}, field_names[{2}], (int) {1}, {1});", Number, PropertyName,

+                             FieldOrdinal);

             writer.WriteLine("}");

         }

 

diff --git a/src/ProtoGen/EnumGenerator.cs b/src/ProtoGen/EnumGenerator.cs
index f1ddcbc3..35fda7ed 100644
--- a/src/ProtoGen/EnumGenerator.cs
+++ b/src/ProtoGen/EnumGenerator.cs
@@ -48,7 +48,8 @@ namespace Google.ProtocolBuffers.ProtoGen
         public void Generate(TextGenerator writer)

         {

             writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

             writer.WriteLine("{0} enum {1} {{", ClassAccessLevel, Descriptor.Name);

             writer.Indent();

             foreach (EnumValueDescriptor value in Descriptor.Values)

diff --git a/src/ProtoGen/ExtensionGenerator.cs b/src/ProtoGen/ExtensionGenerator.cs
index 824718bf..b779c0a4 100644
--- a/src/ProtoGen/ExtensionGenerator.cs
+++ b/src/ProtoGen/ExtensionGenerator.cs
@@ -35,7 +35,6 @@
 #endregion

 

 using System;

-using System.Globalization;

 using Google.ProtocolBuffers.Descriptors;

 

 namespace Google.ProtocolBuffers.ProtoGen

@@ -124,10 +123,12 @@ namespace Google.ProtocolBuffers.ProtoGen
                 writer.WriteLine("\"{0}\",", Descriptor.FullName);

                 writer.WriteLine("{0}.DefaultInstance,", extends);

                 if (!Descriptor.IsRepeated)

+                {

                     writer.WriteLine("{0},",

                                      Descriptor.HasDefaultValue

                                          ? DefaultValue

                                          : IsNullableType ? "null" : "default(" + type + ")");

+                }

                 writer.WriteLine("{0},",

                                  (Descriptor.MappedType == MappedType.Message) ? type + ".DefaultInstance" : "null");

                 writer.WriteLine("{0},",

diff --git a/src/ProtoGen/FieldGeneratorBase.cs b/src/ProtoGen/FieldGeneratorBase.cs
index 4af013d6..bd1bb08f 100644
--- a/src/ProtoGen/FieldGeneratorBase.cs
+++ b/src/ProtoGen/FieldGeneratorBase.cs
@@ -36,6 +36,7 @@
 

 using System;

 using System.Globalization;

+using System.Text;

 using Google.ProtocolBuffers.Descriptors;

 

 namespace Google.ProtocolBuffers.ProtoGen

@@ -54,7 +55,10 @@ namespace Google.ProtocolBuffers.ProtoGen
         public abstract void WriteEquals(TextGenerator writer);

         public abstract void WriteToString(TextGenerator writer);

 

-        public int FieldOrdinal { get { return _fieldOrdinal; } }

+        public int FieldOrdinal

+        {

+            get { return _fieldOrdinal; }

+        }

 

         private static bool AllPrintableAscii(string text)

         {

@@ -70,7 +74,7 @@ namespace Google.ProtocolBuffers.ProtoGen
 

         protected bool HasDefaultValue

         {

-            get 

+            get

             {

                 switch (Descriptor.FieldType)

                 {

@@ -141,20 +145,32 @@ namespace Google.ProtocolBuffers.ProtoGen
                             if (Descriptor.FieldType == FieldType.Double && value is double)

                             {

                                 if (double.IsNaN((double) value))

+                                {

                                     return "double.NaN";

+                                }

                                 if (double.IsPositiveInfinity((double) value))

+                                {

                                     return "double.PositiveInfinity";

+                                }

                                 if (double.IsNegativeInfinity((double) value))

+                                {

                                     return "double.NegativeInfinity";

+                                }

                             }

                             else if (Descriptor.FieldType == FieldType.Float && value is float)

                             {

                                 if (float.IsNaN((float) value))

+                                {

                                     return "float.NaN";

+                                }

                                 if (float.IsPositiveInfinity((float) value))

+                                {

                                     return "float.PositiveInfinity";

+                                }

                                 if (float.IsNegativeInfinity((float) value))

+                                {

                                     return "float.NegativeInfinity";

+                                }

                             }

                             return value.ToString(CultureInfo.InvariantCulture) + suffix;

                         }

@@ -188,7 +204,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                         {

                             string temp =

                                 Convert.ToBase64String(

-                                    System.Text.Encoding.UTF8.GetBytes((String) Descriptor.DefaultValue));

+                                    Encoding.UTF8.GetBytes((String) Descriptor.DefaultValue));

                             return String.Format("ByteString.FromBase64(\"{0}\").ToStringUtf8()", temp);

                         }

                         return string.Format("(string) {0}.Descriptor.Fields[{1}].DefaultValue",

diff --git a/src/ProtoGen/Generator.cs b/src/ProtoGen/Generator.cs
index a3c6a504..516018ef 100644
--- a/src/ProtoGen/Generator.cs
+++ b/src/ProtoGen/Generator.cs
@@ -35,11 +35,11 @@
 #endregion

 

 using System.Collections.Generic;

+using System.IO;

 using System.Text;

+using Google.ProtocolBuffers.Collections;

 using Google.ProtocolBuffers.DescriptorProtos;

-using System.IO;

 using Google.ProtocolBuffers.Descriptors;

-using Google.ProtocolBuffers.Collections;

 

 namespace Google.ProtocolBuffers.ProtoGen

 {

@@ -148,7 +148,9 @@ namespace Google.ProtocolBuffers.ProtoGen
             // we've already converted all the dependencies, until we get to a stalemate

             List<FileDescriptorProto> fileList = new List<FileDescriptorProto>();

             foreach (FileDescriptorSet set in descriptorProtos)

+            {

                 fileList.AddRange(set.FileList);

+            }

 

             FileDescriptor[] converted = new FileDescriptor[fileList.Count];

 

@@ -172,10 +174,10 @@ namespace Google.ProtocolBuffers.ProtoGen
 

 

                     CSharpFileOptions.Builder builder = options.ToBuilder();

-                    if (candidate.Options.HasExtension(DescriptorProtos.CSharpOptions.CSharpFileOptions))

+                    if (candidate.Options.HasExtension(CSharpOptions.CSharpFileOptions))

                     {

                         builder.MergeFrom(

-                            candidate.Options.GetExtension(DescriptorProtos.CSharpOptions.CSharpFileOptions));

+                            candidate.Options.GetExtension(CSharpOptions.CSharpFileOptions));

                     }

                     CSharpFileOptions localOptions = builder.Build();

 

diff --git a/src/ProtoGen/MessageFieldGenerator.cs b/src/ProtoGen/MessageFieldGenerator.cs
index cb365954..b86f2c9a 100644
--- a/src/ProtoGen/MessageFieldGenerator.cs
+++ b/src/ProtoGen/MessageFieldGenerator.cs
@@ -129,7 +129,8 @@ namespace Google.ProtocolBuffers.ProtoGen
         public void GenerateSerializationCode(TextGenerator writer)

         {

             writer.WriteLine("if (has{0}) {{", PropertyName);

-            writer.WriteLine("  output.Write{0}({1}, field_names[{3}], {2});", MessageOrGroup, Number, PropertyName, FieldOrdinal);

+            writer.WriteLine("  output.Write{0}({1}, field_names[{3}], {2});", MessageOrGroup, Number, PropertyName,

+                             FieldOrdinal);

             writer.WriteLine("}");

         }

 

diff --git a/src/ProtoGen/MessageGenerator.cs b/src/ProtoGen/MessageGenerator.cs
index f5a68bdd..8f3a5939 100644
--- a/src/ProtoGen/MessageGenerator.cs
+++ b/src/ProtoGen/MessageGenerator.cs
@@ -38,7 +38,6 @@ using System;
 using System.Collections.Generic;

 using Google.ProtocolBuffers.DescriptorProtos;

 using Google.ProtocolBuffers.Descriptors;

-using ExtensionRange = Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange;

 

 namespace Google.ProtocolBuffers.ProtoGen

 {

@@ -146,7 +145,9 @@ namespace Google.ProtocolBuffers.ProtoGen
                 {

                     List<string> names = new List<string>();

                     foreach (FieldDescriptor fieldDescriptor in Descriptor.Fields)

+                    {

                         names.Add(fieldDescriptor.Name);

+                    }

                     //if you change this, the search must also change in GenerateBuilderParsingMethods

                     names.Sort(StringComparer.Ordinal);

                     _fieldNames = names.ToArray();

@@ -169,7 +170,8 @@ namespace Google.ProtocolBuffers.ProtoGen
         {

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

             writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

             writer.WriteLine("{0} sealed partial class {1} : pb::{2}Message{3}<{1}, {1}.Builder> {{",

                              ClassAccessLevel, ClassName,

                              Descriptor.Proto.ExtensionRangeCount > 0 ? "Extendable" : "Generated",

@@ -181,13 +183,16 @@ namespace Google.ProtocolBuffers.ProtoGen
             if (OptimizeSpeed)

             {

                 writer.WriteLine("private static readonly string[] _{0}FieldNames = new string[] {{ {2}{1}{2} }};",

-                    NameHelpers.UnderscoresToCamelCase(ClassName), String.Join("\", \"", FieldNames), FieldNames.Length > 0 ? "\"" : "");

+                                 NameHelpers.UnderscoresToCamelCase(ClassName), String.Join("\", \"", FieldNames),

+                                 FieldNames.Length > 0 ? "\"" : "");

                 List<string> tags = new List<string>();

                 foreach (string name in FieldNames)

+                {

                     tags.Add(WireFormat.MakeTag(Descriptor.FindFieldByName(name)).ToString());

+                }

 

                 writer.WriteLine("private static readonly uint[] _{0}FieldTags = new uint[] {{ {1} }};",

-                    NameHelpers.UnderscoresToCamelCase(ClassName), String.Join(", ", tags.ToArray()));

+                                 NameHelpers.UnderscoresToCamelCase(ClassName), String.Join(", ", tags.ToArray()));

             }

             writer.WriteLine("public static {0} DefaultInstance {{", ClassName);

             writer.WriteLine("  get { return defaultInstance; }");

@@ -227,7 +232,8 @@ namespace Google.ProtocolBuffers.ProtoGen
                 writer.WriteLine("#region Nested types");

                 writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

                 writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                                 GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

                 writer.WriteLine("public static class Types {");

                 writer.Indent();

                 WriteChildren(writer, null, Descriptor.EnumTypes);

@@ -287,7 +293,10 @@ namespace Google.ProtocolBuffers.ProtoGen
             {

                 CreateFieldGenerator(fieldDescriptor).WriteHash(writer);

             }

-            if (callbase) writer.WriteLine("hash ^= base.GetHashCode();");

+            if (callbase)

+            {

+                writer.WriteLine("hash ^= base.GetHashCode();");

+            }

             writer.WriteLine("return hash;");

             writer.Outdent();

             writer.WriteLine("}");

@@ -301,7 +310,10 @@ namespace Google.ProtocolBuffers.ProtoGen
             {

                 CreateFieldGenerator(fieldDescriptor).WriteEquals(writer);

             }

-            if (callbase) writer.WriteLine("if (!base.Equals(other)) return false;");

+            if (callbase)

+            {

+                writer.WriteLine("if (!base.Equals(other)) return false;");

+            }

             writer.WriteLine("return true;");

             writer.Outdent();

             writer.WriteLine("}");

@@ -317,7 +329,10 @@ namespace Google.ProtocolBuffers.ProtoGen
             {

                 CreateFieldGenerator(fieldDescriptor).WriteToString(writer);

             }

-            if (callbase) writer.WriteLine("base.PrintTo(writer);");

+            if (callbase)

+            {

+                writer.WriteLine("base.PrintTo(writer);");

+            }

             writer.Outdent();

             writer.WriteLine("}");

             writer.WriteLine("#endregion");

@@ -329,7 +344,8 @@ namespace Google.ProtocolBuffers.ProtoGen
             List<FieldDescriptor> sortedFields = new List<FieldDescriptor>(Descriptor.Fields);

             sortedFields.Sort((f1, f2) => f1.FieldNumber.CompareTo(f2.FieldNumber));

 

-            List<ExtensionRange> sortedExtensions = new List<ExtensionRange>(Descriptor.Proto.ExtensionRangeList);

+            List<DescriptorProto.Types.ExtensionRange> sortedExtensions =

+                new List<DescriptorProto.Types.ExtensionRange>(Descriptor.Proto.ExtensionRangeList);

             sortedExtensions.Sort((r1, r2) => (r1.Start.CompareTo(r2.Start)));

 

             writer.WriteLine("public override void WriteTo(pb::ICodedOutputStream output) {");

@@ -423,7 +439,8 @@ namespace Google.ProtocolBuffers.ProtoGen
             CreateFieldGenerator(fieldDescriptor).GenerateSerializationCode(writer);

         }

 

-        private static void GenerateSerializeOneExtensionRange(TextGenerator writer, ExtensionRange extensionRange)

+        private static void GenerateSerializeOneExtensionRange(TextGenerator writer,

+                                                               DescriptorProto.Types.ExtensionRange extensionRange)

         {

             writer.WriteLine("extensionWriter.WriteUntil({0}, output);", extensionRange.End);

         }

@@ -534,7 +551,8 @@ namespace Google.ProtocolBuffers.ProtoGen
             writer.WriteLine();

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

             writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

             writer.WriteLine("{0} sealed partial class Builder : pb::{2}Builder{3}<{1}, Builder> {{",

                              ClassAccessLevel, ClassName,

                              Descriptor.Proto.ExtensionRangeCount > 0 ? "Extendable" : "Generated", RuntimeSuffix);

@@ -664,7 +682,8 @@ namespace Google.ProtocolBuffers.ProtoGen
             writer.WriteLine("if(tag == 0 && field_name != null) {");

             writer.Indent();

             //if you change from StringComparer.Ordinal, the array sort in FieldNames { get; } must also change

-            writer.WriteLine("int field_ordinal = global::System.Array.BinarySearch(_{0}FieldNames, field_name, global::System.StringComparer.Ordinal);", 

+            writer.WriteLine(

+                "int field_ordinal = global::System.Array.BinarySearch(_{0}FieldNames, field_name, global::System.StringComparer.Ordinal);",

                 NameHelpers.UnderscoresToCamelCase(ClassName));

             writer.WriteLine("if(field_ordinal >= 0)");

             writer.WriteLine("  tag = _{0}FieldTags[field_ordinal];", NameHelpers.UnderscoresToCamelCase(ClassName));

@@ -675,7 +694,8 @@ namespace Google.ProtocolBuffers.ProtoGen
                 writer.WriteLine("    unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);");

                 writer.WriteLine("  }");

             }

-            writer.WriteLine("  ParseUnknownField(input, {0}extensionRegistry, tag, field_name);", UseLiteRuntime ? "" : "unknownFields, ");

+            writer.WriteLine("  ParseUnknownField(input, {0}extensionRegistry, tag, field_name);",

+                             UseLiteRuntime ? "" : "unknownFields, ");

             writer.WriteLine("  continue;");

             writer.WriteLine("}");

             writer.Outdent();

@@ -718,8 +738,13 @@ namespace Google.ProtocolBuffers.ProtoGen
                 WireFormat.WireType wt = WireFormat.GetWireType(field.FieldType);

                 uint tag = WireFormat.MakeTag(field.FieldNumber, wt);

 

-                if(field.IsRepeated && (wt == WireFormat.WireType.Varint || wt == WireFormat.WireType.Fixed32 || wt == WireFormat.WireType.Fixed64))

-                    writer.WriteLine("case {0}:", WireFormat.MakeTag(field.FieldNumber, WireFormat.WireType.LengthDelimited));

+                if (field.IsRepeated &&

+                    (wt == WireFormat.WireType.Varint || wt == WireFormat.WireType.Fixed32 ||

+                     wt == WireFormat.WireType.Fixed64))

+                {

+                    writer.WriteLine("case {0}:",

+                                     WireFormat.MakeTag(field.FieldNumber, WireFormat.WireType.LengthDelimited));

+                }

 

                 writer.WriteLine("case {0}: {{", tag);

                 writer.Indent();

diff --git a/src/ProtoGen/PrimitiveFieldGenerator.cs b/src/ProtoGen/PrimitiveFieldGenerator.cs
index 0002c2a0..e945bf87 100644
--- a/src/ProtoGen/PrimitiveFieldGenerator.cs
+++ b/src/ProtoGen/PrimitiveFieldGenerator.cs
@@ -103,7 +103,8 @@ namespace Google.ProtocolBuffers.ProtoGen
         public void GenerateSerializationCode(TextGenerator writer)

         {

             writer.WriteLine("if (has{0}) {{", PropertyName);

-            writer.WriteLine("  output.Write{0}({1}, field_names[{3}], {2});", CapitalizedTypeName, Number, PropertyName, FieldOrdinal);

+            writer.WriteLine("  output.Write{0}({1}, field_names[{3}], {2});", CapitalizedTypeName, Number, PropertyName,

+                             FieldOrdinal);

             writer.WriteLine("}");

         }

 

diff --git a/src/ProtoGen/ProgramPreprocess.cs b/src/ProtoGen/ProgramPreprocess.cs
index a1ebdf62..5bcf7cfe 100644
--- a/src/ProtoGen/ProgramPreprocess.cs
+++ b/src/ProtoGen/ProgramPreprocess.cs
@@ -14,8 +14,8 @@ namespace Google.ProtocolBuffers.ProtoGen
     /// </summary>

     public class ProgramPreprocess

     {

-        const string ProtocExecutable = "protoc.exe";

-        const string ProtocDirectoryArg = "--protoc_dir=";

+        private const string ProtocExecutable = "protoc.exe";

+        private const string ProtocDirectoryArg = "--protoc_dir=";

 

         private static int Main(string[] args)

         {

@@ -154,7 +154,7 @@ namespace Google.ProtocolBuffers.ProtoGen
 

             foreach (string path in searchPath)

             {

-                string exeFile = Path.Combine(path, ProtocExecutable); 

+                string exeFile = Path.Combine(path, ProtocExecutable);

                 if (File.Exists(exeFile))

                 {

                     return exeFile;

diff --git a/src/ProtoGen/Properties/AssemblyInfo.cs b/src/ProtoGen/Properties/AssemblyInfo.cs
index a8b228c0..1d8cc312 100644
--- a/src/ProtoGen/Properties/AssemblyInfo.cs
+++ b/src/ProtoGen/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;

-using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

 

 // General Information about an assembly is controlled through the following 

diff --git a/src/ProtoGen/RepeatedEnumFieldGenerator.cs b/src/ProtoGen/RepeatedEnumFieldGenerator.cs
index b8f4a7d6..5880390b 100644
--- a/src/ProtoGen/RepeatedEnumFieldGenerator.cs
+++ b/src/ProtoGen/RepeatedEnumFieldGenerator.cs
@@ -34,7 +34,6 @@
 

 #endregion

 

-using Google.ProtocolBuffers.DescriptorProtos;

 using Google.ProtocolBuffers.Descriptors;

 

 namespace Google.ProtocolBuffers.ProtoGen

@@ -132,9 +131,16 @@ namespace Google.ProtocolBuffers.ProtoGen
             writer.WriteLine("if ({0}_.Count > 0) {{", Name);

             writer.Indent();

             if (Descriptor.IsPacked)

-                writer.WriteLine("output.WritePackedEnumArray({0}, field_names[{2}], {1}MemoizedSerializedSize, {1}_);", Number, Name, FieldOrdinal, Descriptor.FieldType);

+            {

+                writer.WriteLine(

+                    "output.WritePackedEnumArray({0}, field_names[{2}], {1}MemoizedSerializedSize, {1}_);", Number, Name,

+                    FieldOrdinal, Descriptor.FieldType);

+            }

             else

-                writer.WriteLine("output.WriteEnumArray({0}, field_names[{2}], {1}_);", Number, Name, FieldOrdinal, Descriptor.FieldType);

+            {

+                writer.WriteLine("output.WriteEnumArray({0}, field_names[{2}], {1}_);", Number, Name, FieldOrdinal,

+                                 Descriptor.FieldType);

+            }

             writer.Outdent();

             writer.WriteLine("}");

         }

diff --git a/src/ProtoGen/RepeatedMessageFieldGenerator.cs b/src/ProtoGen/RepeatedMessageFieldGenerator.cs
index 0f13cccb..bfa0763f 100644
--- a/src/ProtoGen/RepeatedMessageFieldGenerator.cs
+++ b/src/ProtoGen/RepeatedMessageFieldGenerator.cs
@@ -34,7 +34,6 @@
 

 #endregion

 

-using System;

 using Google.ProtocolBuffers.Descriptors;

 

 namespace Google.ProtocolBuffers.ProtoGen

@@ -122,14 +121,17 @@ namespace Google.ProtocolBuffers.ProtoGen
 

         public void GenerateParsingCode(TextGenerator writer)

         {

-            writer.WriteLine("input.Read{0}Array(tag, field_name, result.{1}_, {2}.DefaultInstance, extensionRegistry);", MessageOrGroup, Name, TypeName);

+            writer.WriteLine(

+                "input.Read{0}Array(tag, field_name, result.{1}_, {2}.DefaultInstance, extensionRegistry);",

+                MessageOrGroup, Name, TypeName);

         }

 

         public void GenerateSerializationCode(TextGenerator writer)

         {

             writer.WriteLine("if ({0}_.Count > 0) {{", Name);

             writer.Indent();

-            writer.WriteLine("output.Write{0}Array({1}, field_names[{3}], {2}_);", MessageOrGroup, Number, Name, FieldOrdinal, Descriptor.FieldType);

+            writer.WriteLine("output.Write{0}Array({1}, field_names[{3}], {2}_);", MessageOrGroup, Number, Name,

+                             FieldOrdinal, Descriptor.FieldType);

             writer.Outdent();

             writer.WriteLine("}");

         }

diff --git a/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs b/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs
index 50c14850..9e7f5f64 100644
--- a/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs
+++ b/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs
@@ -34,7 +34,6 @@
 

 #endregion

 

-using Google.ProtocolBuffers.DescriptorProtos;

 using Google.ProtocolBuffers.Descriptors;

 

 namespace Google.ProtocolBuffers.ProtoGen

@@ -121,7 +120,8 @@ namespace Google.ProtocolBuffers.ProtoGen
 

         public void GenerateParsingCode(TextGenerator writer)

         {

-            writer.WriteLine("input.Read{0}Array(tag, field_name, result.{1}_);", CapitalizedTypeName, Name, Descriptor.FieldType);

+            writer.WriteLine("input.Read{0}Array(tag, field_name, result.{1}_);", CapitalizedTypeName, Name,

+                             Descriptor.FieldType);

         }

 

         public void GenerateSerializationCode(TextGenerator writer)

@@ -129,9 +129,15 @@ namespace Google.ProtocolBuffers.ProtoGen
             writer.WriteLine("if ({0}_.Count > 0) {{", Name);

             writer.Indent();

             if (Descriptor.IsPacked)

-                writer.WriteLine("output.WritePacked{0}Array({1}, field_names[{3}], {2}MemoizedSerializedSize, {2}_);", CapitalizedTypeName, Number, Name, FieldOrdinal, Descriptor.FieldType);

+            {

+                writer.WriteLine("output.WritePacked{0}Array({1}, field_names[{3}], {2}MemoizedSerializedSize, {2}_);",

+                                 CapitalizedTypeName, Number, Name, FieldOrdinal, Descriptor.FieldType);

+            }

             else

-                writer.WriteLine("output.Write{0}Array({1}, field_names[{3}], {2}_);", CapitalizedTypeName, Number, Name, FieldOrdinal, Descriptor.FieldType);

+            {

+                writer.WriteLine("output.Write{0}Array({1}, field_names[{3}], {2}_);", CapitalizedTypeName, Number, Name,

+                                 FieldOrdinal, Descriptor.FieldType);

+            }

             writer.Outdent();

             writer.WriteLine("}");

         }

diff --git a/src/ProtoGen/ServiceGenerator.cs b/src/ProtoGen/ServiceGenerator.cs
index 2c3e6167..8a4a95be 100644
--- a/src/ProtoGen/ServiceGenerator.cs
+++ b/src/ProtoGen/ServiceGenerator.cs
@@ -55,7 +55,8 @@ namespace Google.ProtocolBuffers.ProtoGen
         {

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

             writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

             writer.WriteLine("{0} abstract class {1} : pb::IService {{", ClassAccessLevel, Descriptor.Name);

             writer.Indent();

 

@@ -156,7 +157,8 @@ namespace Google.ProtocolBuffers.ProtoGen
             writer.WriteLine();

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

             writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

             writer.WriteLine("{0} class Stub : {1} {{", ClassAccessLevel, GetClassName(Descriptor));

             writer.Indent();

             writer.WriteLine("internal Stub(pb::IRpcChannel channel) {");

diff --git a/src/ProtoGen/ServiceInterfaceGenerator.cs b/src/ProtoGen/ServiceInterfaceGenerator.cs
index fe0a8b4a..041cffce 100644
--- a/src/ProtoGen/ServiceInterfaceGenerator.cs
+++ b/src/ProtoGen/ServiceInterfaceGenerator.cs
@@ -35,7 +35,6 @@
 #endregion

 

 using System;

-using System.Collections.Generic;

 using Google.ProtocolBuffers.DescriptorProtos;

 using Google.ProtocolBuffers.Descriptors;

 

@@ -106,7 +105,8 @@ namespace Google.ProtocolBuffers.ProtoGen
                                      new Guid(options.InterfaceId));

                 }

                 writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                                 GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

                 writer.WriteLine("{0} partial interface I{1} {{", ClassAccessLevel, Descriptor.Name);

                 writer.Indent();

 

@@ -143,10 +143,13 @@ namespace Google.ProtocolBuffers.ProtoGen
                 // CLIENT Proxy

                 {

                     if (Descriptor.File.CSharpOptions.ClsCompliance)

+                    {

                         writer.WriteLine("[global::System.CLSCompliant(false)]");

+                    }

                     writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

                     writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                    writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                    writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                                     GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

                     writer.WriteLine("{0} partial class {1} : I{1}, pb::IRpcDispatch, global::System.IDisposable {{",

                                      ClassAccessLevel, Descriptor.Name);

                     writer.Indent();

@@ -190,10 +193,13 @@ namespace Google.ProtocolBuffers.ProtoGen
                 // SERVER - DISPATCH

                 {

                     if (Descriptor.File.CSharpOptions.ClsCompliance)

+                    {

                         writer.WriteLine("[global::System.CLSCompliant(false)]");

+                    }

                     writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

                     writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                    writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                    writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                                     GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

                     writer.WriteLine("public partial class Dispatch : pb::IRpcDispatch, global::System.IDisposable {");

                     writer.Indent();

                     writer.WriteLine("private readonly bool dispose;");

@@ -230,7 +236,8 @@ namespace Google.ProtocolBuffers.ProtoGen
                             GetClassName(method.InputType));

                     }

                     writer.WriteLine(

-                        "default: throw new global::System.MissingMethodException(typeof(I{0}).FullName, methodName);", Descriptor.Name);

+                        "default: throw new global::System.MissingMethodException(typeof(I{0}).FullName, methodName);",

+                        Descriptor.Name);

                     writer.Outdent();

                     writer.WriteLine("}"); //end switch

                     writer.Outdent();

@@ -241,10 +248,13 @@ namespace Google.ProtocolBuffers.ProtoGen
                 // SERVER - STUB

                 {

                     if (Descriptor.File.CSharpOptions.ClsCompliance)

+                    {

                         writer.WriteLine("[global::System.CLSCompliant(false)]");

+                    }

                     writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

                     writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                    writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                    writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                                     GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

                     writer.WriteLine(

                         "public partial class ServerStub : pb::IRpcServerStub, global::System.IDisposable {");

                     writer.Indent();

@@ -287,7 +297,8 @@ namespace Google.ProtocolBuffers.ProtoGen
                             method.Name, GetClassName(method.InputType), GetClassName(method.OutputType));

                     }

                     writer.WriteLine(

-                        "default: throw new global::System.MissingMethodException(typeof(I{0}).FullName, methodName);", Descriptor.Name);

+                        "default: throw new global::System.MissingMethodException(typeof(I{0}).FullName, methodName);",

+                        Descriptor.Name);

                     writer.Outdent();

                     writer.WriteLine("}"); //end switch

                     writer.Outdent();

diff --git a/src/ProtoGen/SourceGeneratorBase.cs b/src/ProtoGen/SourceGeneratorBase.cs
index 4b9d6ec3..fd833373 100644
--- a/src/ProtoGen/SourceGeneratorBase.cs
+++ b/src/ProtoGen/SourceGeneratorBase.cs
@@ -35,6 +35,7 @@
 #endregion

 

 using System.Collections.Generic;

+using Google.ProtocolBuffers.DescriptorProtos;

 using Google.ProtocolBuffers.Descriptors;

 

 namespace Google.ProtocolBuffers.ProtoGen

@@ -53,11 +54,11 @@ namespace Google.ProtocolBuffers.ProtoGen
             this.descriptor = descriptor;

 

             OptimizeSize = descriptor.File.Options.OptimizeFor ==

-                           Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode.CODE_SIZE;

+                           FileOptions.Types.OptimizeMode.CODE_SIZE;

             OptimizeSpeed = descriptor.File.Options.OptimizeFor ==

-                            Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode.SPEED;

+                            FileOptions.Types.OptimizeMode.SPEED;

             UseLiteRuntime = descriptor.File.Options.OptimizeFor ==

-                             Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode.LITE_RUNTIME;

+                             FileOptions.Types.OptimizeMode.LITE_RUNTIME;

             //Lite runtime uses OptimizeSpeed code branches

             OptimizeSpeed |= UseLiteRuntime;

             RuntimeSuffix = UseLiteRuntime ? "Lite" : "";

diff --git a/src/ProtoGen/SourceGenerators.cs b/src/ProtoGen/SourceGenerators.cs
index 7d73110e..bf7218b6 100644
--- a/src/ProtoGen/SourceGenerators.cs
+++ b/src/ProtoGen/SourceGenerators.cs
@@ -44,16 +44,16 @@ namespace Google.ProtocolBuffers.ProtoGen
 

     internal static class SourceGenerators

     {

-        private static readonly Dictionary<Type, Func<IDescriptor, ISourceGenerator>> GeneratorFactories = 

+        private static readonly Dictionary<Type, Func<IDescriptor, ISourceGenerator>> GeneratorFactories =

             new Dictionary<Type, Func<IDescriptor, ISourceGenerator>>

-            {

-                {typeof(FileDescriptor),descriptor=>new UmbrellaClassGenerator((FileDescriptor)descriptor)},

-                {typeof(EnumDescriptor),descriptor=>new EnumGenerator((EnumDescriptor)descriptor)},

-                {typeof(ServiceDescriptor),descriptor=>new ServiceGenerator((ServiceDescriptor)descriptor)},

-                {typeof(MessageDescriptor),descriptor=>new MessageGenerator((MessageDescriptor)descriptor)},

-                // For other fields, we have IFieldSourceGenerators.

-                {typeof(FieldDescriptor),descriptor=>new ExtensionGenerator((FieldDescriptor)descriptor)}

-            };

+                {

+                    {typeof (FileDescriptor), descriptor => new UmbrellaClassGenerator((FileDescriptor) descriptor)},

+                    {typeof (EnumDescriptor), descriptor => new EnumGenerator((EnumDescriptor) descriptor)},

+                    {typeof (ServiceDescriptor), descriptor => new ServiceGenerator((ServiceDescriptor) descriptor)},

+                    {typeof (MessageDescriptor), descriptor => new MessageGenerator((MessageDescriptor) descriptor)},

+                    // For other fields, we have IFieldSourceGenerators.

+                    {typeof (FieldDescriptor), descriptor => new ExtensionGenerator((FieldDescriptor) descriptor)}

+                };

 

         public static IFieldSourceGenerator CreateFieldGenerator(FieldDescriptor field, int fieldOrdinal)

         {

@@ -65,11 +65,11 @@ namespace Google.ProtocolBuffers.ProtoGen
                                : new MessageFieldGenerator(field, fieldOrdinal);

                 case MappedType.Enum:

                     return field.IsRepeated

-                               ? (IFieldSourceGenerator)new RepeatedEnumFieldGenerator(field, fieldOrdinal)

+                               ? (IFieldSourceGenerator) new RepeatedEnumFieldGenerator(field, fieldOrdinal)

                                : new EnumFieldGenerator(field, fieldOrdinal);

                 default:

                     return field.IsRepeated

-                               ? (IFieldSourceGenerator)new RepeatedPrimitiveFieldGenerator(field, fieldOrdinal)

+                               ? (IFieldSourceGenerator) new RepeatedPrimitiveFieldGenerator(field, fieldOrdinal)

                                : new PrimitiveFieldGenerator(field, fieldOrdinal);

             }

         }

diff --git a/src/ProtoGen/UmbrellaClassGenerator.cs b/src/ProtoGen/UmbrellaClassGenerator.cs
index 36a9e4cc..e3866180 100644
--- a/src/ProtoGen/UmbrellaClassGenerator.cs
+++ b/src/ProtoGen/UmbrellaClassGenerator.cs
@@ -163,7 +163,8 @@ namespace Google.ProtocolBuffers.ProtoGen
             }

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

             writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]", GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

             writer.WriteLine("{0} static partial class {1} {{", ClassAccessLevel,

                              Descriptor.CSharpOptions.UmbrellaClassname);

             writer.WriteLine();