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

Add intelliJ path to doctor output (#14795)

Browse Source
This commit is contained in:
Victor Choueiri 2018-02-28 01:19:32 +02:00 committed by Devon Carew
parent a5d3a9eb4b
commit 9c895fabf2
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/flutter_tools/lib/src/doctor.dart
View File

@ -276,7 +276,9 @@ class NoIdeValidator extends DoctorValidator {
} }
abstract class IntelliJValidator extends DoctorValidator { abstract class IntelliJValidator extends DoctorValidator {
IntelliJValidator(String title) : super(title); final String installPath;
IntelliJValidator(String title, this.installPath) : super(title);
String get version; String get version;
String get pluginsPath; String get pluginsPath;
@ -301,6 +303,8 @@ abstract class IntelliJValidator extends DoctorValidator {
Future<ValidationResult> validate() async { Future<ValidationResult> validate() async {
final List<ValidationMessage> messages = <ValidationMessage>[]; final List<ValidationMessage> messages = <ValidationMessage>[];
messages.add(new ValidationMessage('IntelliJ at $installPath'));
_validatePackage(messages, <String>['flutter-intellij', 'flutter-intellij.jar'], _validatePackage(messages, <String>['flutter-intellij', 'flutter-intellij.jar'],
'Flutter', minVersion: kMinFlutterPluginVersion); 'Flutter', minVersion: kMinFlutterPluginVersion);
_validatePackage(messages, <String>['Dart'], 'Dart'); _validatePackage(messages, <String>['Dart'], 'Dart');
@ -397,13 +401,11 @@ abstract class IntelliJValidator extends DoctorValidator {
} }
class IntelliJValidatorOnLinuxAndWindows extends IntelliJValidator { class IntelliJValidatorOnLinuxAndWindows extends IntelliJValidator {
IntelliJValidatorOnLinuxAndWindows(String title, this.version, this.installPath, this.pluginsPath) : super(title); IntelliJValidatorOnLinuxAndWindows(String title, this.version, String installPath, this.pluginsPath) : super(title, installPath);
@override @override
String version; String version;
final String installPath;
@override @override
String pluginsPath; String pluginsPath;
@ -451,10 +453,9 @@ class IntelliJValidatorOnLinuxAndWindows extends IntelliJValidator {
} }
class IntelliJValidatorOnMac extends IntelliJValidator { class IntelliJValidatorOnMac extends IntelliJValidator {
IntelliJValidatorOnMac(String title, this.id, this.installPath) : super(title); IntelliJValidatorOnMac(String title, this.id, String installPath) : super(title, installPath);
final String id; final String id;
final String installPath;
static final Map<String, String> _dirNameToId = <String, String>{ static final Map<String, String> _dirNameToId = <String, String>{
'IntelliJ IDEA.app' : 'IntelliJIdea', 'IntelliJ IDEA.app' : 'IntelliJIdea',

11
packages/flutter_tools/test/commands/doctor_test.dart
View File

@ -15,12 +15,17 @@ import '../src/context.dart';
void main() { void main() {
group('doctor', () { group('doctor', () {
testUsingContext('intellij validator', () async { testUsingContext('intellij validator', () async {
final ValidationResult result = await new IntelliJValidatorTestTarget('Test').validate(); final String installPath = '/path/to/intelliJ';
final ValidationResult result = await new IntelliJValidatorTestTarget('Test', installPath).validate();
expect(result.type, ValidationType.partial); expect(result.type, ValidationType.partial);
expect(result.statusInfo, 'version test.test.test'); expect(result.statusInfo, 'version test.test.test');
expect(result.messages, hasLength(3)); expect(result.messages, hasLength(4));
ValidationMessage message = result.messages ValidationMessage message = result.messages
.firstWhere((ValidationMessage m) => m.message.startsWith('IntelliJ '));
expect(message.message, 'IntelliJ at $installPath');
message = result.messages
.firstWhere((ValidationMessage m) => m.message.startsWith('Dart ')); .firstWhere((ValidationMessage m) => m.message.startsWith('Dart '));
expect(message.message, 'Dart plugin version 162.2485'); expect(message.message, 'Dart plugin version 162.2485');
@ -148,7 +153,7 @@ void main() {
} }
class IntelliJValidatorTestTarget extends IntelliJValidator { class IntelliJValidatorTestTarget extends IntelliJValidator {
IntelliJValidatorTestTarget(String title) : super(title); IntelliJValidatorTestTarget(String title, String installPath) : super(title, installPath);
@override @override
String get pluginsPath => fs.path.join('test', 'data', 'intellij', 'plugins'); String get pluginsPath => fs.path.join('test', 'data', 'intellij', 'plugins');