- Fix logic bug when skipping comments.

runtime/bin/vmservice/loader.dart

 // Copyright (c) 2015, 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 vmservice_io;
 
 _log(msg) {
   print("% $msg");
 }
 
@@ skipping 152 matching lines @@
     // Identify split within the line and end of the line.
     var separator = -1;
     var end = len;
     // Verifying validity of package name while scanning the line.
     var nonDot = false;
     var invalidPackageName = false;
 
     // Scan to the end of the line or data.
     while (index < len) {
       char = data[index++];
+      // If we have not reached the separator yet, determine whether we are
+      // scanning legal package name characters.
       if (separator == -1) {
         if ((char == _COLON)) {
           // The first colon on a line is the separator between package name and
           // related URI.
           separator = index - 1;
         } else {
           // Still scanning the package name part. Check for the validity of
           // the characters.
           nonDot = nonDot || (char != _DOT);
           invalidPackageName = invalidPackageName ||
                                (char < _SPACE) || (char > _DEL) ||
                                _invalidPackageNameChars[char - _SPACE];
         }
-      } else if ((char == _CR) || (char == _LF)) {
-        // Identify end of line.
+      }
+      // Identify end of line.
+      if ((char == _CR) || (char == _LF)) {
         end = index - 1;
         break;
       }
     }
 
     // No further handling needed for comment lines.
     if (data[start] == _HASH) {
       if (traceLoading) {
         _log("Skipping comment in $packagesFile:\n"
              "${new String.fromCharCodes(data, start, end)}");
@@ skipping 180 matching lines @@
   assert(id != null);
   String resource = request[3];
   assert(resource != null);
   var uri = Uri.parse(resource);
   if (id >= 0) {
     _handleResourceRequest(sp, traceLoading, id, uri);
   } else {
     _handlePackagesRequest(sp, traceLoading, id, uri);
   }
 }