diff --git a/packages/flutter_tools/lib/src/commands/analyze.dart b/packages/flutter_tools/lib/src/commands/analyze.dart index 42e8a326fb..7941f799cd 100644 --- a/packages/flutter_tools/lib/src/commands/analyze.dart +++ b/packages/flutter_tools/lib/src/commands/analyze.dart @@ -26,8 +26,6 @@ class AnalyzeCommand extends FlutterCommand { argParser.addFlag('watch', help: 'Run analysis continuously, watching the filesystem for changes.', negatable: false); - argParser.addFlag('preview-dart-2', - defaultsTo: true, help: 'Preview Dart 2.0 functionality.'); argParser.addOption('write', valueHelp: 'file', help: 'Also output the results to a file. This is useful with --watch ' @@ -87,7 +85,6 @@ class AnalyzeCommand extends FlutterCommand { argResults, runner.getRepoRoots(), runner.getRepoPackages(), - previewDart2: argResults['preview-dart-2'], ).analyze(); } else { return new AnalyzeOnce( @@ -95,7 +92,6 @@ class AnalyzeCommand extends FlutterCommand { runner.getRepoRoots(), runner.getRepoPackages(), workingDirectory: workingDirectory, - previewDart2: argResults['preview-dart-2'], ).analyze(); } } diff --git a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart index a31eff324b..aad07d3369 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart @@ -19,13 +19,10 @@ import '../globals.dart'; import 'analyze_base.dart'; class AnalyzeContinuously extends AnalyzeBase { - AnalyzeContinuously(ArgResults argResults, this.repoRoots, this.repoPackages, { - this.previewDart2 = false, - }) : super(argResults); + AnalyzeContinuously(ArgResults argResults, this.repoRoots, this.repoPackages) : super(argResults); final List repoRoots; final List repoPackages; - final bool previewDart2; String analysisTarget; bool firstAnalysis = true; @@ -60,7 +57,7 @@ class AnalyzeContinuously extends AnalyzeBase { final String sdkPath = argResults['dart-sdk'] ?? sdk.dartSdkPath; - final AnalysisServer server = new AnalysisServer(sdkPath, directories, previewDart2: previewDart2); + final AnalysisServer server = new AnalysisServer(sdkPath, directories); server.onAnalyzing.listen((bool isAnalyzing) => _handleAnalysisStatus(server, isAnalyzing)); server.onErrors.listen(_handleAnalysisErrors); diff --git a/packages/flutter_tools/lib/src/commands/analyze_once.dart b/packages/flutter_tools/lib/src/commands/analyze_once.dart index 49a0eb9db6..afd0c58cb2 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_once.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_once.dart @@ -24,7 +24,6 @@ class AnalyzeOnce extends AnalyzeBase { this.repoRoots, this.repoPackages, { this.workingDirectory, - this.previewDart2 = false, }) : super(argResults); final List repoRoots; @@ -33,8 +32,6 @@ class AnalyzeOnce extends AnalyzeBase { /// The working directory for testing analysis using dartanalyzer. final Directory workingDirectory; - final bool previewDart2; - @override Future analyze() async { final String currentDirectory = @@ -88,11 +85,7 @@ class AnalyzeOnce extends AnalyzeBase { final String sdkPath = argResults['dart-sdk'] ?? sdk.dartSdkPath; - final AnalysisServer server = new AnalysisServer( - sdkPath, - directories.toList(), - previewDart2: previewDart2, - ); + final AnalysisServer server = new AnalysisServer(sdkPath, directories.toList()); StreamSubscription subscription; subscription = server.onAnalyzing.listen((bool isAnalyzing) { diff --git a/packages/flutter_tools/lib/src/dart/analysis.dart b/packages/flutter_tools/lib/src/dart/analysis.dart index 104e2f91ae..96aa504eed 100644 --- a/packages/flutter_tools/lib/src/dart/analysis.dart +++ b/packages/flutter_tools/lib/src/dart/analysis.dart @@ -14,11 +14,10 @@ import '../base/utils.dart'; import '../globals.dart'; class AnalysisServer { - AnalysisServer(this.sdkPath, this.directories, {this.previewDart2 = false}); + AnalysisServer(this.sdkPath, this.directories); final String sdkPath; final List directories; - final bool previewDart2; Process _process; final StreamController _analyzingController = @@ -38,12 +37,6 @@ class AnalysisServer { sdkPath, ]; - if (previewDart2) { - command.add('--preview-dart-2'); - } else { - command.add('--no-preview-dart-2'); - } - printTrace('dart ${command.skip(1).join(' ')}'); _process = await processManager.start(command); // This callback hookup can't throw. diff --git a/packages/flutter_tools/test/commands/analyze_continuously_test.dart b/packages/flutter_tools/test/commands/analyze_continuously_test.dart index 850efb9222..1e9570789c 100644 --- a/packages/flutter_tools/test/commands/analyze_continuously_test.dart +++ b/packages/flutter_tools/test/commands/analyze_continuously_test.dart @@ -70,43 +70,21 @@ void main() { OperatingSystemUtils: () => os }); - testUsingContext('--preview-dart-2', () async { + testUsingContext('analyze', () async { const String contents = "StringBuffer bar = StringBuffer('baz');"; tempDir.childFile('main.dart').writeAsStringSync(contents); - server = new AnalysisServer(dartSdkPath, [tempDir.path], previewDart2: true); - + server = new AnalysisServer(dartSdkPath, [tempDir.path]); int errorCount = 0; final Future onDone = server.onAnalyzing.where((bool analyzing) => analyzing == false).first; server.onErrors.listen((FileAnalysisErrors errors) { errorCount += errors.errors.length; }); - await server.start(); await onDone; - expect(errorCount, 0); }, overrides: { OperatingSystemUtils: () => os }); - - testUsingContext('no --preview-dart-2 shows errors', () async { - const String contents = "StringBuffer bar = StringBuffer('baz');"; - tempDir.childFile('main.dart').writeAsStringSync(contents); - server = new AnalysisServer(dartSdkPath, [tempDir.path], previewDart2: false); - - int errorCount = 0; - final Future onDone = server.onAnalyzing.where((bool analyzing) => analyzing == false).first; - server.onErrors.listen((FileAnalysisErrors errors) { - errorCount += errors.errors.length; - }); - - await server.start(); - await onDone; - - expect(errorCount, 1); - }, overrides: { - OperatingSystemUtils: () => os - }); } void _createSampleProject(Directory directory, { bool brokenCode = false }) { diff --git a/packages/flutter_tools/test/commands/analyze_once_test.dart b/packages/flutter_tools/test/commands/analyze_once_test.dart index 2cca95b755..c76f75ac02 100644 --- a/packages/flutter_tools/test/commands/analyze_once_test.dart +++ b/packages/flutter_tools/test/commands/analyze_once_test.dart @@ -168,44 +168,22 @@ void bar() { } }); - testUsingContext('--preview-dart-2', () async { + testUsingContext('analyze', () async { const String contents = ''' StringBuffer bar = StringBuffer('baz'); '''; - final Directory tempDir = fs.systemTempDirectory.createTempSync(); tempDir.childFile('main.dart').writeAsStringSync(contents); - try { await runCommand( command: new AnalyzeCommand(workingDirectory: fs.directory(tempDir)), - arguments: ['analyze', '--preview-dart-2'], + arguments: ['analyze'], statusTextContains: ['No issues found!'], ); } finally { tempDir.deleteSync(recursive: true); } }); - - testUsingContext('no --preview-dart-2 shows errors', () async { - const String contents = ''' -StringBuffer bar = StringBuffer('baz'); -'''; - - final Directory tempDir = fs.systemTempDirectory.createTempSync(); - tempDir.childFile('main.dart').writeAsStringSync(contents); - - try { - await runCommand( - command: new AnalyzeCommand(workingDirectory: fs.directory(tempDir)), - arguments: ['analyze', '--no-preview-dart-2'], - statusTextContains: ['1 issue found.'], - toolExit: true, - ); - } finally { - tempDir.deleteSync(recursive: true); - } - }); }); }