Set onDiagnostic in DDCs incremental compiler code path

jensjoha · commit-bot@chromium.org · commit 07a53a3cc9b2 · 2019-07-12T06:03:13.000Z
Change-Id: Iebff83658bb3b33a316de3f0719cdb44c14ca1b0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108725 Reviewed-by: Jake Macdonald <jakemac@google.com> Commit-Queue: Jens Johansen <jensj@google.com>
diff --git a/pkg/dev_compiler/lib/src/kernel/command.dart b/pkg/dev_compiler/lib/src/kernel/command.dart
@@ -304,6 +304,7 @@ Future<CompilerResult> _compile(List<String> args,
   if (useAnalyzer || !useIncrementalCompiler) {
     result = await fe.compile(compilerState, inputs, diagnosticMessageHandler);
   } else {
+    compilerState.options.onDiagnostic = diagnosticMessageHandler;
     Component incrementalComponent = await incrementalCompiler.computeDelta(
         entryPoints: inputs, fullComponent: true);
     hierarchy = incrementalCompiler.userCode.loader.hierarchy;
@@ -319,6 +320,8 @@ Future<CompilerResult> _compile(List<String> args,
       }
     }
   }
+  compilerState.options.onDiagnostic = null; // See http://dartbug.com/36983.
+
   if (result == null || !succeeded) {
     return CompilerResult(1, kernelState: compilerState);
   }

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,7 @@ Future<CompilerResult> _compile(List<String> args,`
`304`	`304`	`if (useAnalyzer \|\| !useIncrementalCompiler) {`
`305`	`305`	`result = await fe.compile(compilerState, inputs, diagnosticMessageHandler);`
`306`	`306`	`} else {`
	`307`	`+ compilerState.options.onDiagnostic = diagnosticMessageHandler;`
`307`	`308`	`Component incrementalComponent = await incrementalCompiler.computeDelta(`
`308`	`309`	`entryPoints: inputs, fullComponent: true);`
`309`	`310`	`hierarchy = incrementalCompiler.userCode.loader.hierarchy;`
`@@ -319,6 +320,8 @@ Future<CompilerResult> _compile(List<String> args,`
`319`	`320`	`}`
`320`	`321`	`}`
`321`	`322`	`}`
	`323`	`+ compilerState.options.onDiagnostic = null; // See http://dartbug.com/36983.`
	`324`	`+`
`322`	`325`	`if (result == null \|\| !succeeded) {`
`323`	`326`	`return CompilerResult(1, kernelState: compilerState);`
`324`	`327`	`}`