cleanup patch generation to preseve comments and remove @patch

test/dart_codegen/expect/convert/json.dart

Index: test/dart_codegen/expect/convert/json.dart
diff --git a/test/dart_codegen/expect/convert/json.dart b/test/dart_codegen/expect/convert/json.dart
index bbb2491f01c6fb33837a2702b8f51cd4023f95ff..fe0300302c89b669734e19142bf1eac9bb6472c0 100644
--- a/test/dart_codegen/expect/convert/json.dart
+++ b/test/dart_codegen/expect/convert/json.dart
@@ -206,16 +206,16 @@ class JsonDecoder extends Converter<String, Object> {
   final _Reviver _reviver;
   const JsonDecoder([reviver(var key, var value)]) : this._reviver = reviver;
   dynamic convert(String input) => _parseJson(input, _reviver);
-  @patch StringConversionSink startChunkedConversion(Sink<Object> sink) {
+  StringConversionSink startChunkedConversion(Sink<Object> sink) {
     return new _JsonDecoderSink(_reviver, sink);
   }
   Stream<Object> bind(Stream<String> stream) => ((__x14) => DDC$RT.cast(__x14,
       DDC$RT.type((DDC$async$.Stream<dynamic> _) {}),
       DDC$RT.type((DDC$async$.Stream<Object> _) {}), "CastDynamic",
-      """line 504, column 49 of dart:convert/json.dart: """,
+      """line 509, column 49 of dart:convert/json.dart: """,
       __x14 is DDC$async$.Stream<Object>, false))(super.bind(stream));
 }
-@patch _parseJson(String source, reviver(key, value)) {
+_parseJson(String source, reviver(key, value)) {
   if (source is! String) throw new ArgumentError(source);
   var parsed;
   try {
@@ -334,7 +334,7 @@ abstract class _JsonStringifier {
     if (object is num) {
       if (!object.isFinite) return false;
       writeNumber(DDC$RT.cast(object, dynamic, num, "CastGeneral",
-          """line 704, column 19 of dart:convert/json.dart: """, object is num,
+          """line 692, column 19 of dart:convert/json.dart: """, object is num,
           true));
       return true;
     } else if (identical(object, true)) {
@@ -349,14 +349,14 @@ abstract class _JsonStringifier {
     } else if (object is String) {
       writeString('"');
       writeStringContent(DDC$RT.cast(object, dynamic, String, "CastGeneral",
-          """line 717, column 26 of dart:convert/json.dart: """,
+          """line 705, column 26 of dart:convert/json.dart: """,
           object is String, true));
       writeString('"');
       return true;
     } else if (object is List) {
       _checkCycle(object);
       writeList(DDC$RT.cast(object, dynamic, DDC$RT.type((List<dynamic> _) {}),
-          "CastGeneral", """line 722, column 17 of dart:convert/json.dart: """,
+          "CastGeneral", """line 710, column 17 of dart:convert/json.dart: """,
           object is List<dynamic>, true));
       _removeSeen(object);
       return true;
@@ -364,7 +364,7 @@ abstract class _JsonStringifier {
       _checkCycle(object);
       writeMap(DDC$RT.cast(object, dynamic,
           DDC$RT.type((Map<String, Object> _) {}), "CastGeneral",
-          """line 727, column 16 of dart:convert/json.dart: """,
+          """line 715, column 16 of dart:convert/json.dart: """,
           object is Map<String, Object>, false));
       _removeSeen(object);
       return true;
@@ -428,11 +428,11 @@ abstract class _JsonPrettyPrintMixin implements _JsonStringifier {
       map.forEach(((__x23) => DDC$RT.wrap(
           (dynamic f(String __u15, Object __u16)) {
         dynamic c(String x0, Object x1) => f(DDC$RT.cast(x0, dynamic, String,
-            "CastParam", """line 804, column 19 of dart:convert/json.dart: """,
+            "CastParam", """line 792, column 19 of dart:convert/json.dart: """,
             x0 is String, true), x1);
         return f == null ? null : c;
       }, __x23, __t20, __t17, "WrapLiteral",
-          """line 804, column 19 of dart:convert/json.dart: """,
+          """line 792, column 19 of dart:convert/json.dart: """,
           __x23 is __t17))((String key, Object value) {
         if (!first) {
           writeString(",\n");
@@ -455,7 +455,7 @@ class _JsonStringStringifier extends _JsonStringifier {
   final StringSink _sink;
   _JsonStringStringifier(this._sink, _toEncodable) : super(DDC$RT.cast(
           _toEncodable, dynamic, __t24, "CastGeneral",
-          """line 829, column 60 of dart:convert/json.dart: """,
+          """line 817, column 60 of dart:convert/json.dart: """,
           _toEncodable is __t24, false));
   static String stringify(object, toEncodable(object), String indent) {
     StringBuffer output = new StringBuffer();
@@ -503,7 +503,7 @@ class _JsonUtf8Stringifier extends _JsonStringifier {
   int index = 0;
   _JsonUtf8Stringifier(toEncodable, int bufferSize, this.addChunk)
       : super(DDC$RT.cast(toEncodable, dynamic, __t24, "CastGeneral",
-          """line 905, column 15 of dart:convert/json.dart: """,
+          """line 893, column 15 of dart:convert/json.dart: """,
           toEncodable is __t24, false)),
         this.bufferSize = bufferSize,
         buffer = new Uint8List(bufferSize);
@@ -604,9 +604,9 @@ class _JsonUtf8StringifierPretty extends _JsonUtf8Stringifier
   _JsonUtf8StringifierPretty(
       toEncodableFunction, this.indent, bufferSize, addChunk)
       : super(toEncodableFunction, DDC$RT.cast(bufferSize, dynamic, int,
-          "CastGeneral", """line 1043, column 36 of dart:convert/json.dart: """,
+          "CastGeneral", """line 1031, column 36 of dart:convert/json.dart: """,
           bufferSize is int, true), DDC$RT.cast(addChunk, dynamic, Function,
-          "CastGeneral", """line 1043, column 48 of dart:convert/json.dart: """,
+          "CastGeneral", """line 1031, column 48 of dart:convert/json.dart: """,
           addChunk is Function, true));
   void writeIndentation(int count) {
     List<int> indent = this.indent;