[ DartDev ] Print error to console when trying to launch a missing SDK

bkonyi · commit-bot@chromium.org · commit c2559967b56d · 2020-07-27T21:34:23.000Z
artifact (e.g., snapshots) This should never happen in a stable release unless the SDK installation is corrupted, but can happen when only building the 'runtime' build target. Fixes #42601 Change-Id: I00bd9538984b26350780fc58754169e79e91d24e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/156023 Reviewed-by: Jaime Wren <jwren@google.com> Commit-Queue: Ben Konyi <bkonyi@google.com>
diff --git a/pkg/dartdev/lib/src/commands/compile.dart b/pkg/dartdev/lib/src/commands/compile.dart
@@ -65,6 +65,9 @@ class CompileJSCommand extends DartdevCommand<int> {
 
   @override
   FutureOr<int> run() async {
+    if (!Sdk.checkSnapshotExists(sdk.dart2js)) {
+      return 255;
+    }
     // We expect a single rest argument; the dart entry point.
     if (argResults.rest.length != 1) {
       log.stderr('Missing Dart entry point.');
@@ -176,6 +179,10 @@ Remove debugging information from the output and save it separately to the speci
 
   @override
   FutureOr<int> run() async {
+    if (!Sdk.checkSnapshotExists(genKernel) ||
+        !Sdk.checkSnapshotExists(genSnapshot)) {
+      return 255;
+    }
     // We expect a single rest argument; the dart entry point.
     if (argResults.rest.length != 1) {
       log.stderr('Missing Dart entry point.');
diff --git a/pkg/dartdev/lib/src/commands/create.dart b/pkg/dartdev/lib/src/commands/create.dart
@@ -96,6 +96,9 @@ class CreateCommand extends DartdevCommand {
     );
 
     if (argResults['pub']) {
+      if (!Sdk.checkSnapshotExists(sdk.pub)) {
+        return 255;
+      }
       log.stdout('');
       var progress = log.progress('Running pub get');
       var process = await startProcess(
diff --git a/pkg/dartdev/lib/src/commands/pub.dart b/pkg/dartdev/lib/src/commands/pub.dart
@@ -22,6 +22,9 @@ class PubCommand extends DartdevCommand<int> {
     // Override [printUsage] for invocations of 'dart help pub' which won't
     // execute [run] below.  Without this, the 'dart help pub' reports the
     // command pub with no commands or flags.
+    if (!Sdk.checkSnapshotExists(sdk.pub)) {
+      return;
+    }
     final command = sdk.pub;
     final args = ['help'];
 
@@ -42,6 +45,9 @@ class PubCommand extends DartdevCommand<int> {
 
   @override
   FutureOr<int> run() async {
+    if (!Sdk.checkSnapshotExists(sdk.pub)) {
+      return 255;
+    }
     final command = sdk.pub;
     var args = argResults.arguments;
 
diff --git a/pkg/dartdev/lib/src/commands/run.dart b/pkg/dartdev/lib/src/commands/run.dart
@@ -122,7 +122,9 @@ Run a Dart file.''');
     _DebuggingSession debugSession;
     if (launchDds) {
       debugSession = _DebuggingSession();
-      await debugSession.start();
+      if (!await debugSession.start()) {
+        return 255;
+      }
     }
 
     final script = Directory.current.uri
@@ -135,8 +137,14 @@ Run a Dart file.''');
 }
 
 class _DebuggingSession {
-  Future<void> start() async {
+  Future<bool> start() async {
     final serviceInfo = await Service.getInfo();
+    final ddsSnapshot = (dirname(sdk.dart).endsWith('bin'))
+        ? sdk.ddsSnapshot
+        : absolute(dirname(sdk.dart), 'gen', 'dds.dart.snapshot');
+    if (!Sdk.checkSnapshotExists(ddsSnapshot)) {
+      return false;
+    }
     final process = await Process.start(
         sdk.dart,
         [
@@ -157,5 +165,6 @@ class _DebuggingSession {
     });
 
     await completer.future;
+    return true;
   }
 }
diff --git a/pkg/dartdev/lib/src/commands/test.dart b/pkg/dartdev/lib/src/commands/test.dart
@@ -19,6 +19,9 @@ class TestCommand extends DartdevCommand<int> {
 
   @override
   void printUsage() {
+    if (!Sdk.checkSnapshotExists(sdk.pub)) {
+      return;
+    }
     final command = sdk.pub;
     final args = ['run', 'test', '--help'];
 
@@ -42,6 +45,9 @@ class TestCommand extends DartdevCommand<int> {
 
   @override
   FutureOr<int> run() async {
+    if (!Sdk.checkSnapshotExists(sdk.pub)) {
+      return 255;
+    }
     final command = sdk.pub;
     final testArgs = argResults.arguments.toList();
 
diff --git a/pkg/dartdev/lib/src/sdk.dart b/pkg/dartdev/lib/src/sdk.dart
@@ -6,6 +6,8 @@ import 'dart:io';
 
 import 'package:path/path.dart' as path;
 
+import 'core.dart';
+
 final Sdk sdk = Sdk();
 
 String get _computeSdkPath {
@@ -59,4 +61,13 @@ class Sdk {
 
   static String _binName(String base) =>
       Platform.isWindows ? '$base.bat' : base;
+
+  static bool checkSnapshotExists(String snapshotPath) {
+    if (!File(snapshotPath).existsSync()) {
+      log.stderr('Could not find $snapshotPath. Have you built the full '
+          'Dart SDK?');
+      return false;
+    }
+    return true;
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,9 @@ Run a Dart file.''');`
`122`	`122`	`_DebuggingSession debugSession;`
`123`	`123`	`if (launchDds) {`
`124`	`124`	`debugSession = _DebuggingSession();`
`125`		`- await debugSession.start();`
	`125`	`+ if (!await debugSession.start()) {`
	`126`	`+ return 255;`
	`127`	`+ }`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`final script = Directory.current.uri`
`@@ -135,8 +137,14 @@ Run a Dart file.''');`
`135`	`137`	`}`
`136`	`138`
`137`	`139`	`class _DebuggingSession {`
`138`		`- Future<void> start() async {`
	`140`	`+ Future<bool> start() async {`
`139`	`141`	`final serviceInfo = await Service.getInfo();`
	`142`	`+ final ddsSnapshot = (dirname(sdk.dart).endsWith('bin'))`
	`143`	`+ ? sdk.ddsSnapshot`
	`144`	`+ : absolute(dirname(sdk.dart), 'gen', 'dds.dart.snapshot');`
	`145`	`+ if (!Sdk.checkSnapshotExists(ddsSnapshot)) {`
	`146`	`+ return false;`
	`147`	`+ }`
`140`	`148`	`final process = await Process.start(`
`141`	`149`	`sdk.dart,`
`142`	`150`	`[`
`@@ -157,5 +165,6 @@ class _DebuggingSession {`
`157`	`165`	`});`
`158`	`166`
`159`	`167`	`await completer.future;`
	`168`	`+ return true;`
`160`	`169`	`}`
`161`	`170`	`}`