@@ -348,6 +348,12 @@ class IOSDeployDebugger {
348
348
.transform <String >(utf8.decoder)
349
349
.transform <String >(const LineSplitter ())
350
350
.listen ((String line) {
351
+
352
+ // TODO(vashworth): Revert after https://github.com/flutter/flutter/issues/121231 is resolved.
353
+ if (line.isNotEmpty) {
354
+ _logger.printTrace (line);
355
+ }
356
+
351
357
_monitorIOSDeployFailure (line, _logger);
352
358
353
359
// (lldb) platform select remote-'ios' --sysroot
@@ -365,7 +371,6 @@ class IOSDeployDebugger {
365
371
}
366
372
final String prompt = line.substring (0 , promptEndIndex);
367
373
lldbRun = RegExp (RegExp .escape (prompt) + r'\s*run' );
368
- _logger.printTrace (line);
369
374
return ;
370
375
}
371
376
@@ -384,7 +389,6 @@ class IOSDeployDebugger {
384
389
// success
385
390
// 2020-09-15 13:42:25.185474-0700 Runner[477:181141] flutter: The Dart VM service is listening on http://127.0.0.1:57782/
386
391
if (lldbRun.hasMatch (line)) {
387
- _logger.printTrace (line);
388
392
_debuggerState = _IOSDeployDebuggerState .launching;
389
393
// TODO(vashworth): Remove all debugger state comments when https://github.com/flutter/flutter/issues/126412 is resolved.
390
394
_logger.printTrace ('Debugger state set to launching.' );
@@ -393,7 +397,6 @@ class IOSDeployDebugger {
393
397
// Next line after "run" must be "success", or the attach failed.
394
398
// Example: "error: process launch failed"
395
399
if (_debuggerState == _IOSDeployDebuggerState .launching) {
396
- _logger.printTrace (line);
397
400
final bool attachSuccess = line == 'success' ;
398
401
_debuggerState = attachSuccess ? _IOSDeployDebuggerState .attached : _IOSDeployDebuggerState .detached;
399
402
_logger.printTrace ('Debugger state set to ${attachSuccess ? 'attached' : 'detached' }.' );
@@ -408,7 +411,6 @@ class IOSDeployDebugger {
408
411
// process signal SIGSTOP
409
412
if (line.contains (_signalStop)) {
410
413
// The app is about to be stopped. Only show in verbose mode.
411
- _logger.printTrace (line);
412
414
return ;
413
415
}
414
416
@@ -421,7 +423,6 @@ class IOSDeployDebugger {
421
423
422
424
if (line == _backTraceAll) {
423
425
// The app is stopped and the backtrace for all threads will be printed.
424
- _logger.printTrace (line);
425
426
// Even though we're not "detached", just stopped, mark as detached so the backtrace
426
427
// is only show in verbose.
427
428
_debuggerState = _IOSDeployDebuggerState .detached;
@@ -438,7 +439,6 @@ class IOSDeployDebugger {
438
439
439
440
if (line.contains ('PROCESS_STOPPED' ) || _lldbProcessStopped.hasMatch (line)) {
440
441
// The app has been stopped. Dump the backtrace, and detach.
441
- _logger.printTrace (line);
442
442
_iosDeployProcess? .stdin.writeln (_backTraceAll);
443
443
if (_processResumeCompleter == null ) {
444
444
detach ();
@@ -449,28 +449,24 @@ class IOSDeployDebugger {
449
449
if (line.contains ('PROCESS_EXITED' ) || _lldbProcessExit.hasMatch (line)) {
450
450
// The app exited or crashed, so exit. Continue passing debugging
451
451
// messages to the log reader until it exits to capture crash dumps.
452
- _logger.printTrace (line);
453
452
exit ();
454
453
return ;
455
454
}
456
455
if (_lldbProcessDetached.hasMatch (line)) {
457
456
// The debugger has detached from the app, and there will be no more debugging messages.
458
457
// Kill the ios-deploy process.
459
- _logger.printTrace (line);
460
458
exit ();
461
459
return ;
462
460
}
463
461
464
462
if (_lldbProcessResuming.hasMatch (line)) {
465
- _logger.printTrace (line);
466
463
// we marked this detached when we received [_backTraceAll]
467
464
_debuggerState = _IOSDeployDebuggerState .attached;
468
465
_logger.printTrace ('Debugger state set to attached.' );
469
466
return ;
470
467
}
471
468
472
469
if (_debuggerState != _IOSDeployDebuggerState .attached) {
473
- _logger.printTrace (line);
474
470
return ;
475
471
}
476
472
if (lastLineFromDebugger != null && lastLineFromDebugger! .isNotEmpty && line.isEmpty) {
@@ -488,7 +484,7 @@ class IOSDeployDebugger {
488
484
.transform <String >(const LineSplitter ())
489
485
.listen ((String line) {
490
486
_monitorIOSDeployFailure (line, _logger);
491
- _logger.printTrace (line);
487
+ _logger.printTrace ('error: $ line ' );
492
488
});
493
489
unawaited (_iosDeployProcess! .exitCode.then ((int status) async {
494
490
_logger.printTrace ('ios-deploy exited with code $exitCode ' );
0 commit comments