Version 1.2.0-dev.3.1

tests/compiler/dart2js/analyze_helper.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.
 
 library analyze_helper;
 
 import 'dart:async';
 import 'dart:io';
 import '../../../sdk/lib/_internal/compiler/compiler.dart' as api;
 import '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart';
@@ skipping 12 matching lines @@
  * Use an identifiable suffix of the file uri as key. Use a fixed substring of
  * the error/warning message in the list of whitelistings for each file.
  */
 // TODO(johnniwinther): Support canonical URIs as keys and message kinds as
 // values.
 
 class CollectingDiagnosticHandler extends FormattingDiagnosticHandler {
   bool hasWarnings = false;
   bool hasHint = false;
   bool hasErrors = false;
+  bool lastWasWhitelisted = false;
 
   Map<String, Map<String, int>> whiteListMap
       = new Map<String, Map<String, int>>();
 
   CollectingDiagnosticHandler(Map<String, List<String>> whiteList,
                               SourceFileProvider provider)
       : super(provider) {
     whiteList.forEach((String file, List<String> messageParts) {
       var useMap = new Map<String,int>();
       for (String messagePart in messageParts) {
@@ skipping 49 matching lines @@
       }
     }
     return false;
   }
 
   void diagnosticHandler(Uri uri, int begin, int end, String message,
                          api.Diagnostic kind) {
     if (kind == api.Diagnostic.WARNING) {
       if (checkWhiteList(uri, message)) {
         // Suppress whitelisted warnings.
+        lastWasWhitelisted = true;
         return;
       }
       hasWarnings = true;
     }
     if (kind == api.Diagnostic.HINT) {
       if (checkWhiteList(uri, message)) {
         // Suppress whitelisted hints.
+        lastWasWhitelisted = true;
         return;
       }
       hasHint = true;
     }
     if (kind == api.Diagnostic.ERROR) {
       if (checkWhiteList(uri, message)) {
         // Suppress whitelisted errors.
+        lastWasWhitelisted = true;
         return;
       }
       hasErrors = true;
     }
+    if (kind == api.Diagnostic.INFO && lastWasWhitelisted) {
+      return;
+    }
+    lastWasWhitelisted = false;
     super.diagnosticHandler(uri, begin, end, message, kind);
   }
 }
 
 Future analyze(List<Uri> uriList,
                Map<String, List<String>> whiteList,
                {bool analyzeAll: true}) {
   String testFileName =
       relativize(Uri.base, Platform.script, Platform.isWindows);
 
@@ skipping 36 matching lines @@
       exit(1);
     }
   }
   if (analyzeAll) {
     compiler.librariesToAnalyzeWhenRun = uriList;
     return compiler.run(null).then(onCompletion);
   } else {
     return compiler.run(uriList.single).then(onCompletion);
   }
 }