Clean up file writing.

sdk/lib/io/file_impl.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.io;
 
 // Read the file in blocks of size 64k.
 const int _BLOCK_SIZE = 64 * 1024;
 
 
@@ skipping 157 matching lines @@
       _currentBlock = null;
     }
     // Resume reading unless we are already done.
     if (_openedFile != null) _readBlock();
   }
 }
 
 class _FileStreamConsumer extends StreamConsumer<List<int>> {
   File _file;
   Future<RandomAccessFile> _openFuture;
-  StreamSubscription _subscription;
 
   _FileStreamConsumer(File this._file, FileMode mode) {
     _openFuture = _file.open(mode: mode);
   }
 
   Future<File> addStream(Stream<List<int>> stream) {
-    Completer<File> completer = new Completer<File>();
+    Completer<File> completer = new Completer<File>.sync();
     _openFuture
       .then((openedFile) {
+        var _subscription;
         void error(e, [StackTrace stackTrace]) {
           _subscription.cancel();
           openedFile.close();
           completer.completeError(e, stackTrace);
         }
         _subscription = stream.listen(
           (d) {
             _subscription.pause();
             try {
               openedFile.writeFrom(d, 0, d.length)
@@ skipping 325 matching lines @@
       return _decodeLines(bytes, encoding);
     });
   }
 
   List<String> readAsLinesSync({Encoding encoding: UTF8}) =>
       _decodeLines(readAsBytesSync(), encoding);
 
   Future<File> writeAsBytes(List<int> bytes,
                             {FileMode mode: FileMode.WRITE,
                              bool flush: false}) {
-    try {
-      IOSink sink = openWrite(mode: mode);
-      sink.add(bytes);
-      if (flush) {
-        sink.flush().then((_) => sink.close());
-      } else {
-        sink.close();
-      }
-      return sink.done.then((_) => this);
-    } catch (e) {
-      return new Future.error(e);
-    }
+    return open(mode: mode).then((file) {
+      return file.writeFrom(bytes, 0, bytes.length)
+          .then((_) {
+            if (flush) return file.flush().then((_) => this);
+            return this;
+          })
+          .whenComplete(file.close);
+    });
   }
 
   void writeAsBytesSync(List<int> bytes,
                         {FileMode mode: FileMode.WRITE,
                          bool flush: false}) {
     RandomAccessFile opened = openSync(mode: mode);
     opened.writeFromSync(bytes, 0, bytes.length);
     if (flush) opened.flushSync();
     opened.closeSync();
   }
@@ skipping 361 matching lines @@
     }
     _asyncDispatched = true;
     return _IOService.dispatch(request, data)
         .whenComplete(() {
           _asyncDispatched = false;
         });
   }
 
   void _checkAvailable() {
     if (_asyncDispatched) {
       throw new FileSystemException("An async operation is currently pending", path);

[Søren Gjesse, 2014/04/01 14:44:05]

Not your change, but long line :-).

[Anders Johnsen, 2014/04/02 08:21:01]

Pretty sure it originally was my change :)

     }
     if (closed) {
       throw new FileSystemException("File closed", path);
     }
   }
 }