From eeec6466b6afd4194ab25db56209564f9ccf4c35 Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Tue, 22 May 2018 15:44:04 +0000
Subject: [PATCH] Convert the command-line analyzer to a dart 2 snapshot.

Change-Id: Ieb5cd8971494a8a6ffc07c0fd4dde07cfb6f5373
Reviewed-on: https://dart-review.googlesource.com/56034
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
---
 sdk/bin/dartanalyzer            | 4 ++--
 sdk/bin/dartanalyzer.bat        | 4 ++--
 sdk/bin/dartanalyzer_sdk        | 2 +-
 sdk/bin/dartanalyzer_sdk.bat    | 2 +-
 tools/testing/dart/pubspec.yaml | 1 +
 utils/dartanalyzer/BUILD.gn     | 3 +++
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sdk/bin/dartanalyzer b/sdk/bin/dartanalyzer
index bad9306fdd1..49f4bccfe1b 100755
--- a/sdk/bin/dartanalyzer
+++ b/sdk/bin/dartanalyzer
@@ -31,7 +31,7 @@ declare -a EXTRA_VM_OPTIONS
 
 case $0 in
   *_developer)
-    EXTRA_VM_OPTIONS+=('--checked')
+    EXTRA_VM_OPTIONS+=('--enable-asserts')
     ;;
 esac
 
@@ -47,4 +47,4 @@ ANALYZER="$DART_ROOT/pkg/analyzer_cli/bin/analyzer.dart"
 
 DEV_OPTIONS="--use-analysis-driver-memory-byte-store"
 
-exec "$DART" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$ANALYZER" "$DEV_OPTIONS" "$SDK_ARG" "$@"
+exec "$DART" "--preview-dart-2" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$ANALYZER" "$DEV_OPTIONS" "$SDK_ARG" "$@"
diff --git a/sdk/bin/dartanalyzer.bat b/sdk/bin/dartanalyzer.bat
index 464aaee5402..b4a1de203de 100644
--- a/sdk/bin/dartanalyzer.bat
+++ b/sdk/bin/dartanalyzer.bat
@@ -24,7 +24,7 @@ set SDK_ARG=--dart-sdk=%SDK_DIR%
 set EXTRA_VM_OPTIONS=
 
 if _%DARTANALYZER_DEVELOPER_MODE%_ == _1_ (
-  set EXTRA_VM_OPTIONS=%EXTRA_VM_OPTIONS% --checked
+  set EXTRA_VM_OPTIONS=%EXTRA_VM_OPTIONS% --enable_asserts
 )
 
 rem We allow extra vm options to be passed in through an environment variable.
@@ -40,7 +40,7 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1%
 
 set ANALYZER=%DART_ROOT%\pkg\analyzer_cli\bin\analyzer.dart
 
-"%DART%" "--packages=%DART_ROOT%\.packages" %EXTRA_VM_OPTIONS% "%ANALYZER%" "%SDK_ARG%" %*
+"%DART%" "--preview-dart-2" "--packages=%DART_ROOT%\.packages" %EXTRA_VM_OPTIONS% "%ANALYZER%" "%SDK_ARG%" %*
 
 endlocal
 
diff --git a/sdk/bin/dartanalyzer_sdk b/sdk/bin/dartanalyzer_sdk
index 28f37ab3d7b..90d09dea147 100755
--- a/sdk/bin/dartanalyzer_sdk
+++ b/sdk/bin/dartanalyzer_sdk
@@ -28,4 +28,4 @@ SNAPSHOT="$BIN_DIR/snapshots/dartanalyzer.dart.snapshot"
 
 # We are running the snapshot in the built SDK.
 DART="$BIN_DIR/dart"
-exec "$DART" "$SNAPSHOT" "$SDK_ARG" "$@"
+exec "$DART" "--preview-dart-2" "$SNAPSHOT" "$SDK_ARG" "$@"
diff --git a/sdk/bin/dartanalyzer_sdk.bat b/sdk/bin/dartanalyzer_sdk.bat
index ab66885f7a4..82125f0e49c 100644
--- a/sdk/bin/dartanalyzer_sdk.bat
+++ b/sdk/bin/dartanalyzer_sdk.bat
@@ -22,7 +22,7 @@ if %SDK_DIR:~-1%==\ set SDK_DIR=%SDK_DIR:~0,-1%
 
 set SDK_ARG=--dart-sdk=%SDK_DIR%
 
-"%DART%" "%SNAPSHOT%" "%SDK_ARG%" %*
+"%DART%" "--preview-dart-2" "%SNAPSHOT%" "%SDK_ARG%" %*
 
 endlocal
 
diff --git a/tools/testing/dart/pubspec.yaml b/tools/testing/dart/pubspec.yaml
index 0bcb25fae31..4ddbba8b111 100644
--- a/tools/testing/dart/pubspec.yaml
+++ b/tools/testing/dart/pubspec.yaml
@@ -4,3 +4,4 @@
 
 # This file is only here that so certain Dart editors recognize this is a Dart
 # project.
+name: testing_tools
diff --git a/utils/dartanalyzer/BUILD.gn b/utils/dartanalyzer/BUILD.gn
index e41c7f62d96..874ee7b8df8 100644
--- a/utils/dartanalyzer/BUILD.gn
+++ b/utils/dartanalyzer/BUILD.gn
@@ -21,6 +21,9 @@ analyzer_files = exec_script("../../tools/list_dart_files.py",
                              "list lines")
 
 application_snapshot("generate_dartanalyzer_snapshot") {
+  vm_args = [
+    "--preview-dart-2",
+  ]
   main_dart = "../../pkg/analyzer_cli/bin/analyzer.dart"
   training_args = [
     "--dart-sdk=" + rebase_path("../../sdk"),