github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

use the --dart-sdk parameter to flutter analyze if passed in (#16751)

Browse Source
This commit is contained in:
Devon Carew 2018-04-19 18:44:46 -07:00 committed by GitHub
parent 85473d0941
commit 6a82b1044a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/flutter_tools/lib/src/commands/analyze_continuously.dart
View File

@ -15,7 +15,7 @@ import '../base/process_manager.dart';
import '../base/terminal.dart'; import '../base/terminal.dart';
import '../base/utils.dart'; import '../base/utils.dart';
import '../cache.dart'; import '../cache.dart';
import '../dart/sdk.dart'; import '../dart/sdk.dart' as sdk;
import '../globals.dart'; import '../globals.dart';
import 'analyze_base.dart'; import 'analyze_base.dart';
@ -53,7 +53,9 @@ class AnalyzeContinuously extends AnalyzeBase {
analysisTarget = fs.currentDirectory.path; analysisTarget = fs.currentDirectory.path;
} }
final AnalysisServer server = new AnalysisServer(dartSdkPath, directories, previewDart2: previewDart2); final String sdkPath = argResults['dart-sdk'] ?? sdk.dartSdkPath;
final AnalysisServer server = new AnalysisServer(sdkPath, directories, previewDart2: previewDart2);
server.onAnalyzing.listen((bool isAnalyzing) => _handleAnalysisStatus(server, isAnalyzing)); server.onAnalyzing.listen((bool isAnalyzing) => _handleAnalysisStatus(server, isAnalyzing));
server.onErrors.listen(_handleAnalysisErrors); server.onErrors.listen(_handleAnalysisErrors);
@ -151,9 +153,9 @@ class AnalyzeContinuously extends AnalyzeBase {
} }
class AnalysisServer { class AnalysisServer {
AnalysisServer(this.sdk, this.directories, { this.previewDart2: false }); AnalysisServer(this.sdkPath, this.directories, { this.previewDart2: false });
final String sdk; final String sdkPath;
final List<String> directories; final List<String> directories;
final bool previewDart2; final bool previewDart2;
@ -164,12 +166,12 @@ class AnalysisServer {
int _id = 0; int _id = 0;
Future<Null> start() async { Future<Null> start() async {
final String snapshot = fs.path.join(sdk, 'bin/snapshots/analysis_server.dart.snapshot'); final String snapshot = fs.path.join(sdkPath, 'bin/snapshots/analysis_server.dart.snapshot');
final List<String> command = <String>[ final List<String> command = <String>[
fs.path.join(dartSdkPath, 'bin', 'dart'), fs.path.join(sdkPath, 'bin', 'dart'),
snapshot, snapshot,
'--sdk', '--sdk',
sdk, sdkPath,
]; ];
if (previewDart2) { if (previewDart2) {

5
packages/flutter_tools/lib/src/commands/analyze_once.dart
View File

@ -13,6 +13,7 @@ import '../base/process.dart';
import '../base/utils.dart'; import '../base/utils.dart';
import '../cache.dart'; import '../cache.dart';
import '../dart/analysis.dart'; import '../dart/analysis.dart';
import '../dart/sdk.dart' as sdk;
import '../globals.dart'; import '../globals.dart';
import 'analyze.dart'; import 'analyze.dart';
import 'analyze_base.dart'; import 'analyze_base.dart';
@ -93,7 +94,9 @@ class AnalyzeOnce extends AnalyzeBase {
arguments.add('--no-preview-dart-2'); arguments.add('--no-preview-dart-2');
} }
final String dartanalyzer = fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'dart-sdk', 'bin', 'dartanalyzer'); final String sdkPath = argResults['dart-sdk'] ?? sdk.dartSdkPath;
final String dartanalyzer = fs.path.join(sdkPath, 'bin', 'dartanalyzer');
arguments.insert(0, dartanalyzer); arguments.insert(0, dartanalyzer);
bool noErrors = false; bool noErrors = false;
final Set<String> issues = new Set<String>(); final Set<String> issues = new Set<String>();