| OLD | NEW |
| 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library dart2js.test.memory_compiler; | 5 library dart2js.test.memory_compiler; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:compiler/compiler.dart' show DiagnosticHandler; | 9 import 'package:compiler/compiler.dart' show DiagnosticHandler; |
| 10 import 'package:compiler/compiler_new.dart' | 10 import 'package:compiler/compiler_new.dart' |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 } | 42 } |
| 43 } | 43 } |
| 44 } | 44 } |
| 45 | 45 |
| 46 CompilerDiagnostics createCompilerDiagnostics( | 46 CompilerDiagnostics createCompilerDiagnostics( |
| 47 CompilerDiagnostics diagnostics, SourceFileProvider provider, | 47 CompilerDiagnostics diagnostics, SourceFileProvider provider, |
| 48 {bool showDiagnostics: true, bool verbose: false}) { | 48 {bool showDiagnostics: true, bool verbose: false}) { |
| 49 CompilerDiagnostics handler = diagnostics; | 49 CompilerDiagnostics handler = diagnostics; |
| 50 if (showDiagnostics) { | 50 if (showDiagnostics) { |
| 51 if (diagnostics == null) { | 51 if (diagnostics == null) { |
| 52 handler = new FormattingDiagnosticHandler(provider)..verbose = verbose; | 52 handler = new FormattingDiagnosticHandler(provider) |
| 53 ..verbose = verbose |
| 54 ..autoReadFileUri = true; |
| 53 } else { | 55 } else { |
| 54 var formattingHandler = new FormattingDiagnosticHandler(provider) | 56 var formattingHandler = new FormattingDiagnosticHandler(provider) |
| 55 ..verbose = verbose; | 57 ..verbose = verbose |
| 58 ..autoReadFileUri = true; |
| 56 handler = new MultiDiagnostics([diagnostics, formattingHandler]); | 59 handler = new MultiDiagnostics([diagnostics, formattingHandler]); |
| 57 } | 60 } |
| 58 } else if (diagnostics == null) { | 61 } else if (diagnostics == null) { |
| 59 handler = new MultiDiagnostics(); | 62 handler = new MultiDiagnostics(); |
| 60 } | 63 } |
| 61 return handler; | 64 return handler; |
| 62 } | 65 } |
| 63 | 66 |
| 64 Expando<MemorySourceFileProvider> expando = | 67 Expando<MemorySourceFileProvider> expando = |
| 65 new Expando<MemorySourceFileProvider>(); | 68 new Expando<MemorySourceFileProvider>(); |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 handler = (Uri uri, int begin, int end, String message, Diagnostic kind) { | 252 handler = (Uri uri, int begin, int end, String message, Diagnostic kind) { |
| 250 diagnosticHandler(uri, begin, end, message, kind); | 253 diagnosticHandler(uri, begin, end, message, kind); |
| 251 formattingHandler(uri, begin, end, message, kind); | 254 formattingHandler(uri, begin, end, message, kind); |
| 252 }; | 255 }; |
| 253 } | 256 } |
| 254 } else if (diagnosticHandler == null) { | 257 } else if (diagnosticHandler == null) { |
| 255 handler = (Uri uri, int begin, int end, String message, Diagnostic kind) {}; | 258 handler = (Uri uri, int begin, int end, String message, Diagnostic kind) {}; |
| 256 } | 259 } |
| 257 return handler; | 260 return handler; |
| 258 } | 261 } |
| OLD | NEW |